aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2004-10-01 10:11:42 +0000
committerWerner Koch <[email protected]>2004-10-01 10:11:42 +0000
commit1d315be6fa6037f883bb31647ae1453989679258 (patch)
treea956b6e49784c439dcf2fd6a5032c8d593e97d63
parent* gpgv.c, keydb.c (keydb_add_resource): Factored keyring creation out to (diff)
downloadgnupg-1d315be6fa6037f883bb31647ae1453989679258.tar.gz
gnupg-1d315be6fa6037f883bb31647ae1453989679258.zip
* mk-w32-dist: Updated from stable branch.
* mk-gpg-texi: Changed to use the newer docbook2x-texi utility. * config.guess, config.sub, mkinstalldirs, missing * depcomp, install-sh: Upgraded.
Diffstat (limited to '')
-rw-r--r--AUTHORS3
-rw-r--r--NEWS2
-rw-r--r--README2
-rw-r--r--configure.ac4
-rw-r--r--doc/gpg.texi1383
-rw-r--r--doc/gpgv.texi71
-rw-r--r--g10/ChangeLog4
-rw-r--r--g10/app-openpgp.c2
-rw-r--r--po/be.po1443
-rw-r--r--po/ca.po1491
-rw-r--r--po/cs.po1488
-rw-r--r--po/da.po1476
-rw-r--r--po/de.po1530
-rw-r--r--po/el.po1490
-rw-r--r--po/[email protected]bin111435 -> 113145 bytes
-rw-r--r--po/[email protected]1493
-rw-r--r--po/[email protected]bin110227 -> 111881 bytes
-rw-r--r--po/[email protected]1489
-rw-r--r--po/eo.po1482
-rw-r--r--po/es.po1488
-rw-r--r--po/et.po1489
-rw-r--r--po/fi.po1488
-rw-r--r--po/fr.po1490
-rw-r--r--po/gl.po1487
-rw-r--r--po/hu.po1488
-rw-r--r--po/id.po1486
-rw-r--r--po/it.po1490
-rw-r--r--po/ja.po1486
-rw-r--r--po/nl.po1482
-rw-r--r--po/pl.po1492
-rw-r--r--po/pt.po1485
-rw-r--r--po/pt_BR.po1521
-rw-r--r--po/ro.po1488
-rw-r--r--po/ru.po1488
-rw-r--r--po/sk.po1488
-rw-r--r--po/sv.po1490
-rw-r--r--po/tr.po1489
-rw-r--r--po/zh_CN.po1496
-rw-r--r--po/zh_TW.po1480
-rw-r--r--scripts/ChangeLog9
-rwxr-xr-xscripts/autogen.sh2
-rwxr-xr-xscripts/config.guess343
-rwxr-xr-xscripts/config.sub171
-rwxr-xr-xscripts/depcomp291
-rwxr-xr-xscripts/install-sh151
-rwxr-xr-xscripts/missing14
-rwxr-xr-xscripts/mk-gpg-texi53
-rwxr-xr-xscripts/mk-w32-dist14
48 files changed, 24946 insertions, 20746 deletions
diff --git a/AUTHORS b/AUTHORS
index ed314227e..dc16ad635 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -105,9 +105,6 @@ The files cipher/rndunix.c and cipher/rndw32.c are based on rndunix.c
and rndwin32.c from cryptlib.
Copyright Peter Gutmann, Paul Kendall, and Chris Wedgwood 1996-1999.
-The files in debian/ are by James Troup who is the Debian maintainer
-for GnuPG.
-
The RPM specs file scripts/gnupg.spec has been contributed by
several people.
diff --git a/NEWS b/NEWS
index 26f4169f7..5a2769a38 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Noteworthy changes in version 1.3.7
+Noteworthy changes in version 1.3.90 (2004-10-01)
------------------------------------------------
* Readline support at all prompts is now available if the systems
diff --git a/README b/README
index 6a7912c22..9d635e5ab 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
GnuPG - The GNU Privacy Guard
-------------------------------
- Version 1.3.6
+ Version 1.3.90
Copyright 1998, 1999, 2000, 2001, 2002, 2003,
2004 Free Software Foundation, Inc.
diff --git a/configure.ac b/configure.ac
index 818a980a9..5a93eef37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,12 +21,12 @@ dnl
dnl (Process this file with autoconf to produce a configure script.)
dnlAC_REVISION($Revision$)dnl
-AC_PREREQ(2.57)
+AC_PREREQ(2.59)
min_automake_version="1.7.9"
# Remember to change the version number immediately *after* a release
# and remove the "-cvs" or "rc" suffix immediately *before* a release.
-AC_INIT(gnupg, 1.3.90-cvs, [email protected])
+AC_INIT(gnupg, 1.3.90, [email protected])
# Set development_version to yes if the minor number is odd or you
# feel that the default check for a development version is not
# sufficient.
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 4ed4f1f76..2f3ab111f 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1,74 +1,91 @@
\input texinfo
-@c This Texinfo document has been automatically generated by
-@c docbook2texi from a DocBook documentation. The tool used
-@c can be found at:
-@c <URL:http://shell.ipoline.com/~elmert/hacks/docbook2X/>
-@c Please send any bug reports, improvements, comments,
-@c patches, etc. to Steve Cheng <[email protected]>.
-
-@setfilename gpg.info
-@dircategory GnuPG
+@setfilename untitled.info
+@documentencoding us-ascii
@direntry
-* gpg: (gpg). GnuPG encryption and signing tool.
+* gpg: . encryption and signing tool
@end direntry
-@node top
+@node Top, , , (dir)
@top gpg
-@menu
-@end menu
+@chapheading Name
+
+gpg --- encryption and signing tool
+@chapheading Synopsis
+
+@example
+gpg
+ --homedir name
+ --options file
+ options
+ command
+ args
+
+@end example
+@chapheading DESCRIPTION
-@majorheading Name
-gpg ---- encryption and signing tool</>
-
-@majorheading Synopsis
-
-@majorheading DESCRIPTION
@code{gpg} is the main program for the GnuPG system.
-This man page only lists the commands and options available.
-For more verbose documentation get the GNU Privacy Handbook (GPH) or
-one of the other documents at http://www.gnupg.org/docs.html .
+This man page only lists the commands and options available. For more
+verbose documentation get the GNU Privacy Handbook (GPH) or one of the
+other documents at http://www.gnupg.org/documentation/ .
Please remember that option parsing stops as soon as a non option is
encountered, you can explicitly stop option parsing by using the
-special option "---".
+special option "--".
+@chapheading COMMANDS
+
+@code{gpg} may be run with no commands, in which case it will
+perform a reasonable action depending on the type of file it is given
+as input (an encrypted message is decrypted, a signature is verified,
+a file containing keys is listed).
-@majorheading COMMANDS
@code{gpg} recognizes these commands:
@table @asis
-@item -s, ---sign
-Make a signature. This command may be combined
-with ---encrypt.
-@item ---clearsign
+@item -s, --sign
+Make a signature. This command may be combined with --encrypt (for a
+signed and encrypted message), --symmetric (for a signed and
+symmetrically encrypted message), or --encrypt and --symmetric
+together (for a signed message that may be decrypted via a secret key
+or a passphrase).
+
+@item --clearsign
Make a clear text signature.
-@item -b, ---detach-sign
+@item -b, --detach-sign
Make a detached signature.
-@item -e, ---encrypt
-Encrypt data. This option may be combined with ---sign.
+@item -e, --encrypt
+Encrypt data. This option may be combined with --sign (for a signed
+and encrypted message), --symmetric (for a message that may be
+decrypted via a secret key or a passphrase), or --sign and --symmetric
+together (for a signed message that may be decrypted via a secret key
+or a passphrase).
-@item -c, ---symmetric
+@item -c, --symmetric
Encrypt with a symmetric cipher using a passphrase. The default
symmetric cipher used is CAST5, but may be chosen with the
----cipher-algo option.
+--cipher-algo option. This option may be combined with --sign (for a
+signed and symmetrically encrypted message), --encrypt (for a message
+that may be decrypted via a secret key or a passphrase), or --sign and
+--encrypt together (for a signed message that may be decrypted via a
+secret key or a passphrase).
-@item ---store
+@item --store
Store only (make a simple RFC1991 packet).
-@item ---decrypt @code{file}
+@item --decrypt
Decrypt @code{file} (or stdin if no file is specified) and
write it to stdout (or the file specified with
----output). If the decrypted file is signed, the
+--output). If the decrypted file is signed, the
signature is also verified. This command differs
from the default operation, as it never writes to the
filename which is included in the file and it
rejects files which don't begin with an encrypted
message.
-@item ---verify @code{sigfile} @code{signed-files}
+@item --verify
Assume that @code{sigfile} is a signature and verify it
without generating any output. With no arguments,
the signature packet is read from stdin. If
@@ -83,69 +100,69 @@ stuff from stdin, use @samp{-} as the second filename.
For security reasons a detached signature cannot read the signed
material from stdin without denoting it in the above way.
-@item ---verify-files @code{files}
-This is a special version of the ---verify command which does not work with
-detached signatures. The command expects the files to be verified either
-on the command line or reads the filenames from stdin; each name must be on
-separate line. The command is intended for quick checking of many files.
+@item --multifile
+This modifies certain other commands to accept multiple files for
+processing on the command line or read from stdin with each filename
+on a separate line. This allows for many files to be processed at
+once. --multifile may currently be used along with --verify,
+--encrypt, and --decrypt. Note that `--multifile --verify' may not be
+used with detached signatures.
-@item ---encrypt-files @code{files}
-This is a special version of the ---encrypt command. The command expects
-the files to be encrypted either on the command line or reads the filenames
-from stdin; each name must be on separate line. The command is intended
-for a quick encryption of multiple files.
+@item --verify-files
+Identical to `--multifile --verify'.
-@item ---decrypt-files @code{files}
-The same as ---encrypt-files with the difference that files will be
-decrypted. The syntax or the filenames is the same.
+@item --encrypt-files
+Identical to `--multifile --encrypt'.
-@item ---list-keys @code{names}
-@itemx ---list-public-keys @code{names}
+@item --decrypt-files
+Identical to `--multifile --decrypt'.
+
+@item --list-keys
+@itemx --list-public-keys
List all keys from the public keyrings, or just the ones given on the
command line.
Avoid using the output of this command in scripts or other programs as
-it is likely to change as GnuPG changes. See ---with-colons for a
+it is likely to change as GnuPG changes. See --with-colons for a
machine-parseable key listing command that is appropriate for use in
scripts and other programs.
-@item ---list-secret-keys @code{names}
+@item -K, --list-secret-keys
List all keys from the secret keyrings, or just the ones given on the
command line. A '#' after the letters 'sec' means that the secret key
is not usable (for example, if it was created via
----export-secret-subkeys).
+--export-secret-subkeys).
-@item ---list-sigs @code{names}
-Same as ---list-keys, but the signatures are listed too.
+@item --list-sigs
+Same as --list-keys, but the signatures are listed too.
For each signature listed, there are several flags in between the
"sig" tag and keyid. These flags give additional information about
each signature. From left to right, they are the numbers 1-3 for
-certificate check level (see ---default-cert-check-level), "L" for a
-local or non-exportable signature (see ---lsign-key), "R" for a
-nonRevocable signature (see ---nrsign-key), "P" for a signature that
-contains a policy URL (see ---cert-policy-url), "N" for a signature
-that contains a notation (see ---cert-notation), "X" for an eXpired
-signature (see ---ask-cert-expire), and the numbers 1-9 or "T" for 10
-and above to indicate trust signature levels (see the ---edit-key
-command "tsign").
-
-@item ---check-sigs @code{names}
-Same as ---list-sigs, but the signatures are verified.
-
-@item ---fingerprint @code{names}
+certificate check level (see --ask-cert-level), "L" for a local or
+non-exportable signature (see --lsign-key), "R" for a nonRevocable
+signature (see --nrsign-key), "P" for a signature that contains a
+policy URL (see --cert-policy-url), "N" for a signature that contains
+a notation (see --cert-notation), "X" for an eXpired signature (see
+--ask-cert-expire), and the numbers 1-9 or "T" for 10 and above to
+indicate trust signature levels (see the --edit-key command "tsign").
+
+@item --check-sigs
+Same as --list-sigs, but the signatures are verified.
+
+@item --fingerprint
List all keys with their fingerprints. This is the
-same output as ---list-keys but with the additional output
+same output as --list-keys but with the additional output
of a line with the fingerprint. May also be combined
-with ---list-sigs or --check-sigs.
+with --list-sigs or --check-sigs.
If this command is given twice, the fingerprints of all
secondary keys are listed too.
-@item ---list-packets
+@item --list-packets
List only the sequence of packets. This is mainly
useful for debugging.
-@item ---gen-key
+@item --gen-key
Generate a new key pair. This command is normally only used
interactively.
@@ -153,11 +170,12 @@ There is an experimental feature which allows you to create keys
in batch mode. See the file @file{doc/DETAILS}
in the source distribution on how to use this.
-@item ---edit-key @code{name}
+@item --edit-key @code{name}
Present a menu which enables you to do all key
related tasks:
@table @asis
+
@item sign
Make a signature on key of user @code{name}
If the key is not yet signed by the default
@@ -169,13 +187,13 @@ question is repeated for all users specified
with -u.
@item lsign
-Same as ---sign but the signature is marked as
+Same as --sign but the signature is marked as
non-exportable and will therefore never be used
by others. This may be used to make keys valid
only in the local environment.
@item nrsign
-Same as ---sign but the signature is marked as non-revocable and can
+Same as --sign but the signature is marked as non-revocable and can
therefore never be revoked.
@item nrlsign
@@ -208,22 +226,41 @@ Create an alternate user id.
@item addphoto
Create a photographic user id. This will prompt for a JPEG file that
-will be embedded into the user ID. A very large JPEG will make for a
-very large key.
+will be embedded into the user ID. Note that a very large JPEG will
+make for a very large key. Also note that some programs will display
+your JPEG unchanged (GnuPG), and some programs will scale it to fit in
+a dialog box (PGP).
@item deluid
Delete a user id.
+@item delsig
+Delete a signature.
+
@item revuid
Revoke a user id.
@item addkey
Add a subkey to this key.
+@item addcardkey
+Generate a key on a card and add it
+to this key.
+
+@item keytocard
+Transfer the selected secret key (or the primary key if no key has
+been selected) to a smartcard. The secret key in the keyring will be
+replaced by a stub if the key could be stored successfully on the card
+and you use the save command later. Only certain key types may be
+transferred to the card. A sub menu allows you to select on what card
+to store the key. Note that it is not possible to get that key back
+from the card - if the card gets broken your secret key will be lost
+unless you have a backup somewhere.
+
@item delkey
Remove a subkey.
-@item addrevoker
+@item addrevoker
Add a designated revoker. This takes one optional argument:
"sensitive". If a designated revoker is marked as sensitive, it will
not be exported by default (see
@@ -277,7 +314,7 @@ are not already included in the preference list.
Set the list of user ID preferences to @code{string}, this should be a
string similar to the one printed by "pref". Using an empty string
will set the default preference string, using "none" will set the
-preferences to nil. Use "gpg ---version" to get a list of available
+preferences to nil. Use "gpg --version" to get a list of available
algorithms. This command just initializes an internal list and does
not change anything unless another command (such as "updpref") which
changes the self-signatures is used.
@@ -290,6 +327,13 @@ can change the preferences on an attribute user ID (aka "photo ID"),
GnuPG does not select keys via attribute user IDs so these preferences
will not be used by GnuPG.
+@item keyserver
+Set a preferred keyserver for the specified user ID(s). This allows
+other users to know where you prefer they get your key from. See
+--keyserver-option honor-keyserver-url. Note that some versions of
+PGP interpret the presence of a keyserver URL as an instruction to
+enable PGP/MIME mail encoding.
+
@item toggle
Toggle between public and secret key listing.
@@ -299,7 +343,6 @@ Save all changes to the key rings and quit.
@item quit
Quit the program without updating the
key rings.
-
@end table
The listing shows you the key with its secondary
@@ -310,6 +353,7 @@ assigned owner trust and the second is the calculated
trust value. Letters are used for the values:
@table @asis
+
@item -
No ownertrust assigned / not yet calculated.
@@ -331,165 +375,162 @@ Fully trusted.
@item u
Ultimately trusted.
-
@end table
-@item ---sign-key @code{name}
+@item --sign-key @code{name}
Signs a public key with your secret key. This is a shortcut version of
-the subcommand "sign" from ---edit.
+the subcommand "sign" from --edit.
-@item ---lsign-key @code{name}
+@item --lsign-key @code{name}
Signs a public key with your secret key but marks it as
non-exportable. This is a shortcut version of the subcommand "lsign"
-from ---edit.
+from --edit.
-@item ---nrsign-key @code{name}
+@item --nrsign-key @code{name}
Signs a public key with your secret key but marks it as non-revocable.
-This is a shortcut version of the subcommand "nrsign" from ---edit.
+This is a shortcut version of the subcommand "nrsign" from --edit.
-@item ---delete-key @code{name}
-Remove key from the public keyring. In batch mode either ---yes is
+@item --delete-key @code{name}
+Remove key from the public keyring. In batch mode either --yes is
required or the key must be specified by fingerprint. This is a
safeguard against accidental deletion of multiple keys.
-@item ---delete-secret-key @code{name}
+@item --delete-secret-key @code{name}
Remove key from the secret and public keyring. In batch mode the key
must be specified by fingerprint.
-@item ---delete-secret-and-public-key @code{name}
-Same as ---delete-key, but if a secret key exists, it will be removed
+@item --delete-secret-and-public-key @code{name}
+Same as --delete-key, but if a secret key exists, it will be removed
first. In batch mode the key must be specified by fingerprint.
-@item ---gen-revoke
+@item --gen-revoke @code{name}
Generate a revocation certificate for the complete key. To revoke
-a subkey or a signature, use the ---edit command.
+a subkey or a signature, use the --edit command.
-@item ---desig-revoke
+@item --desig-revoke @code{name}
Generate a designated revocation certificate for a key. This allows a
user (with the permission of the keyholder) to revoke someone else's
key.
-@item ---export @code{names}
+@item --export
Either export all keys from all keyrings (default
-keyrings and those registered via option ---keyring),
+keyrings and those registered via option --keyring),
or if at least one name is given, those of the given
name. The new keyring is written to stdout or to
the file given with option "output". Use together
-with ---armor to mail those keys.
+with --armor to mail those keys.
-@item ---send-keys @code{names}
-Same as ---export but sends the keys to a keyserver.
-Option ---keyserver must be used to give the name
+@item --send-keys
+Same as --export but sends the keys to a keyserver.
+Option --keyserver must be used to give the name
of this keyserver. Don't send your complete keyring
to a keyserver - select only those keys which are new
or changed by you.
-@item ---export-all @code{names}
-Same as ---export, but also exports keys which
-are not compatible with OpenPGP.
-
-@item ---export-secret-keys @code{names}
-@itemx ---export-secret-subkeys @code{names}
-Same as ---export, but exports the secret keys instead.
+@item --export-secret-keys
+@itemx --export-secret-subkeys
+Same as --export, but exports the secret keys instead.
This is normally not very useful and a security risk.
The second form of the command has the special property to
render the secret part of the primary key useless; this is
a GNU extension to OpenPGP and other implementations can
not be expected to successfully import such a key.
-See the option ---simple-sk-checksum if you want to import such an
+See the option --simple-sk-checksum if you want to import such an
exported key with an older OpenPGP implementation.
-@item ---import @code{files}
-@itemx ---fast-import @code{files}
+@item --import
+@itemx --fast-import
Import/merge keys. This adds the given keys to the
keyring. The fast version is currently just a synonym.
There are a few other options which control how this command works.
-Most notable here is the ---merge-only option which does not insert new keys
-but does only the merging of new signatures, user-IDs and subkeys.
+Most notable here is the --keyserver-option merge-only option which
+does not insert new keys but does only the merging of new signatures,
+user-IDs and subkeys.
-@item ---recv-keys @code{key IDs}
+@item --recv-keys @code{key IDs}
Import the keys with the given key IDs from a keyserver. Option
----keyserver must be used to give the name of this keyserver.
+--keyserver must be used to give the name of this keyserver.
-@item ---refresh-keys @code{key IDs}
+@item --refresh-keys
Request updates from a keyserver for keys that already exist on the
local keyring. This is useful for updating a key with the latest
-signatures, user IDs, etc. Option ---keyserver must be used to give
-the name of this keyserver.
+signatures, user IDs, etc. Calling this with no arguments will
+refresh the entire keyring. Option --keyserver must be used to give
+the name of the keyserver for all keys that do not have preferred
+keyservers set (see --keyserver-option honor-keyserver-url).
-@item ---search-keys @code{names}
+@item --search-keys
Search the keyserver for the given names. Multiple names given here
will be joined together to create the search string for the keyserver.
-Option ---keyserver must be used to give the name of this keyserver.
+Option --keyserver must be used to give the name of this keyserver.
-@item ---update-trustdb
+@item --update-trustdb
Do trust database maintenance. This command iterates over all keys
and builds the Web-of-Trust. This is an interactive command because it
may have to ask for the "ownertrust" values for keys. The user has to
give an estimation of how far she trusts the owner of the displayed
key to correctly certify (sign) other keys. GnuPG only asks for the
ownertrust value if it has not yet been assigned to a key. Using the
----edit-key menu, the assigned value can be changed at any time.
+--edit-key menu, the assigned value can be changed at any time.
-@item ---check-trustdb
+@item --check-trustdb
Do trust database maintenance without user interaction. From time to
time the trust database must be updated so that expired keys or
signatures and the resulting changes in the Web-of-Trust can be
tracked. Normally, GnuPG will calculate when this is required and do
-it automatically unless ---no-auto-check-trustdb is set. This command
+it automatically unless --no-auto-check-trustdb is set. This command
can be used to force a trust database check at any time. The
-processing is identical to that of ---update-trustdb but it skips keys
+processing is identical to that of --update-trustdb but it skips keys
with a not yet defined "ownertrust".
-For use with cron jobs, this command can be used together with ---batch
+For use with cron jobs, this command can be used together with --batch
in which case the trust database check is done only if a check is
-needed. To force a run even in batch mode add the option ---yes.
+needed. To force a run even in batch mode add the option --yes.
-@item ---export-ownertrust
+@item --export-ownertrust
Send the ownertrust values to stdout. This is useful for backup
purposes as these values are the only ones which can't be re-created
from a corrupted trust DB.
-@item ---import-ownertrust @code{files}
+@item --import-ownertrust
Update the trustdb with the ownertrust values stored
in @code{files} (or stdin if not given); existing
values will be overwritten.
-@item ---rebuild-keydb-caches
+@item --rebuild-keydb-caches
When updating from version 1.0.6 to 1.0.7 this command should be used
to create signature caches in the keyring. It might be handy in other
situations too.
-@item ---print-md @code{algo} @code{files}
-@itemx ---print-mds @code{files}
+@item --print-md @code{algo}
+@itemx --print-mds
Print message digest of algorithm ALGO for all given files or stdin.
With the second form (or a deprecated "*" as algo) digests for all
available algorithms are printed.
-@item ---gen-random @code{0|1|2} @code{count}
+@item --gen-random @code{0|1|2}
Emit COUNT random bytes of the given quality level. If count is not given
or zero, an endless sequence of random bytes will be emitted.
PLEASE, don't use this command unless you know what you are doing; it may
remove precious entropy from the system!
-@item ---gen-prime @code{mode} @code{bits} @code{qbits}
+@item --gen-prime @code{mode} @code{bits}
Use the source, Luke :-). The output format is still subject to change.
-@item ---version
+@item --version
Print version information along with a list
of supported algorithms.
-@item ---warranty
+@item --warranty
Print warranty information.
-@item -h, ---help
+@item -h, --help
Print usage information. This is a really long list even though it
doesn't list all options. For every option, consult this manual.
-
@end table
+@chapheading OPTIONS
-@majorheading OPTIONS
Long options can be put in an options file (default
"~/.gnupg/gpg.conf"). Short option names will not work - for example,
"armor" is a valid option for the options file, while "a" is not. Do
@@ -502,118 +543,163 @@ automatically with every execution of gpg.
@code{gpg} recognizes these options:
@table @asis
-@item -a, ---armor
+
+@item -a, --armor
Create ASCII armored output.
-@item -o, ---output @code{file}
+@item -o, --output @code{file}
Write output to @code{file}.
-@item ---mangle-dos-filenames
-@itemx ---no-mangle-dos-filenames
+@item --max-output @code{n}
+This option sets a limit on the number of bytes that will be generated
+when processing a file. Since OpenPGP supports various levels of
+compression, it is possible that the plaintext of a given message may
+be significantly larger than the original OpenPGP message. While
+GnuPG works properly with such messages, there is often a desire to
+set a maximum file size that will be generated before processing is
+forced to stop by the OS limits. Defaults to 0, which means "no
+limit".
+
+@item --mangle-dos-filenames
+@itemx --no-mangle-dos-filenames
Older version of Windows cannot handle filenames with more than one
-dot. ---mangle-dos-filenames causes GnuPG to replace (rather than add
+dot. --mangle-dos-filenames causes GnuPG to replace (rather than add
to) the extension of an output filename to avoid this problem. This
option is off by default and has no effect on non-Windows platforms.
-@item -u, ---local-user @code{name}
-Use @code{name} as the user ID to sign.
-This option is silently ignored for the list commands,
-so that it can be used in an options file.
+@item -u, --local-user @code{name}
+Use @code{name} as the key to sign with. Note that this option
+overrides --default-key.
-@item ---default-key @code{name}
-Use @code{name} as default user ID for signatures. If this
-is not used the default user ID is the first user ID
-found in the secret keyring.
+@item --default-key @code{name}
+Use @code{name} as the default key to sign with. If this option is not
+used, the default key is the first key found in the secret keyring.
+Note that -u or --local-user overrides this option.
-@item -r, ---recipient @code{name}
+@item -r, --recipient @code{name}
@itemx
-Encrypt for user id @code{name}. If this option or ---hidden-recipient
+Encrypt for user id @code{name}. If this option or --hidden-recipient
is not specified, GnuPG asks for the user-id unless
----default-recipient is given.
+--default-recipient is given.
-@item -R, ---hidden-recipient @code{name}
+@item -R, --hidden-recipient @code{name}
@itemx
Encrypt for user id @code{name}, but hide the keyid of the key. This
option hides the receiver of the message and is a countermeasure
-against traffic analysis. If this option or ---recipient is not
-specified, GnuPG asks for the user-id unless ---default-recipient is
+against traffic analysis. If this option or --recipient is not
+specified, GnuPG asks for the user-id unless --default-recipient is
given.
-@item ---default-recipient @code{name}
-Use @code{name} as default recipient if option ---recipient is not used and
+@item --default-recipient @code{name}
+Use @code{name} as default recipient if option --recipient is not used and
don't ask if this is a valid one. @code{name} must be non-empty.
-@item ---default-recipient-self
-Use the default key as default recipient if option ---recipient is not used and
+@item --default-recipient-self
+Use the default key as default recipient if option --recipient is not used and
don't ask if this is a valid one. The default key is the first one from the
-secret keyring or the one set with ---default-key.
+secret keyring or the one set with --default-key.
-@item ---no-default-recipient
-Reset ---default-recipient and --default-recipient-self.
+@item --no-default-recipient
+Reset --default-recipient and --default-recipient-self.
-@item ---encrypt-to @code{name}
-Same as ---recipient but this one is intended for use
+@item --encrypt-to @code{name}
+Same as --recipient but this one is intended for use
in the options file and may be used with
your own user-id as an "encrypt-to-self". These keys
are only used when there are other recipients given
-either by use of ---recipient or by the asked user id.
+either by use of --recipient or by the asked user id.
No trust checking is performed for these user ids and
even disabled keys can be used.
-@item ---hidden-encrypt-to @code{name}
-Same as ---hidden-recipient but this one is intended for use in the
+@item --hidden-encrypt-to @code{name}
+Same as --hidden-recipient but this one is intended for use in the
options file and may be used with your own user-id as a hidden
"encrypt-to-self". These keys are only used when there are other
-recipients given either by use of ---recipient or by the asked user id.
+recipients given either by use of --recipient or by the asked user id.
No trust checking is performed for these user ids and even disabled
keys can be used.
-@item ---no-encrypt-to
-Disable the use of all ---encrypt-to and --hidden-encrypt-to keys.
+@item --no-encrypt-to
+Disable the use of all --encrypt-to and --hidden-encrypt-to keys.
-@item -v, ---verbose
+@item -v, --verbose
Give more information during processing. If used
twice, the input data is listed in detail.
-@item -q, ---quiet
+@item -q, --quiet
Try to be as quiet as possible.
-@item -z @code{n}, ---compress @code{n}
-Set compression level to @code{n}. A value of 0 for @code{n}
-disables compression. Default is to use the default
-compression level of zlib (normally 6).
-
-@item -t, ---textmode
-@itemx ---no-textmode
-Use canonical text mode. ---no-textmode disables this option. If -t
-(but not ---textmode) is used together with armoring and signing, this
-enables clearsigned messages. This kludge is needed for command-line
-compatibility with command-line versions of PGP; normally you would
-use ---sign or --clearsign to select the type of the signature.
-
-@item -n, ---dry-run
+@item -z @code{n}
+@itemx --compress-level @code{n}
+@itemx --bzip2-compress-level @code{n}
+Set compression level to @code{n} for the ZIP and ZLIB compression
+algorithms. The default is to use the default compression level of
+zlib (normally 6). --bzip2-compress-level sets the compression level
+for the BZIP2 compression algorithm (defaulting to 6 as well). This
+is a different option from --compress-level since BZIP2 uses a
+significant amount of memory for each additional compression level.
+-z sets both. A value of 0 for @code{n} disables compression.
+
+@item --bzip2-decompress-lowmem
+Use a different decompression method for BZIP2 compressed files. This
+alternate method uses a bit more than half the memory, but also runs
+at half the speed. This is useful under extreme low memory
+circumstances when the file was originally compressed at a high
+--bzip2-compress-level.
+
+@item -t, --textmode
+@itemx --no-textmode
+Treat input files as text and store them in the OpenPGP canonical text
+form with standard "CRLF" line endings. This also sets the necessary
+flags to inform the recipient that the encrypted or signed data is
+text and may need its line endings converted back to whatever the
+local system uses. This option is useful when communicating between
+two platforms that have different line ending conventions (UNIX-like
+to Mac, Mac to Windows, etc). --no-textmode disables this option, and
+is the default.
+
+If -t (but not --textmode) is used together with armoring and signing,
+this enables clearsigned messages. This kludge is needed for
+command-line compatibility with command-line versions of PGP; normally
+you would use --sign or --clearsign to select the type of the
+signature.
+
+@item -n, --dry-run
Don't make any changes (this is not completely implemented).
-@item -i, ---interactive
+@item -i, --interactive
Prompt before overwriting any files.
-@item ---batch
-@itemx ---no-batch
+@item --batch
+@itemx --no-batch
Use batch mode. Never ask, do not allow interactive commands.
----no-batch disables this option.
+--no-batch disables this option.
-@item ---no-tty
+@item --no-tty
Make sure that the TTY (terminal) is never used for any output.
This option is needed in some cases because GnuPG sometimes prints
-warnings to the TTY if ---batch is used.
+warnings to the TTY if --batch is used.
-@item ---yes
+@item --yes
Assume "yes" on most questions.
-@item ---no
+@item --no
Assume "no" on most questions.
-@item ---default-cert-check-level @code{n}
+@item --ask-cert-level
+@itemx --no-ask-cert-level
+When making a key signature, prompt for a certification level. If
+this option is not specified, the certification level used is set via
+--default-cert-level. See --default-cert-level for information on the
+specific levels and how they are used. --no-ask-cert-level disables
+this option. This option defaults to no.
+
+@item --min-cert-level
+When building the trust database, disregard any signatures with a
+certification level below this. Defaults to 2, which disregards level
+1 signatures.
+
+@item --default-cert-level @code{n}
The default to use for the check level when signing a key.
0 means you make no particular claim as to how carefully you verified
@@ -640,9 +726,9 @@ Note that the examples given above for levels 2 and 3 are just that:
examples. In the end, it is up to you to decide just what "casual"
and "extensive" mean to you.
-This option defaults to 0.
+This option defaults to 0 (no particular claim).
-@item ---trusted-key @code{long key ID}
+@item --trusted-key @code{long key ID}
Assume that the specified key (which must be given
as a full 8 byte key ID) is as trustworthy as one of
your own secret keys. This option is useful if you
@@ -650,10 +736,11 @@ don't want to keep your secret keys (or one of them)
online but still want to be able to check the validity of a given
recipient's or signator's key.
-@item ---trust-model @code{pgp|classic|always}
+@item --trust-model @code{pgp|classic|always}
Set what trust model GnuPG should follow. The models are:
@table @asis
+
@item pgp
This is the web-of-trust combined with trust signatures as used in PGP
5.x and later. This is the default trust model.
@@ -667,50 +754,62 @@ trusted. You won't use this unless you have installed some external
validation scheme. This option also suppresses the "[uncertain]" tag
printed with signature checks when there is no evidence that the user
ID is bound to the key.
-
@end table
-@item ---always-trust
-Identical to `---trust-model always'
-
-@item ---keyserver @code{name}
-Use @code{name} as your keyserver. This is the server that ---recv-keys,
----send-keys, and --search-keys will communicate with to receive keys
-from, send keys to, and search for keys on. The format of the
-@code{name} is a URI: `scheme:[//]keyservername[:port]' The scheme is
-the type of keyserver: "hkp" for the Horowitz (or compatible)
+@item --always-trust
+Identical to `--trust-model always'. This option is deprecated.
+
+@item --keyid-format @code{short|0xshort|long|0xlong}
+Select how to display key IDs. "short" is the traditional 8-character
+key ID. "long" is the more accurate (but less convenient)
+16-character key ID. Add an "0x" to either to include an "0x" at the
+beginning of the key ID, as in 0x99242560.
+
+@item --keyserver @code{name}
+Use @code{name} as your keyserver. This is the server that
+--recv-keys, --send-keys, and --search-keys will communicate with to
+receive keys from, send keys to, and search for keys on. The format
+of the @code{name} is a URI: `scheme:[//]keyservername[:port]' The
+scheme is the type of keyserver: "hkp" for the HTTP (or compatible)
keyservers, "ldap" for the NAI LDAP keyserver, or "mailto" for the
-Horowitz email keyserver. Note that your particular installation of
+Graff email keyserver. Note that your particular installation of
GnuPG may have other keyserver types available as well. Keyserver
schemes are case-insensitive.
Most keyservers synchronize with each other, so there is generally no
-need to send keys to more than one server. Using the command "host -l
-pgp.net | grep wwwkeys" gives you a list of HKP keyservers. When
-using one of the wwwkeys servers, due to load balancing using
-round-robin DNS you may notice that you get a different key server
-each time.
+need to send keys to more than one server. The keyserver
+"hkp://subkeys.pgp.net" uses round robin DNS to give a different
+keyserver each time you use it.
-@item ---keyserver-options @code{parameters}
+@item --keyserver-options @code{parameters}
This is a space or comma delimited string that gives options for the
keyserver. Options can be prepended with a `no-' to give the opposite
meaning. Valid import-options or export-options may be used here as
-well to apply to importing (---recv-key) or exporting (--send-key) a
+well to apply to importing (--recv-key) or exporting (--send-key) a
key from a keyserver. While not all options are available for all
keyserver types, some common options are:
@table @asis
+
@item include-revoked
-When searching for a key with ---search-keys, include keys that are
-marked on the keyserver as revoked. Note that this option is always
-set when using the NAI HKP keyserver, as this keyserver does not
-differentiate between revoked and unrevoked keys.
+When searching for a key with --search-keys, include keys that are
+marked on the keyserver as revoked. Note that not all keyservers
+differentiate between revoked and unrevoked keys, and for such
+keyservers this option is meaningless. Note also that most keyservers
+do not have cryptographic verification of key revocations, and so
+turning this option off may result in skipping keys that are
+incorrectly marked as revoked. Defaults to on.
@item include-disabled
-When searching for a key with ---search-keys, include keys that are
+When searching for a key with --search-keys, include keys that are
marked on the keyserver as disabled. Note that this option is not
used with HKP keyservers.
+@item honor-keyserver-url
+When using --refresh-keys, if the key in question has a preferred
+keyserver set, then use that preferred keyserver to refresh the key
+from. Defaults to yes.
+
@item include-subkeys
When receiving a key, include subkeys as potential targets. Note that
this option is not used with HKP keyservers, as they do not support
@@ -731,10 +830,11 @@ protocol by reading the temporary files.
Tell the keyserver helper program to be more verbose. This option can
be repeated multiple times to increase the verbosity level.
-@item honor-http-proxy
+@item http-proxy
For keyserver schemes that use HTTP (such as HKP), try to access the
-keyserver over the proxy set with the environment variable
-"http_proxy".
+keyserver over a proxy. If a @code{value} is specified, use this as
+the HTTP proxy. If no @code{value} is specified, try to use the value
+of the environment variable "http_proxy".
@item auto-key-retrieve
This option enables the automatic retrieving of keys from a keyserver
@@ -746,15 +846,15 @@ Keyserver operators can see which keys you request, so by sending you
a message signed by a brand new key (which you naturally will not have
on your local keyring), the operator can tell both your IP address and
the time when you verified the signature.
-
@end table
-@item ---import-options @code{parameters}
+@item --import-options @code{parameters}
This is a space or comma delimited string that gives options for
importing keys. Options can be prepended with a `no-' to give the
opposite meaning. The options are:
@table @asis
+
@item allow-local-sigs
Allow importing key signatures marked as "local". This is not
generally useful unless a shared keyring scheme is being used.
@@ -765,19 +865,20 @@ During import, attempt to repair the damage caused by the PKS
keyserver bug (pre version 0.9.6) that mangles keys with multiple
subkeys. Note that this cannot completely repair the damaged key as
some crucial data is removed by the keyserver, but it does at least
-give you back one subkey. Defaults to no for regular ---import and to
-yes for keyserver ---recv-keys.
+give you back one subkey. Defaults to no for regular --import and to
+yes for keyserver --recv-keys.
+@item merge-only
+During import, allow key updates to existing keys, but do not allow
+any new keys to be imported. Defaults to no.
@end table
-@item ---export-options @code{parameters}
+@item --export-options @code{parameters}
This is a space or comma delimited string that gives options for
exporting keys. Options can be prepended with a `no-' to give the
opposite meaning. The options are:
@table @asis
-@item include-non-rfc
-Include non-RFC compliant keys in the export. Defaults to yes.
@item include-local-sigs
Allow exporting key signatures marked as "local". This is not
@@ -792,100 +893,104 @@ program that does not accept attribute user IDs. Defaults to yes.
@item include-sensitive-revkeys
Include designated revoker information that was marked as
"sensitive". Defaults to no.
-
@end table
-@item ---list-options @code{parameters}
+@item --list-options @code{parameters}
This is a space or comma delimited string that gives options used when
-listing keys and signatures (that is, ---list-keys, --list-sigs,
----list-public-keys, --list-secret-keys, and the --edit-key functions).
+listing keys and signatures (that is, --list-keys, --list-sigs,
+--list-public-keys, --list-secret-keys, and the --edit-key functions).
Options can be prepended with a `no-' to give the opposite meaning.
The options are:
@table @asis
-@item show-photos
-Causes ---list-keys, --list-sigs, --list-public-keys, and
----list-secret-keys to display any photo IDs attached to the key.
-Defaults to no. See also ---photo-viewer.
-@item show-policy-url
-Show policy URLs in the ---list-sigs or --check-sigs listings.
-Defaults to no.
+@item show-photos
+Causes --list-keys, --list-sigs, --list-public-keys, and
+--list-secret-keys to display any photo IDs attached to the key.
+Defaults to no. See also --photo-viewer.
-@item show-notation
-Show signature notations in the ---list-sigs or --check-sigs listings.
+@item show-policy-urls
+Show policy URLs in the --list-sigs or --check-sigs listings.
Defaults to no.
-@item show-keyserver-url
-Show any preferred keyserver URL in the ---list-sigs or --check-sigs
-listings. Defaults to no.
+@item show-notations
+@itemx show-std-notations
+@itemx show-user-notations
+Show all, IETF standard, or user-defined signature notations in the
+--list-sigs or --check-sigs listings. Defaults to no.
-@item show-validity
-Display the calculated validity of keys and user IDs during key
+@item show-keyserver-urls
+Show any preferred keyserver URL in the --list-sigs or --check-sigs
listings. Defaults to no.
-@item show-long-keyid
-Display all 64 bits (16 digits) of key IDs during key listings, rather
-than the more common 32 bit (8 digit) IDs. Defaults to no.
+@item show-uid-validity
+Display the calculated validity of user IDs during key listings.
+Defaults to no.
@item show-unusable-uids
Show revoked and expired user IDs in key listings. Defaults to no.
+@item show-unusable-subkeys
+Show revoked and expired subkeys in key listings. Defaults to no.
+
@item show-keyring
Display the keyring name at the head of key listings to show which
keyring a given key resides on. Defaults to no.
@item show-sig-expire
-Show signature expiration dates (if any) during ---list-sigs or
----check-sigs listings. Defaults to no.
-
+Show signature expiration dates (if any) during --list-sigs or
+--check-sigs listings. Defaults to no.
+
+@item show-sig-subpackets
+Include signature subpackets in the key listing. This option can take
+an optional argument list of the subpackets to list. If no argument
+is passed, list all subpackets. Defaults to no. This option is only
+meaningful when using --with-colons along with --list-sigs or
+--check-sigs.
@end table
-@item ---verify-options @code{parameters}
+@item --verify-options @code{parameters}
This is a space or comma delimited string that gives options used when
verifying signatures. Options can be prepended with a `no-' to give
the opposite meaning. The options are:
@table @asis
+
@item show-photos
Display any photo IDs present on the key that issued the signature.
-Defaults to no. See also ---photo-viewer.
+Defaults to no. See also --photo-viewer.
-@item show-policy-url
+@item show-policy-urls
Show policy URLs in the signature being verified. Defaults to no.
-@item show-notation
-Show signature notations in the signature being verified. Defaults to
-no.
+@item show-notations
+@itemx show-std-notations
+@itemx show-user-notations
+Show all, IETF standard, or user-defined signature notations in the
+signature being verified. Defaults to IETF standard.
-@item show-keyserver-url
+@item show-keyserver-urls
Show any preferred keyserver URL in the signature being verified.
Defaults to no.
-@item show-validity
+@item show-uid-validity
Display the calculated validity of the user IDs on the key that issued
the signature. Defaults to no.
-@item show-long-keyid
-Display all 64 bits (16 digits) of key IDs during signature
-verification, rather than the more common 32 bit (8 digit) IDs.
-Defaults to no.
-
@item show-unusable-uids
Show revoked and expired user IDs during signature verification.
Defaults to no.
-
@end table
-@item ---show-photos
-@itemx ---no-show-photos
-Causes ---list-keys, --list-sigs, --list-public-keys,
----list-secret-keys, and verifying a signature to also display the
-photo ID attached to the key, if any. See also ---photo-viewer. These
-options are deprecated. Use `---list-options [no-]show-photos' and/or
-`---verify-options [no-]show-photos' instead.
+@item --show-photos
+@itemx --no-show-photos
+Causes --list-keys, --list-sigs, --list-public-keys,
+--list-secret-keys, and verifying a signature to also display the
+photo ID attached to the key, if any. See also --photo-viewer. These
+options are deprecated. Use `--list-options [no-]show-photos' and/or
+`--verify-options [no-]show-photos' instead.
-@item ---photo-viewer @code{string}
+@item --photo-viewer @code{string}
This is the command line that should be run to view a photo ID. "%i"
will be expanded to a filename containing the photo. "%I" does the
same, except the file will not be deleted once the viewer exits.
@@ -899,55 +1004,58 @@ The default viewer is "xloadimage -fork -quiet -title 'KeyID 0x%k'
stdin". Note that if your image viewer program is not secure, then
executing it from GnuPG does not make it secure.
-@item ---exec-path @code{string}
+@item --exec-path @code{string}
Sets a list of directories to search for photo viewers and keyserver
helpers. If not provided, keyserver helpers use the compiled-in
default directory, and photo viewers use the $PATH environment
variable.
-@item ---show-keyring
+@item --show-keyring
Display the keyring name at the head of key listings to show which
keyring a given key resides on. This option is deprecated: use
-`---list-options [no-]show-keyring' instead.
-
-@item ---keyring @code{file}
-Add @code{file} to the list of keyrings. If @code{file} begins with a
-tilde and a slash, these are replaced by the HOME directory. If the
-filename does not contain a slash, it is assumed to be in the GnuPG
-home directory ("~/.gnupg" if ---homedir is not used). The filename
-may be prefixed with a scheme:
+`--list-options [no-]show-keyring' instead.
-"gnupg-ring:" is the default one.
+@item --keyring @code{file}
+Add @code{file} to the current list of keyrings. If @code{file} begins
+with a tilde and a slash, these are replaced by the $HOME
+directory. If the filename does not contain a slash, it is assumed to
+be in the GnuPG home directory ("~/.gnupg" if --homedir or $GNUPGHOME
+is not used).
-It might make sense to use it together with ---no-default-keyring.
+Note that this adds a keyring to the current list. If the intent is
+to use the specified keyring alone, use --keyring along with
+--no-default-keyring.
-@item ---secret-keyring @code{file}
-Same as ---keyring but for the secret keyrings.
+@item --secret-keyring @code{file}
+Same as --keyring but for the secret keyrings.
-@item ---primary-keyring @code{file}
+@item --primary-keyring @code{file}
Designate @code{file} as the primary public keyring. This means that
-newly imported keys (via ---import or keyserver --recv-from) will go to
+newly imported keys (via --import or keyserver --recv-from) will go to
this keyring.
-@item ---trustdb-name @code{file}
+@item --trustdb-name @code{file}
Use @code{file} instead of the default trustdb. If @code{file} begins
-with a tilde and a slash, these are replaced by the HOME directory. If
-the filename does not contain a slash, it is assumed to be in the
-GnuPG home directory ("~/.gnupg" if ---homedir is not used).
-
-@item ---homedir @code{directory}
-Set the name of the home directory to @code{directory} If this
-option is not used it defaults to "~/.gnupg". It does
-not make sense to use this in a options file. This
-also overrides the environment variable "GNUPGHOME".
-
-@item ---charset @code{name}
-Set the name of the native character set. This is used
-to convert some strings to proper UTF-8 encoding. If this option is not used, the default character set is determined
-from the current locale. A verbosity level of 3 shows the used one.
-Valid values for @code{name} are:
+with a tilde and a slash, these are replaced by the $HOME
+directory. If the filename does not contain a slash, it is assumed to
+be in the GnuPG home directory ("~/.gnupg" if --homedir or $GNUPGHOME
+is not used).
+
+@item --homedir @code{directory}
+Set the name of the home directory to @code{directory} If this option is not
+used it defaults to "~/.gnupg". It does not make sense to use this in
+a options file. This also overrides the environment variable
+$GNUPGHOME.
+
+@item --display-charset @code{name}
+Set the name of the native character set. This is used to convert
+some informational strings like user IDs to the proper UTF-8
+encoding. If this option is not used, the default character set is
+determined from the current locale. A verbosity level of 3 shows the
+chosen set. Valid values for @code{name} are:
@table @asis
+
@item iso-8859-1
This is the Latin 1 set.
@@ -964,93 +1072,96 @@ The usual Russian set (rfc1489).
@item utf-8
Bypass all translations and assume
that the OS uses native UTF-8 encoding.
-
@end table
-@item ---utf8-strings
-@itemx ---no-utf8-strings
-Assume that the arguments are already given as UTF8 strings. The default
-(---no-utf8-strings)
-is to assume that arguments are encoded in the character set as specified
-by ---charset. These options affect all following arguments. Both options may
-be used multiple times.
+@item --utf8-strings
+@itemx --no-utf8-strings
+Assume that command line arguments are given as UTF8 strings. The
+default (--no-utf8-strings) is to assume that arguments are encoded in
+the character set as specified by --display-charset. These options
+affect all following arguments. Both options may be used multiple
+times.
-@item ---options @code{file}
+@item --options @code{file}
Read options from @code{file} and do not try to read
them from the default options file in the homedir
-(see ---homedir). This option is ignored if used
+(see --homedir). This option is ignored if used
in an options file.
-@item ---no-options
-Shortcut for "---options /dev/null". This option is
+@item --no-options
+Shortcut for "--options /dev/null". This option is
detected before an attempt to open an option file.
Using this option will also prevent the creation of a
"~./gnupg" homedir.
-@item ---load-extension @code{name}
+@item --load-extension @code{name}
Load an extension module. If @code{name} does not contain a slash it is
searched for in the directory configured when GnuPG was built
(generally "/usr/local/lib/gnupg"). Extensions are not generally
useful anymore, and the use of this option is deprecated.
-@item ---debug @code{flags}
+@item --debug @code{flags}
Set debugging flags. All flags are or-ed and @code{flags} may
be given in C syntax (e.g. 0x0042).
-@item ---debug-all
+@item --debug-all
Set all useful debugging flags.
-@item ---enable-progress-filter
+@item --debug-ccid-driver
+Enable debug output from the included CCID driver for smartcards.
+Note that this option is only available on some system.
+
+@item --enable-progress-filter
Enable certain PROGRESS status outputs. This option allows frontends
to display a progress indicator while gpg is processing larger files.
There is a slight performance overhead using it.
-@item ---status-fd @code{n}
+@item --status-fd @code{n}
Write special status strings to the file descriptor @code{n}.
See the file DETAILS in the documentation for a listing of them.
-@item ---logger-fd @code{n}
+@item --logger-fd @code{n}
Write log output to file descriptor @code{n} and not to stderr.
-@item ---attribute-fd @code{n}
+@item --attribute-fd @code{n}
Write attribute subpackets to the file descriptor @code{n}. This is
-most useful for use with ---status-fd, since the status messages are
+most useful for use with --status-fd, since the status messages are
needed to separate out the various subpackets from the stream
delivered to the file descriptor.
-@item ---sk-comments
-@itemx ---no-sk-comments
+@item --sk-comments
+@itemx --no-sk-comments
Include secret key comment packets when exporting secret keys. This
is a GnuPG extension to the OpenPGP standard, and is off by default.
Please note that this has nothing to do with the comments in clear
-text signatures or armor headers. ---no-sk-comments disables this
+text signatures or armor headers. --no-sk-comments disables this
option.
-@item ---comment @code{string}
-@itemx ---no-comments
+@item --comment @code{string}
+@itemx --no-comments
Use @code{string} as a comment string in clear text signatures and
-ASCII armored messages or keys (see ---armor). The default behavior is
-not to use a comment string. ---comment may be repeated multiple times
-to get multiple comment strings. ---no-comments removes all comments.
+ASCII armored messages or keys (see --armor). The default behavior is
+not to use a comment string. --comment may be repeated multiple times
+to get multiple comment strings. --no-comments removes all comments.
-@item ---emit-version
-@itemx ---no-emit-version
+@item --emit-version
+@itemx --no-emit-version
Force inclusion of the version string in ASCII armored output.
----no-emit-version disables this option.
+--no-emit-version disables this option.
-@item ---sig-notation @code{name=value}
-@itemx ---cert-notation @code{name=value}
-@itemx -N, ---set-notation @code{name=value}
+@item --sig-notation @code{name=value}
+@itemx --cert-notation @code{name=value}
+@itemx -N, --set-notation @code{name=value}
Put the name value pair into the signature as notation data.
@code{name} must consist only of printable characters or spaces, and
must contain a '@@' character. This is to help prevent pollution of
-the IETF reserved notation namespace. The ---expert flag overrides the
+the IETF reserved notation namespace. The --expert flag overrides the
'@@' check. @code{value} may be any printable string; it will be
-encoded in UTF8, so you should check that your ---charset is set
-correctly. If you prefix @code{name} with an exclamation mark, the
-notation data will be flagged as critical (rfc2440:5.2.3.15).
----sig-notation sets a notation for data signatures. --cert-notation
-sets a notation for key signatures (certifications). ---set-notation
+encoded in UTF8, so you should check that your --display-charset is
+set correctly. If you prefix @code{name} with an exclamation mark (!),
+the notation data will be flagged as critical (rfc2440:5.2.3.15).
+--sig-notation sets a notation for data signatures. --cert-notation
+sets a notation for key signatures (certifications). --set-notation
sets both.
There are special codes that may be used in notation names. "%k" will
@@ -1060,136 +1171,148 @@ key being signed, "%s" into the key ID of the key making the
signature, "%S" into the long key ID of the key making the signature,
"%g" into the fingerprint of the key making the signature (which might
be a subkey), "%p" into the fingerprint of the primary key of the key
-making the signature, and "%%" results in a single "%". %k, %K, and
-%f are only meaningful when making a key signature (certification).
-
-@item ---show-notation
-@itemx ---no-show-notation
-Show signature notations in the ---list-sigs or --check-sigs listings
+making the signature, "%c" into the signature count from the OpenPGP
+smartcard, and "%%" results in a single "%". %k, %K, and %f are only
+meaningful when making a key signature (certification), and %c is only
+meaningful when using the OpenPGP smartcard.
+
+@item --show-notation
+@itemx --no-show-notation
+Show signature notations in the --list-sigs or --check-sigs listings
as well as when verifying a signature with a notation in it. These
-options are deprecated. Use `---list-options [no-]show-notation'
-and/or `---verify-options [no-]show-notation' instead.
+options are deprecated. Use `--list-options [no-]show-notation'
+and/or `--verify-options [no-]show-notation' instead.
-@item ---sig-policy-url @code{string}
-@itemx ---cert-policy-url @code{string}
-@itemx ---set-policy-url @code{string}
+@item --sig-policy-url @code{string}
+@itemx --cert-policy-url @code{string}
+@itemx --set-policy-url @code{string}
Use @code{string} as a Policy URL for signatures (rfc2440:5.2.3.19).
-If you prefix it with an exclamation mark, the policy URL packet will
-be flagged as critical. ---sig-policy-url sets a a policy url for data
-signatures. ---cert-policy-url sets a policy url for key signatures
-(certifications). ---set-policy-url sets both.
+If you prefix it with an exclamation mark (!), the policy URL packet
+will be flagged as critical. --sig-policy-url sets a policy url for
+data signatures. --cert-policy-url sets a policy url for key
+signatures (certifications). --set-policy-url sets both.
The same %-expandos used for notation data are available here as well.
-@item ---show-policy-url
-@itemx ---no-show-policy-url
-Show policy URLs in the ---list-sigs or --check-sigs listings as well
+@item --show-policy-url
+@itemx --no-show-policy-url
+Show policy URLs in the --list-sigs or --check-sigs listings as well
as when verifying a signature with a policy URL in it. These options
-are deprecated. Use `---list-options [no-]show-policy-url' and/or
-`---verify-options [no-]show-policy-url' instead.
+are deprecated. Use `--list-options [no-]show-policy-url' and/or
+`--verify-options [no-]show-policy-url' instead.
-@item ---sig-keyserver-url @code{string}
+@item --sig-keyserver-url @code{string}
Use @code{string} as a preferred keyserver URL for data signatures. If
you prefix it with an exclamation mark, the keyserver URL packet will
be flagged as critical.
The same %-expandos used for notation data are available here as well.
-@item ---set-filename @code{string}
+@item --set-filename @code{string}
Use @code{string} as the filename which is stored inside messages.
This overrides the default, which is to use the actual filename of the
file being encrypted.
-@item ---for-your-eyes-only
-@itemx ---no-for-your-eyes-only
+@item --for-your-eyes-only
+@itemx --no-for-your-eyes-only
Set the `for your eyes only' flag in the message. This causes GnuPG
-to refuse to save the file unless the ---output option is given, and
+to refuse to save the file unless the --output option is given, and
PGP to use the "secure viewer" with a Tempest-resistant font to
-display the message. This option overrides ---set-filename.
----no-for-your-eyes-only disables this option.
+display the message. This option overrides --set-filename.
+--no-for-your-eyes-only disables this option.
-@item ---use-embedded-filename
-Try to create a file with a name as embedded in the data.
-This can be a dangerous option as it allows to overwrite files.
+@item --use-embedded-filename
+@itemx --no-use-embedded-filename
+Try to create a file with a name as embedded in the data. This can be
+a dangerous option as it allows to overwrite files. Defaults to no.
-@item ---completes-needed @code{n}
+@item --completes-needed @code{n}
Number of completely trusted users to introduce a new
key signer (defaults to 1).
-@item ---marginals-needed @code{n}
+@item --marginals-needed @code{n}
Number of marginally trusted users to introduce a new
key signer (defaults to 3)
-@item ---max-cert-depth @code{n}
+@item --max-cert-depth @code{n}
Maximum depth of a certification chain (default is 5).
-@item ---cipher-algo @code{name}
+@item --cipher-algo @code{name}
Use @code{name} as cipher algorithm. Running the program
-with the command ---version yields a list of supported
+with the command --version yields a list of supported
algorithms. If this is not used the cipher algorithm is
selected from the preferences stored with the key.
-@item ---digest-algo @code{name}
+@item --digest-algo @code{name}
Use @code{name} as the message digest algorithm. Running the program
-with the command ---version yields a list of supported algorithms.
+with the command --version yields a list of supported algorithms.
-@item ---compress-algo @code{name}
-Use compression algorithm @code{name}. "zlib" is RFC1950 ZLIB
+@item --compress-algo @code{name}
+Use compression algorithm @code{name}. "zlib" is RFC-1950 ZLIB
compression. "zip" is RFC-1951 ZIP compression which is used by PGP.
-"uncompressed" or "none" disables compression. If this option is not
-used, the default behavior is to examine the recipient key preferences
-to see which algorithms the recipient supports. If all else fails,
-ZIP is used for maximum compatibility. Note, however, that ZLIB may
-give better compression results if that is more important, as the
-compression window size is not limited to 8k.
-
-@item ---cert-digest-algo @code{name}
+"bzip2" is a more modern compression scheme that can compress some
+things better than zip or zlib, but at the cost of more memory used
+during compression and decompression. "uncompressed" or "none"
+disables compression. If this option is not used, the default
+behavior is to examine the recipient key preferences to see which
+algorithms the recipient supports. If all else fails, ZIP is used for
+maximum compatibility.
+
+ZLIB may give better compression results than ZIP, as the compression
+window size is not limited to 8k. BZIP2 may give even better
+compression results than that, but will use a significantly larger
+amount of memory while compressing and decompressing. This may be
+significant in low memory situations. Note, however, that PGP (all
+versions) only supports ZIP compression. Using any algorithm other
+than ZIP or "none" will make the message unreadable with PGP.
+
+@item --cert-digest-algo @code{name}
Use @code{name} as the message digest algorithm used when signing a
-key. Running the program with the command ---version yields a list of
+key. Running the program with the command --version yields a list of
supported algorithms. Be aware that if you choose an algorithm that
GnuPG supports but other OpenPGP implementations do not, then some
users will not be able to use the key signatures you make, or quite
possibly your entire key.
-@item ---s2k-cipher-algo @code{name}
+@item --s2k-cipher-algo @code{name}
Use @code{name} as the cipher algorithm used to protect secret keys.
The default cipher is CAST5. This cipher is also used for
-conventional encryption if ---personal-cipher-preferences and
----cipher-algo is not given.
+conventional encryption if --personal-cipher-preferences and
+--cipher-algo is not given.
-@item ---s2k-digest-algo @code{name}
+@item --s2k-digest-algo @code{name}
Use @code{name} as the digest algorithm used to mangle the passphrases.
The default algorithm is SHA-1.
-@item ---s2k-mode @code{n}
+@item --s2k-mode @code{n}
Selects how passphrases are mangled. If @code{n} is 0 a plain
passphrase (which is not recommended) will be used, a 1 adds a salt to
the passphrase and a 3 (the default) iterates the whole process a
-couple of times. Unless ---rfc1991 is used, this mode is also used for
+couple of times. Unless --rfc1991 is used, this mode is also used for
conventional encryption.
-@item ---simple-sk-checksum
+@item --simple-sk-checksum
Secret keys are integrity protected by using a SHA-1 checksum. This
-method will be part of an enhanced OpenPGP specification but GnuPG
-already uses it as a countermeasure against certain attacks. Old
-applications don't understand this new format, so this option may be
-used to switch back to the old behaviour. Using this this option
-bears a security risk. Note that using this option only takes effect
-when the secret key is encrypted - the simplest way to make this
-happen is to change the passphrase on the key (even changing it to the
-same value is acceptable).
-
-@item ---disable-cipher-algo @code{name}
+method is part of the upcoming enhanced OpenPGP specification but
+GnuPG already uses it as a countermeasure against certain attacks.
+Old applications don't understand this new format, so this option may
+be used to switch back to the old behaviour. Using this option bears
+a security risk. Note that using this option only takes effect when
+the secret key is encrypted - the simplest way to make this happen is
+to change the passphrase on the key (even changing it to the same
+value is acceptable).
+
+@item --disable-cipher-algo @code{name}
Never allow the use of @code{name} as cipher algorithm.
The given name will not be checked so that a later loaded algorithm
will still get disabled.
-@item ---disable-pubkey-algo @code{name}
+@item --disable-pubkey-algo @code{name}
Never allow the use of @code{name} as public key algorithm.
The given name will not be checked so that a later loaded algorithm
will still get disabled.
-@item ---no-sig-cache
+@item --no-sig-cache
Do not cache the verification status of key signatures.
Caching gives a much better performance in key listings. However, if
you suspect that your public keyring is not save against write
@@ -1197,7 +1320,7 @@ modifications, you can use this option to disable the caching. It
probably does not make sense to disable it because all kind of damage
can be done if someone else has write access to your public keyring.
-@item ---no-sig-create-check
+@item --no-sig-create-check
GnuPG normally verifies each signature right after creation to protect
against bugs and hardware malfunctions which could leak out bits from
the secret key. This extra verification needs some time (about 115%
@@ -1205,23 +1328,22 @@ for DSA keys), and so this option can be used to disable it.
However, due to the fact that the signature creation needs manual
interaction, this performance penalty does not matter in most settings.
-@item ---auto-check-trustdb
-@itemx ---no-auto-check-trustdb
+@item --auto-check-trustdb
+@itemx --no-auto-check-trustdb
If GnuPG feels that its information about the Web-of-Trust has to be
-updated, it automatically runs the ---check-trustdb command internally.
-This may be a time consuming process. ---no-auto-check-trustdb
+updated, it automatically runs the --check-trustdb command internally.
+This may be a time consuming process. --no-auto-check-trustdb
disables this option.
-@item ---throw-keyid
-Do not put the keyids into encrypted packets. This option hides the
-receiver of the message and is a countermeasure against traffic
-analysis. It may slow down the decryption process because all
-available secret keys are tried.
-
-@item ---no-throw-keyid
-Resets the ---throw-keyid option.
+@item --throw-keyids
+@itemx --no-throw-keyids
+Do not put the recipient keyid into encrypted packets. This option
+hides the receiver of the message and is a countermeasure against
+traffic analysis. It may slow down the decryption process because all
+available secret keys are tried. --no-throw-keyids disables this
+option.
-@item ---not-dash-escaped
+@item --not-dash-escaped
This option changes the behavior of cleartext signatures
so that they can be used for patch files. You should not
send such an armored file via email because all spaces
@@ -1230,37 +1352,37 @@ option for data which has 5 dashes at the beginning of a
line, patch files don't have this. A special armor header
line tells GnuPG about this cleartext signature option.
-@item ---escape-from-lines
-@itemx ---no-escape-from-lines
+@item --escape-from-lines
+@itemx --no-escape-from-lines
Because some mailers change lines starting with "From " to ">From
" it is good to handle such lines in a special way when creating
cleartext signatures to prevent the mail system from breaking the
signature. Note that all other PGP versions do it this way too.
-Enabled by default. ---no-escape-from-lines disables this option.
+Enabled by default. --no-escape-from-lines disables this option.
-@item ---passphrase-fd @code{n}
+@item --passphrase-fd @code{n}
Read the passphrase from file descriptor @code{n}. If you use
0 for @code{n}, the passphrase will be read from stdin. This
can only be used if only one passphrase is supplied.
Don't use this option if you can avoid it.
-@item ---command-fd @code{n}
+@item --command-fd @code{n}
This is a replacement for the deprecated shared-memory IPC mode.
If this option is enabled, user input on questions is not expected
from the TTY but from the given file descriptor. It should be used
-together with ---status-fd. See the file doc/DETAILS in the source
+together with --status-fd. See the file doc/DETAILS in the source
distribution for details on how to use it.
-@item ---use-agent
-@itemx ---no-use-agent
+@item --use-agent
+@itemx --no-use-agent
Try to use the GnuPG-Agent. Please note that this agent is still under
development. With this option, GnuPG first tries to connect to the
-agent before it asks for a passphrase. ---no-use-agent disables this
+agent before it asks for a passphrase. --no-use-agent disables this
option.
-@item ---gpg-agent-info
+@item --gpg-agent-info
Override the value of the environment variable
-@samp{GPG_AGENT_INFO}. This is only used when ---use-agent has been given
+@samp{GPG_AGENT_INFO}. This is only used when --use-agent has been given
@item Compliance options
These options control what GnuPG is compliant to. Only one of these
@@ -1270,297 +1392,293 @@ OTHER OPENPGP PROGRAMS section below before using one of these
options.
@table @asis
-@item ---gnupg
+
+@item --gnupg
Use standard GnuPG behavior. This is essentially OpenPGP behavior
-(see ---openpgp), but with some additional workarounds for common
+(see --openpgp), but with some additional workarounds for common
compatibility problems in different versions of PGP. This is the
default option, so it is not generally needed, but it may be useful to
override a different compliance option in the gpg.conf file.
-@item ---openpgp
+@item --openpgp
Reset all packet, cipher and digest options to strict OpenPGP
behavior. Use this option to reset all previous options like
----rfc1991, --force-v3-sigs, --s2k-*, --cipher-algo, --digest-algo and
----compress-algo to OpenPGP compliant values. All PGP workarounds are
+--rfc1991, --force-v3-sigs, --s2k-*, --cipher-algo, --digest-algo and
+--compress-algo to OpenPGP compliant values. All PGP workarounds are
disabled.
-@item ---rfc2440
+@item --rfc2440
Reset all packet, cipher and digest options to strict RFC-2440
-behavior. Note that this is currently the same thing as ---openpgp.
+behavior. Note that this is currently the same thing as --openpgp.
-@item ---rfc1991
+@item --rfc1991
Try to be more RFC-1991 (PGP 2.x) compliant.
-@item ---pgp2
+@item --pgp2
Set up all options to be as PGP 2.x compliant as possible, and warn if
an action is taken (e.g. encrypting to a non-RSA key) that will create
a message that PGP 2.x will not be able to handle. Note that `PGP
2.x' here means `MIT PGP 2.6.2'. There are other versions of PGP 2.x
available, but the MIT release is a good common baseline.
-This option implies `---rfc1991 --disable-mdc --no-force-v4-certs
----no-sk-comment --escape-from-lines --force-v3-sigs
----no-ask-sig-expire --no-ask-cert-expire --cipher-algo IDEA
----digest-algo MD5 --compress-algo 1'. It also disables --textmode
+This option implies `--rfc1991 --disable-mdc --no-force-v4-certs
+--no-sk-comment --escape-from-lines --force-v3-sigs
+--no-ask-sig-expire --no-ask-cert-expire --cipher-algo IDEA
+--digest-algo MD5 --compress-algo 1'. It also disables --textmode
when encrypting.
-@item ---pgp6
+@item --pgp6
Set up all options to be as PGP 6 compliant as possible. This
restricts you to the ciphers IDEA (if the IDEA plugin is installed),
3DES, and CAST5, the hashes MD5, SHA1 and RIPEMD160, and the
compression algorithms none and ZIP. This also disables
----throw-keyid, and making signatures with signing subkeys as PGP 6
+--throw-keyids, and making signatures with signing subkeys as PGP 6
does not understand signatures made by signing subkeys.
-This option implies `---disable-mdc --no-sk-comment --escape-from-lines
----force-v3-sigs --no-ask-sig-expire'
+This option implies `--disable-mdc --no-sk-comment --escape-from-lines
+--force-v3-sigs --no-ask-sig-expire'
-@item ---pgp7
+@item --pgp7
Set up all options to be as PGP 7 compliant as possible. This is
-identical to ---pgp6 except that MDCs are not disabled, and the list of
+identical to --pgp6 except that MDCs are not disabled, and the list of
allowable ciphers is expanded to add AES128, AES192, AES256, and
TWOFISH.
-@item ---pgp8
+@item --pgp8
Set up all options to be as PGP 8 compliant as possible. PGP 8 is a
lot closer to the OpenPGP standard than previous versions of PGP, so
-all this does is disable ---throw-keyid and set --escape-from-lines.
-The allowed algorithms list is the same as ---pgp7 with the addition of
-the SHA-256 digest algorithm.
-
+all this does is disable --throw-keyids and set --escape-from-lines.
+All algorithms are allowed except for the SHA384 and SHA512 digests.
@end table
-@item ---force-v3-sigs
-@itemx ---no-force-v3-sigs
+@item --force-v3-sigs
+@itemx --no-force-v3-sigs
OpenPGP states that an implementation should generate v4 signatures
-but PGP versions 5 and higher only recognize v4 signatures on key
+but PGP versions 5 through 7 only recognize v4 signatures on key
material. This option forces v3 signatures for signatures on data.
-Note that this option overrides ---ask-sig-expire, as v3 signatures
-cannot have expiration dates. ---no-force-v3-sigs disables this
+Note that this option overrides --ask-sig-expire, as v3 signatures
+cannot have expiration dates. --no-force-v3-sigs disables this
option.
-@item ---force-v4-certs
-@itemx ---no-force-v4-certs
+@item --force-v4-certs
+@itemx --no-force-v4-certs
Always use v4 key signatures even on v3 keys. This option also
changes the default hash algorithm for v3 RSA keys from MD5 to SHA-1.
----no-force-v4-certs disables this option.
+--no-force-v4-certs disables this option.
-@item ---force-mdc
+@item --force-mdc
Force the use of encryption with a modification detection code. This
is always used with the newer ciphers (those with a blocksize greater
than 64 bits), or if all of the recipient keys indicate MDC support in
their feature flags.
-@item ---disable-mdc
+@item --disable-mdc
Disable the use of the modification detection code. Note that by
using this option, the encrypted message becomes vulnerable to a
message modification attack.
-@item ---allow-non-selfsigned-uid
-@itemx ---no-allow-non-selfsigned-uid
+@item --allow-non-selfsigned-uid
+@itemx --no-allow-non-selfsigned-uid
Allow the import and use of keys with user IDs which are not
self-signed. This is not recommended, as a non self-signed user ID is
-trivial to forge. ---no-allow-non-selfsigned-uid disables.
+trivial to forge. --no-allow-non-selfsigned-uid disables.
-@item ---allow-freeform-uid
+@item --allow-freeform-uid
Disable all checks on the form of the user ID while generating a new
one. This option should only be used in very special environments as
it does not ensure the de-facto standard format of user IDs.
-@item ---ignore-time-conflict
+@item --ignore-time-conflict
GnuPG normally checks that the timestamps associated with keys and
signatures have plausible values. However, sometimes a signature
seems to be older than the key due to clock problems. This option
-makes these checks just a warning. See also ---ignore-valid-from for
+makes these checks just a warning. See also --ignore-valid-from for
timestamp issues on subkeys.
-@item ---ignore-valid-from
+@item --ignore-valid-from
GnuPG normally does not select and use subkeys created in the future.
This option allows the use of such keys and thus exhibits the
pre-1.0.7 behaviour. You should not use this option unless you there
-is some clock problem. See also ---ignore-time-conflict for timestamp
+is some clock problem. See also --ignore-time-conflict for timestamp
issues with signatures.
-@item ---ignore-crc-error
+@item --ignore-crc-error
The ASCII armor used by OpenPGP is protected by a CRC checksum against
-transmission errors. Sometimes it happens that the CRC gets mangled
-somewhere on the transmission channel but the actual content (which is
-protected by the OpenPGP protocol anyway) is still okay. This option
-will let gpg ignore CRC errors.
+transmission errors. Occasionally the CRC gets mangled somewhere on
+the transmission channel but the actual content (which is protected by
+the OpenPGP protocol anyway) is still okay. This option allows GnuPG
+to ignore CRC errors.
-@item ---ignore-mdc-error
+@item --ignore-mdc-error
This option changes a MDC integrity protection failure into a warning.
This can be useful if a message is partially corrupt, but it is
necessary to get as much data as possible out of the corrupt message.
However, be aware that a MDC protection failure may also mean that the
message was tampered with intentionally by an attacker.
-@item ---lock-once
+@item --lock-once
Lock the databases the first time a lock is requested
and do not release the lock until the process
terminates.
-@item ---lock-multiple
+@item --lock-multiple
Release the locks every time a lock is no longer
-needed. Use this to override a previous ---lock-once
+needed. Use this to override a previous --lock-once
from a config file.
-@item ---lock-never
+@item --lock-never
Disable locking entirely. This option should be used only in very
special environments, where it can be assured that only one process
is accessing those files. A bootable floppy with a stand-alone
encryption system will probably use this. Improper usage of this
option may lead to data and key corruption.
-@item ---no-random-seed-file
+@item --no-random-seed-file
GnuPG uses a file to store its internal random pool over invocations.
This makes random generation faster; however sometimes write operations
are not desired. This option can be used to achieve that with the cost of
slower random generation.
-@item ---no-verbose
+@item --no-verbose
Reset verbose level to 0.
-@item ---no-greeting
+@item --no-greeting
Suppress the initial copyright message.
-@item ---no-secmem-warning
+@item --no-secmem-warning
Suppress the warning about "using insecure memory".
-@item ---no-permission-warning
-Suppress the warning about unsafe file and home directory (---homedir)
+@item --no-permission-warning
+Suppress the warning about unsafe file and home directory (--homedir)
permissions. Note that the permission checks that GnuPG performs are
not intended to be authoritative, but rather they simply warn about
certain common permission problems. Do not assume that the lack of a
warning means that your system is secure.
-Note that the warning for unsafe ---homedir permissions cannot be
+Note that the warning for unsafe --homedir permissions cannot be
supressed in the gpg.conf file, as this would allow an attacker to
place an unsafe gpg.conf file in place, and use this file to supress
-warnings about itself. The ---homedir permissions warning may only be
+warnings about itself. The --homedir permissions warning may only be
supressed on the command line.
-@item ---no-mdc-warning
+@item --no-mdc-warning
Suppress the warning about missing MDC integrity protection.
-@item ---no-armor
+@item --no-armor
Assume the input data is not in ASCII armored format.
-@item ---no-default-keyring
-Do not add the default keyrings to the list of
-keyrings.
+@item --no-default-keyring
+Do not add the default keyrings to the list of keyrings. Note that
+GnuPG will not operate without any keyrings, so if you use this option
+and do not provide alternate keyrings via --keyring or
+--secret-keyring, then GnuPG will still use the default public or
+secret keyrings.
-@item ---skip-verify
+@item --skip-verify
Skip the signature verification step. This may be
used to make the decryption faster if the signature
verification is not needed.
-@item ---with-colons
+@item --with-colons
Print key listings delimited by colons. Note that the output will be
-encoded in UTF-8 regardless of any ---charset setting. This format is
-useful when GnuPG is called from scripts and other programs as it is
-easily machine parsed. The details of this format are documented in
-the file doc/DETAILS, which is included in the GnuPG source
-distribution.
+encoded in UTF-8 regardless of any --display-charset setting. This
+format is useful when GnuPG is called from scripts and other programs
+as it is easily machine parsed. The details of this format are
+documented in the file doc/DETAILS, which is included in the GnuPG
+source distribution.
-@item ---with-key-data
-Print key listings delimited by colons (like ---with-colons) and print the public key data.
+@item --with-key-data
+Print key listings delimited by colons (like --with-colons) and print the public key data.
-@item ---with-fingerprint
-Same as the command ---fingerprint but changes only the format of the output
+@item --with-fingerprint
+Same as the command --fingerprint but changes only the format of the output
and may be used together with another command.
-@item ---fast-list-mode
+@item --fast-list-mode
Changes the output of the list commands to work faster; this is achieved
by leaving some parts empty. Some applications don't need the user ID and
the trust information given in the listings. By using this options they
can get a faster listing. The exact behaviour of this option may change
in future versions.
-@item ---fixed-list-mode
-Do not merge primary user ID and primary key in ---with-colon listing
+@item --fixed-list-mode
+Do not merge primary user ID and primary key in --with-colon listing
mode and print all timestamps as seconds since 1970-01-01.
-@item ---list-only
-Changes the behaviour of some commands. This is like ---dry-run but
+@item --list-only
+Changes the behaviour of some commands. This is like --dry-run but
different in some cases. The semantic of this command may be extended in
the future. Currently it only skips the actual decryption pass and
therefore enables a fast listing of the encryption keys.
-@item ---no-literal
+@item --no-literal
This is not for normal use. Use the source to see for what it might be useful.
-@item ---set-filesize
+@item --set-filesize
This is not for normal use. Use the source to see for what it might be useful.
-@item ---emulate-md-encode-bug
-GnuPG versions prior to 1.0.2 had a bug in the way a signature was encoded.
-This options enables a workaround by checking faulty signatures again with
-the encoding used in old versions. This may only happen for ElGamal signatures
-which are not widely used.
-
-@item ---show-session-key
-Display the session key used for one message. See ---override-session-key
+@item --show-session-key
+Display the session key used for one message. See --override-session-key
for the counterpart of this option.
-We think that Key-Escrow is a Bad Thing; however the user should
-have the freedom to decide whether to go to prison or to reveal the content of
-one specific message without compromising all messages ever encrypted for one
-secret key. DON'T USE IT UNLESS YOU ARE REALLY FORCED TO DO SO.
+We think that Key Escrow is a Bad Thing; however the user should have
+the freedom to decide whether to go to prison or to reveal the content
+of one specific message without compromising all messages ever
+encrypted for one secret key. DON'T USE IT UNLESS YOU ARE REALLY
+FORCED TO DO SO.
-@item ---override-session-key @code{string}
+@item --override-session-key @code{string}
Don't use the public key but the session key @code{string}. The format of this
-string is the same as the one printed by ---show-session-key. This option
+string is the same as the one printed by --show-session-key. This option
is normally not used but comes handy in case someone forces you to reveal the
content of an encrypted message; using this option you can do this without
handing out the secret key.
-@item ---ask-sig-expire
-@itemx ---no-ask-sig-expire
+@item --ask-sig-expire
+@itemx --no-ask-sig-expire
When making a data signature, prompt for an expiration time. If this
option is not specified, the expiration time is "never".
----no-ask-sig-expire disables this option.
+--no-ask-sig-expire disables this option.
-@item ---ask-cert-expire
-@itemx ---no-ask-cert-expire
+@item --ask-cert-expire
+@itemx --no-ask-cert-expire
When making a key signature, prompt for an expiration time. If this
option is not specified, the expiration time is "never".
----no-ask-cert-expire disables this option.
+--no-ask-cert-expire disables this option.
-@item ---expert
-@itemx ---no-expert
+@item --expert
+@itemx --no-expert
Allow the user to do certain nonsensical or "silly" things like
signing an expired or revoked key, or certain potentially incompatible
things like generating deprecated key types. This also disables
certain warning messages about potentially incompatible actions. As
the name implies, this option is for experts only. If you don't fully
understand the implications of what it allows you to do, leave this
-off. ---no-expert disables this option.
+off. --no-expert disables this option.
-@item ---merge-only
-Don't insert new keys into the keyrings while doing an import.
-
-@item ---allow-secret-key-import
+@item --allow-secret-key-import
This is an obsolete option and is not used anywhere.
-@item ---try-all-secrets
-Don't look at the key ID as stored in the message but try all secret keys in
-turn to find the right decryption key. This option forces the behaviour as
-used by anonymous recipients (created by using ---throw-keyid) and might come
-handy in case where an encrypted message contains a bogus key ID.
+@item --try-all-secrets
+Don't look at the key ID as stored in the message but try all secret
+keys in turn to find the right decryption key. This option forces the
+behaviour as used by anonymous recipients (created by using
+--throw-keyids) and might come handy in case where an encrypted
+message contains a bogus key ID.
-@item ---enable-special-filenames
+@item --enable-special-filenames
This options enables a mode in which filenames of the form
@file{-&n}, where n is a non-negative decimal number,
refer to the file descriptor n and not to a file with that name.
-@item ---no-expensive-trust-checks
+@item --no-expensive-trust-checks
Experimental use only.
-@item ---group @code{name=value1 value2 value3 ...}
+@item --group @code{name=value1 }
Sets up a named group, which is similar to aliases in email programs.
-Any time the group name is a recipient (-r or ---recipient), it will
-be expanded to the values specified.
+Any time the group name is a recipient (-r or --recipient), it will be
+expanded to the values specified. Multiple groups with the same name
+are automatically merged into a single group.
The values are @code{key IDs} or fingerprints, but any key description
is accepted. Note that a value with spaces in it will be treated as
@@ -1570,52 +1688,64 @@ from the command line, it may be necessary to quote the argument to
this option to prevent the shell from treating it as multiple
arguments.
-@item ---no-groups
-Clear the ---group list.
+@item --ungroup @code{name}
+Remove a given entry from the --group list.
+
+@item --no-groups
+Remove all entries from the --group list.
-@item ---preserve-permissions
+@item --preserve-permissions
Don't change the permissions of a secret keyring back to user
read/write only. Use this option only if you really know what you are doing.
-@item ---personal-cipher-preferences @code{string}
+@item --personal-cipher-preferences @code{string}
Set the list of personal cipher preferences to @code{string}, this list
should be a string similar to the one printed by the command "pref" in
the edit menu. This allows the user to factor in their own preferred
algorithms when algorithms are chosen via recipient key preferences.
The most highly ranked cipher in this list is also used for the
----symmetric encryption command.
+--symmetric encryption command.
-@item ---personal-digest-preferences @code{string}
+@item --personal-digest-preferences @code{string}
Set the list of personal digest preferences to @code{string}, this list
should be a string similar to the one printed by the command "pref" in
the edit menu. This allows the user to factor in their own preferred
algorithms when algorithms are chosen via recipient key preferences.
The most highly ranked digest algorithm in this list is algo used when
-signing without encryption (e.g. ---clearsign or --sign). The default
+signing without encryption (e.g. --clearsign or --sign). The default
value is SHA-1.
-@item ---personal-compress-preferences @code{string}
+@item --personal-compress-preferences @code{string}
Set the list of personal compression preferences to @code{string}, this
list should be a string similar to the one printed by the command
"pref" in the edit menu. This allows the user to factor in their own
preferred algorithms when algorithms are chosen via recipient key
preferences. The most highly ranked algorithm in this list is also
-used when there are no recipient keys to consider (e.g. ---symmetric).
+used when there are no recipient keys to consider (e.g. --symmetric).
-@item ---default-preference-list @code{string}
+@item --default-preference-list @code{string}
Set the list of default preferences to @code{string}, this list should
be a string similar to the one printed by the command "pref" in the
edit menu. This affects both key generation and "updpref" in the edit
menu.
+@item --list-config
+Display various internal configuration parameters of GnuPG. This
+option is intended for external programs that call GnuPG to perform
+tasks, and is thus not generally useful. See the file
+@file{doc/DETAILS} in the source distribution for the
+details of which configuration items may be listed. --list-config is
+only usable with --with-colons set.
@end table
+@chapheading How to specify a user ID
-@majorheading How to specify a user ID
There are different ways to specify a user ID to GnuPG; here are some
examples:
@table @asis
+
@item
+
@item 234567C4
@itemx 0F34E556E
@itemx 01347A56A
@@ -1627,7 +1757,7 @@ Here the key ID is given in the usual short form.
@itemx 01AB3FED1347A5612
@itemx 0x234AABBCC34567C4
Here the key ID is given in the long form as used by OpenPGP
-(you can get the long key ID using the option ---with-colons).
+(you can get the long key ID using the option --with-colons).
@item 1234343434343434C434343434343434
@itemx 123434343434343C3434343434343734349A3434
@@ -1654,48 +1784,49 @@ digits, the underscore and all characters with bit 7 set.
By case insensitive substring matching. This is the default mode but
applications may want to explicitly indicate this by putting the asterisk
in front.
-
@end table
-Note that you can append an exclamation mark to key IDs or
-fingerprints. This flag tells GnuPG to use exactly the given primary
-or secondary key and not to try to figure out which secondary or
-primary key to use.
+Note that you can append an exclamation mark (!) to key IDs or
+fingerprints. This flag tells GnuPG to use the specified primary or
+secondary key and not to try and calculate which primary or secondary
+key to use.
+@chapheading RETURN VALUE
-@majorheading RETURN VALUE
The program returns 0 if everything was fine, 1 if at least
a signature was bad, and other error codes for fatal errors.
+@chapheading EXAMPLES
-@majorheading EXAMPLES
@table @asis
+
@item gpg -se -r @code{Bob} @code{file}
sign and encrypt for user Bob
-@item gpg ---clearsign @code{file}
+@item gpg --clearsign @code{file}
make a clear text signature
@item gpg -sb @code{file}
make a detached signature
-@item gpg ---list-keys @code{user_ID}
+@item gpg --list-keys @code{user_ID}
show keys
-@item gpg ---fingerprint @code{user_ID}
+@item gpg --fingerprint @code{user_ID}
show fingerprint
-@item gpg ---verify @code{pgpfile}
-@itemx gpg ---verify @code{sigfile} @code{files}
-Verify the signature of the file but do not output the data. The second form
-is used for detached signatures, where @code{sigfile} is the detached
-signature (either ASCII armored of binary) and @code{files} are the signed
-data; if this is not given the name of the file holding the signed data is
-constructed by cutting off the extension (".asc" or ".sig") of
-@code{sigfile} or by asking the user for the filename.
-
+@item gpg --verify @code{pgpfile}
+@itemx gpg --verify @code{sigfile}
+Verify the signature of the file but do not output the data. The
+second form is used for detached signatures, where @code{sigfile}
+is the detached signature (either ASCII armored or binary) and
+are the signed data; if this is not given, the name of
+the file holding the signed data is constructed by cutting off the
+extension (".asc" or ".sig") of @code{sigfile} or by asking the
+user for the filename.
@end table
+@chapheading ENVIRONMENT
-@majorheading ENVIRONMENT
@table @asis
+
@item HOME
Used to locate the default home directory.
@@ -1704,21 +1835,25 @@ If set directory used instead of "~/.gnupg".
@item GPG_AGENT_INFO
Used to locate the gpg-agent; only honored when
----use-agent is set. The value consists of 3 colon delimited fields:
+--use-agent is set. The value consists of 3 colon delimited fields:
The first is the path to the Unix Domain Socket, the second the PID of
the gpg-agent and the protocol version which should be set to 1. When
starting the gpg-agent as described in its documentation, this
-variable is set to the correct value. The option ---gpg-agent-info can
+variable is set to the correct value. The option --gpg-agent-info can
be used to override it.
@item http_proxy
Only honored when the keyserver-option
honor-http-proxy is set.
+@item COLUMNS
+@itemx LINES
+Used to size some displays to the full size of the screen.
@end table
+@chapheading FILES
-@majorheading FILES
@table @asis
+
@item ~/.gnupg/secring.gpg
The secret keyring
@@ -1752,10 +1887,9 @@ Skeleton options file
@item /usr[/local]/lib/gnupg/
Default location for extensions
-
@end table
+@chapheading WARNINGS
-@majorheading WARNINGS
Use a *good* password for your user account and a *good* passphrase
to protect your secret key. This passphrase is the weakest part of the
whole system. Programs to do dictionary attacks on your secret keyring
@@ -1766,39 +1900,42 @@ Keep in mind that, if this program is used over a network (telnet), it
is *very* easy to spy out your passphrase!
If you are going to verify detached signatures, make sure that the
-program knows about it; either be giving both filenames on the
-command line or using @samp{-} to specify stdin.
+program knows about it; either give both filenames on the command line
+or use @samp{-} to specify stdin.
+@chapheading INTEROPERABILITY WITH OTHER OPENPGP PROGRAMS
-@majorheading INTEROPERABILITY WITH OTHER OPENPGP PROGRAMS
GnuPG tries to be a very flexible implementation of the OpenPGP
-standard. In particular, GnuPG implements many of the "optional"
-parts of the standard, such as the RIPEMD/160 hash, and the ZLIB
+standard. In particular, GnuPG implements many of the optional parts
+of the standard, such as the SHA-512 hash, and the ZLIB and BZIP2
compression algorithms. It is important to be aware that not all
OpenPGP programs implement these optional algorithms and that by
-forcing their use via the ---cipher-algo, --digest-algo,
----cert-digest-algo, or --compress-algo options in GnuPG, it is
+forcing their use via the --cipher-algo, --digest-algo,
+--cert-digest-algo, or --compress-algo options in GnuPG, it is
possible to create a perfectly valid OpenPGP message, but one that
cannot be read by the intended recipient.
-For example, as of this writing, no version of official PGP supports
-the BLOWFISH cipher algorithm. If you use it, no PGP user will be
-able to decrypt your message. The same thing applies to the ZLIB
-compression algorithm. By default, GnuPG uses the OpenPGP preferences
-system that will always do the right thing and create messages that
-are usable by all recipients, regardless of which OpenPGP program they
-use. Only override this safe default if you know what you are doing.
+There are dozens of variations of OpenPGP programs available, and each
+supports a slightly different subset of these optional algorithms.
+For example, until recently, no (unhacked) version of PGP supported
+the BLOWFISH cipher algorithm. A message using BLOWFISH simply could
+not be read by a PGP user. By default, GnuPG uses the standard
+OpenPGP preferences system that will always do the right thing and
+create messages that are usable by all recipients, regardless of which
+OpenPGP program they use. Only override this safe default if you
+really know what you are doing.
If you absolutely must override the safe default, or if the
preferences on a given key are invalid for some reason, you are far
-better off using the ---pgp2, --pgp6, --pgp7, or --pgp8 options. These
-options are safe as they do not force any particular algorithms in
-violation of OpenPGP, but rather reduce the available algorithms to a
-"PGP-safe" list.
+better off using the --pgp6, --pgp7, or --pgp8 options. These options
+are safe as they do not force any particular algorithms in violation
+of OpenPGP, but rather reduce the available algorithms to a "PGP-safe"
+list.
+@chapheading BUGS
-@majorheading BUGS
On many systems this program should be installed as setuid(root). This
is necessary to lock memory pages. Locking memory pages prevents the
-operating system from writing memory pages to disk. If you get no
+operating system from writing memory pages (which may contain
+passphrases or other sensitive material) to disk. If you get no
warning message about insecure memory your operating system supports
locking without being root. The program drops root privileges as soon
as locked memory is allocated.
diff --git a/doc/gpgv.texi b/doc/gpgv.texi
index 6ac5c6884..3bd186309 100644
--- a/doc/gpgv.texi
+++ b/doc/gpgv.texi
@@ -1,28 +1,25 @@
\input texinfo
-@c This Texinfo document has been automatically generated by
-@c docbook2texi from a DocBook documentation. The tool used
-@c can be found at:
-@c <URL:http://shell.ipoline.com/~elmert/hacks/docbook2X/>
-@c Please send any bug reports, improvements, comments,
-@c patches, etc. to Steve Cheng <[email protected]>.
-
-@setfilename gpgv.info
-@dircategory GnuPG
+@setfilename untitled.info
+@documentencoding us-ascii
@direntry
-* gpgv: (gpgv). GnuPG signature verification tool.
+* gpgv: . signature verification tool
@end direntry
-@node top
+@node Top, , , (dir)
@top gpgv
-@menu
-@end menu
+@chapheading Name
-@majorheading Name
-gpgv ---- signature verification tool</>
+gpgv --- signature verification tool
+@chapheading Synopsis
-@majorheading Synopsis
+@example
+gpgv
+ options
+ signed files
+
+@end example
+@chapheading DESCRIPTION
-@majorheading DESCRIPTION
@code{gpgv} is the OpenPGP signature checking tool.
This program is a stripped down version of @code{gpg} which is only
@@ -37,83 +34,81 @@ It uses by default a keyring named @file{trustedkeys.gpg} which is
assumed to be in the home directory as defined by GnuPG or set by an
option or an environment variable. An option may be used to specify
another keyring or even multiple keyrings.
+@chapheading OPTIONS
-@majorheading OPTIONS
@code{gpgv} recognizes these options:
@table @asis
-@item -v, ---verbose
+
+@item -v, --verbose
Give more information during processing. If used
twice, the input data is listed in detail.
-@item -q, ---quiet
+@item -q, --quiet
Try to be as quiet as possible.
-@item ---keyring @code{file}
+@item --keyring @code{file}
Add @code{file} to the list of keyrings.
If @code{file} begins with a tilde and a slash, these
are replaced by the HOME directory. If the filename
does not contain a slash, it is assumed to be in the
-home-directory ("~/.gnupg" if ---homedir is not used).
+home-directory ("~/.gnupg" if --homedir is not used).
The filename may be prefixed with a scheme:
"gnupg-ring:" is the default one.
-It might make sense to use it together with ---no-default-keyring.
-
-@item ---homedir @code{directory}
+@item --homedir @code{directory}
Set the name of the home directory to @code{directory} If this
option is not used it defaults to "~/.gnupg". It does
not make sense to use this in a options file. This
also overrides the environment variable "GNUPGHOME".
-@item ---status-fd @code{n}
+@item --status-fd @code{n}
Write special status strings to the file descriptor @code{n}.
See the file DETAILS in the documentation for a listing of them.
-@item ---logger-fd @code{n}
+@item --logger-fd @code{n}
Write log output to file descriptor @code{n} and not to stderr.
-@item ---ignore-time-conflict
+@item --ignore-time-conflict
GnuPG normally checks that the timestamps associated with keys and
signatures have plausible values. However, sometimes a signature seems to
be older than the key due to clock problems. This option makes these
checks just a warning.
-
@end table
+@chapheading RETURN VALUE
-@majorheading RETURN VALUE
The program returns 0 if everything was fine, 1 if at least
one signature was bad, and other error codes for fatal errors.
+@chapheading EXAMPLES
-@majorheading EXAMPLES
@table @asis
+
@item gpgv @code{pgpfile}
-@itemx gpgv @code{sigfile} @code{files}
+@itemx gpgv @code{sigfile}
Verify the signature of the file. The second form
is used for detached signatures, where @code{sigfile} is the detached
-signature (either ASCII armored or binary) and @code{files} are the signed
+signature (either ASCII armored or binary) and are the signed
data; if this is not given the name of the file holding the signed data is
constructed by cutting off the extension (".asc", ".sig" or ".sign") from
@code{sigfile}.
-
@end table
+@chapheading ENVIRONMENT
-@majorheading ENVIRONMENT
@table @asis
+
@item HOME
Used to locate the default home directory.
@item GNUPGHOME
If set directory used instead of "~/.gnupg".
-
@end table
+@chapheading FILES
-@majorheading FILES
@table @asis
+
@item ~/.gnupg/trustedkeys.gpg
The default keyring with the allowed keys
-
@end table
@bye
diff --git a/g10/ChangeLog b/g10/ChangeLog
index bea26b8a6..a971266b4 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-30 Werner Koch <[email protected]>
+
+ * app-openpgp.c (verify_chv3) [GNUPG_MAJOR_VERSION!=1]: Typo fix.
+
2004-09-30 David Shaw <[email protected]>
* gpgv.c, keydb.c (keydb_add_resource): Factored keyring creation
diff --git a/g10/app-openpgp.c b/g10/app-openpgp.c
index 94a62695b..c302bd3a3 100644
--- a/g10/app-openpgp.c
+++ b/g10/app-openpgp.c
@@ -705,7 +705,7 @@ verify_chv3 (APP app,
#if GNUPG_MAJOR_VERSION != 1
if (!opt.allow_admin)
{
- log_info (_("access to admin commands is not configured\n");
+ log_info (_("access to admin commands is not configured\n"));
return gpg_error (GPG_ERR_EACCES);
}
#endif
diff --git a/po/be.po b/po/be.po
index 2a3d81084..a39b645b8 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
"PO-Revision-Date: 2003-10-30 16:35+0200\n"
"Last-Translator: Ales Nyakhaychyk <[email protected]>\n"
"Language-Team: Belarusian <[email protected]>\n"
@@ -49,7 +49,7 @@ msgstr "no [не]"
msgid "nN"
msgstr "nN"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "quit [выйсьці]"
@@ -281,6 +281,15 @@ msgstr ""
msgid "keyserver error"
msgstr ""
+#: util/errors.c:108
+#, fuzzy
+msgid "canceled"
+msgstr "скасавана карыстальнікам\n"
+
+#: util/errors.c:109
+msgid "no card"
+msgstr ""
+
#: util/logger.c:183
msgid "ERROR: "
msgstr ""
@@ -303,7 +312,7 @@ msgstr ""
msgid "no entropy gathering module detected\n"
msgstr ""
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr ""
@@ -335,7 +344,7 @@ msgstr ""
msgid "note: random_seed file not updated\n"
msgstr ""
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr ""
@@ -393,7 +402,7 @@ msgstr ""
msgid "can't generate a prime with less than %d bits\n"
msgstr ""
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -401,128 +410,128 @@ msgstr ""
"@Загады:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[файл]|зрабіць подпіс"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "зрабіць адчэплены подпіс"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "зашыфраваць даньні"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "шыфраваньне толькі сымэтрычнымі шыфрамі"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "разшыфраваць даньні (дапомна)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "праверыць подпіс"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "паказаць сьпіс ключоў"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "паказаць сьпіс ключоў і подпісаў"
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "праверыць подпісы ключа"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "паказаць ключы й адбіткі пальцаў"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "паказаць сакрэтныя ключы"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "стварыць новую пару ключоў"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "падпісаць ключ"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "падпісаць ключ толькі мясцова"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "падпісаць ці рэдагаваць ключ"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr ""
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "экспарт ключоў"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "экспартаваць ключы на паслужнік ключоў"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "імпартаваць ключы з паслужніка ключоў"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr ""
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "абнавіць усе ключы з паслужніка ключоў"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "імпартаваць/аб'яднаць ключы"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr ""
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr ""
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -532,55 +541,51 @@ msgstr ""
"Выбары:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr ""
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|ІМЯ| зашыфраваць для вылучанай асобы"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr ""
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr ""
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr ""
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "выкарыстоўваць у якасьці файла вываду"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "шматслоўнасьць"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "не рабіць ніякіх зьменаў"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "пытацца перад перазапісам"
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -588,7 +593,7 @@ msgstr ""
"@\n"
"(Глядзіце man старонку, для больш поўнага апісаньня ўсіх загадаў і выбараў)\n"
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -608,15 +613,15 @@ msgstr ""
" --list-keys [назвы] паказаць ключы\n"
" --fingerprint [назвы] паказаць адбіткі пальцаў\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Калі ласка, паведамляйце пра памылкі на <[email protected]>.\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -626,7 +631,7 @@ msgstr ""
"sign, check, encrypt ці decrypt\n"
"Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -634,511 +639,505 @@ msgstr ""
"\n"
"Альгарытмы, якія падтрымліваюцца:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr ""
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr ""
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr ""
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
msgid "Compression: "
msgstr ""
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "Выкарыстаньне: gpg [выбары] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "несумяшчальныя загады\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr ""
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr ""
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr ""
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr ""
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr ""
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr ""
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr ""
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr ""
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
-#: g10/g10.c:1205
+#: g10/g10.c:1210
#, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr ""
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
-#: g10/g10.c:1334
-#, c-format
-msgid "unknown configuration item \"%s\"\n"
-msgstr ""
+#: g10/g10.c:1354
+#, fuzzy, c-format
+msgid "unknown configuration item `%s'\n"
+msgstr "невядомая вэрсыя"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr ""
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr ""
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr ""
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr ""
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr ""
-#: g10/g10.c:1887
+#: g10/g10.c:2021
#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr ""
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "%s - гэта недапушчальнае мноства знакаў\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
msgid "could not parse keyserver URL\n"
msgstr ""
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "недапушчальныя выбары экспартаваньня\n"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
msgid "invalid import options\n"
msgstr "недапушчальныя выбары імпартаваньня\n"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
msgid "invalid export options\n"
msgstr "недапушчальныя выбары экспартаваньня\n"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "недапушчальныя выбары імпартаваньня\n"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "недапушчальныя выбары экспартаваньня\n"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr ""
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr ""
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr ""
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s не дазваляецца разам з %s!\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ня мае сэнсу разам з %s!\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr ""
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr ""
-#: g10/g10.c:2540
+#: g10/g10.c:2657
msgid "selected compression algorithm is invalid\n"
msgstr ""
-#: g10/g10.c:2546
+#: g10/g10.c:2663
msgid "selected certification digest algorithm is invalid\n"
msgstr ""
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr ""
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr ""
-#: g10/g10.c:2565
+#: g10/g10.c:2682
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr ""
-#: g10/g10.c:2567
+#: g10/g10.c:2684
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr ""
-#: g10/g10.c:2569
+#: g10/g10.c:2686
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr ""
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr ""
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr ""
-#: g10/g10.c:2583
+#: g10/g10.c:2700
msgid "invalid default preferences\n"
msgstr "недапушчальныя дапомныя перавагі\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
msgid "invalid personal cipher preferences\n"
msgstr ""
-#: g10/g10.c:2596
+#: g10/g10.c:2713
msgid "invalid personal digest preferences\n"
msgstr ""
-#: g10/g10.c:2600
+#: g10/g10.c:2717
msgid "invalid personal compress preferences\n"
msgstr ""
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ня мае сэнсу разам з %s!\n"
-#: g10/g10.c:2680
+#: g10/g10.c:2797
#, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr ""
-#: g10/g10.c:2685
+#: g10/g10.c:2802
#, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr ""
-#: g10/g10.c:2690
+#: g10/g10.c:2807
#, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr ""
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr ""
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [назва_файла]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [назва_файла]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [назва_файла]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [назва_файла]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr ""
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [назва_файла]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [назва_файла]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [назва_файла]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [назва_файла]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [назва_файла]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [назва_файла]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrsign-key user-id"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key user-id"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [загады]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "немагчыма адкрыць %s: %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr ""
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "збой падпісаньня: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "збой падпісаньня: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "збой падпісаньня: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "збой падпісаньня: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr ""
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr ""
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr ""
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[назва_файла]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr ""
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "немагчыма адкрыць \"%s\"\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
msgstr ""
-#: g10/g10.c:3668
+#: g10/g10.c:3784
msgid "a user notation name must contain the '@' character\n"
msgstr ""
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr ""
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr ""
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr ""
-#: g10/g10.c:3747
-msgid "the given signature preferred keyserver URL is invalid\n"
+#: g10/g10.c:3863
+msgid "the given preferred keyserver URL is invalid\n"
msgstr ""
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "працаваць менш шматслоўна"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
#, fuzzy
msgid "take the keys from this keyring"
msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
msgid "make timestamp conflicts only a warning"
msgstr ""
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr ""
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
#, fuzzy
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1170,12 +1169,13 @@ msgid "invalid dash escaped line: "
msgstr ""
#: g10/armor.c:565
-msgid "unexpected armor:"
-msgstr ""
+#, fuzzy
+msgid "unexpected armor: "
+msgstr "нечаканыя даньні"
-#: g10/armor.c:695 g10/armor.c:1276
+#: g10/armor.c:695 g10/armor.c:1280
#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+msgid "invalid radix64 character %02X skipped\n"
msgstr ""
#: g10/armor.c:738
@@ -1186,33 +1186,33 @@ msgstr ""
msgid "premature eof (in CRC)\n"
msgstr ""
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr ""
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "памылка CRC; %06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+msgid "premature eof (in trailer)\n"
msgstr ""
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr ""
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr ""
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr ""
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1261,7 +1261,7 @@ msgstr ""
msgid " aka \""
msgstr ""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1496,96 +1496,116 @@ msgstr ""
msgid "no valid addressees\n"
msgstr ""
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, c-format
msgid "preference `%s' duplicated\n"
msgstr ""
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "за шмат пераваг для \"%c\"\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
#, fuzzy
msgid "too many digest preferences\n"
msgstr "за шмат пераваг для \"%c\"\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
#, fuzzy
msgid "too many compression preferences\n"
msgstr "за шмат пераваг для \"%c\"\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "недапушчальныя дапомныя перавагі\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
msgid "writing direct signature\n"
msgstr ""
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr ""
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr ""
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr ""
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr ""
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr ""
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr ""
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr ""
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr ""
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr ""
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr ""
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr ""
+
+#: g10/keygen.c:1224
+#, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr ""
+
+#: g10/keygen.c:1226
+#, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr ""
+
+#: g10/keygen.c:1228
+#, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr ""
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr ""
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr ""
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1594,54 +1614,54 @@ msgid ""
" highest suggested keysize is 2048 bits\n"
msgstr ""
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr ""
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr ""
-#: g10/keygen.c:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr ""
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr ""
-#: g10/keygen.c:1255
+#: g10/keygen.c:1328
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr ""
-#: g10/keygen.c:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
msgstr ""
-#: g10/keygen.c:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr ""
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
msgstr ""
-#: g10/keygen.c:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr ""
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr ""
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1651,7 +1671,7 @@ msgid ""
" <n>y = key expires in n years\n"
msgstr ""
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1661,86 +1681,86 @@ msgid ""
" <n>y = signature expires in n years\n"
msgstr ""
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr ""
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr ""
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr ""
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr ""
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr ""
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
msgstr ""
-#: g10/keygen.c:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr ""
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr ""
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr ""
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr ""
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr ""
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr ""
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr ""
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr ""
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr ""
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr ""
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1748,42 +1768,42 @@ msgid ""
"\n"
msgstr ""
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
-#: g10/keygen.c:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr ""
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr ""
-#: g10/keygen.c:1542
+#: g10/keygen.c:1615
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
-#: g10/keygen.c:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
msgstr ""
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr ""
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr ""
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1791,7 +1811,7 @@ msgid ""
"\n"
msgstr ""
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1799,88 +1819,117 @@ msgid ""
"generator a better chance to gain enough entropy.\n"
msgstr ""
-#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr ""
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr ""
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr ""
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr ""
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "запіс у stdout\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr ""
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr ""
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr ""
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr ""
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr ""
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr ""
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr ""
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
-#: g10/keygen.c:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr ""
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "збой падпісаньня: %s\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "%s: немагчыма стварыць тэчку: %s\n"
+
+#: g10/keygen.c:3248
+#, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr ""
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr ""
@@ -1891,7 +1940,7 @@ msgstr ""
msgid "%s: can't open: %s\n"
msgstr ""
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr ""
@@ -1919,6 +1968,11 @@ msgstr ""
msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
msgstr ""
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "немагчыма адкрыць %s: %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -1929,14 +1983,22 @@ msgid ""
"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
msgstr ""
-#: g10/encode.c:526 g10/encode.c:721
+#: g10/encode.c:526
#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
-#: g10/encode.c:634 g10/sign.c:863
+#: g10/encode.c:634 g10/sign.c:864
#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
+msgstr ""
+
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
#: g10/encode.c:818
@@ -1944,7 +2006,7 @@ msgstr ""
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr ""
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr ""
@@ -1977,8 +2039,8 @@ msgstr ""
msgid "too many entries in pk cache - disabled\n"
msgstr ""
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+msgid "[User ID not found]"
msgstr ""
#: g10/getkey.c:1614
@@ -2129,9 +2191,9 @@ msgid "key %s: PKS subkey corruption repaired\n"
msgstr ""
#: g10/import.c:722
-#, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
+msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
#: g10/import.c:728
#, fuzzy, c-format
@@ -2157,7 +2219,7 @@ msgstr ""
msgid "no writable keyring found: %s\n"
msgstr ""
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr ""
@@ -2268,14 +2330,14 @@ msgid "key %s: no user ID for signature\n"
msgstr ""
#: g10/import.c:1299
-#, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
+msgstr "грамадскі ключ ня знойдзены"
#: g10/import.c:1301
-#, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
+msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
#: g10/import.c:1319
#, c-format
@@ -2313,9 +2375,9 @@ msgid "key %s: removed multiple subkey revocation\n"
msgstr ""
#: g10/import.c:1439
-#, c-format
-msgid "key %s: skipped user ID '%s'\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "key %s: skipped user ID \"%s\"\n"
+msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
#: g10/import.c:1460
#, c-format
@@ -2323,9 +2385,9 @@ msgid "key %s: skipped subkey\n"
msgstr ""
#: g10/import.c:1487
-#, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
+msgstr "Ключ абаронены.\n"
#: g10/import.c:1497
#, c-format
@@ -2357,299 +2419,299 @@ msgstr ""
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
-#: g10/import.c:1711
+#: g10/import.c:1712
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
-#: g10/import.c:1770
+#: g10/import.c:1771
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr ""
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "%s: тэчка створана\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr ""
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr ""
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr ""
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr ""
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr ""
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr ""
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr ""
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr ""
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr ""
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr ""
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, c-format
msgid " (%d) I trust marginally\n"
msgstr ""
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, c-format
msgid " (%d) I trust fully\n"
msgstr ""
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr ""
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
msgid "Are you sure you still want to sign it? (y/N) "
msgstr ""
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr ""
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, c-format
msgid "User ID \"%s\" is expired."
msgstr ""
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr ""
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
"is a PGP 2.x-style signature.\n"
msgstr ""
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr ""
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"has expired.\n"
msgstr ""
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"is a local signature.\n"
msgstr ""
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr ""
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr ""
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
msgid "Do you want to sign it again anyway? (y/N) "
msgstr ""
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr ""
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "Гэты ключ згубіў састарэў!"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr ""
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr ""
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
msgstr ""
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr ""
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
"to the person named above? If you don't know what to answer, enter \"0\".\n"
msgstr ""
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr ""
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr ""
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr ""
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr ""
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr ""
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
msgstr ""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
msgid ""
"\n"
"This will be a self-signature.\n"
msgstr ""
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
msgstr ""
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
msgstr ""
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
msgstr ""
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
msgstr ""
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
msgstr ""
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr ""
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "збой падпісаньня: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr ""
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr ""
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "Ключ абаронены.\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr ""
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2657,846 +2719,849 @@ msgstr ""
"Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
msgstr ""
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr ""
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr ""
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr ""
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr ""
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr ""
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr ""
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "даведка (help)"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "паказаць гэтую даведку"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr ""
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr ""
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr ""
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr ""
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr ""
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr ""
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr ""
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr ""
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr ""
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr ""
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr ""
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr ""
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr ""
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr ""
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
msgid "tsign"
msgstr ""
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "make a trust signature"
msgstr "зрабіць адчэплены подпіс"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr ""
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr ""
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr ""
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr ""
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr ""
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "sign the key locally and non-revocably"
msgstr ""
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr ""
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr ""
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr ""
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr ""
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr ""
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr ""
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr ""
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr ""
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr ""
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr ""
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+msgid "addcardkey"
+msgstr ""
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr ""
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr ""
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "addrevoker"
msgstr ""
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "add a revocation key"
msgstr ""
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr ""
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr ""
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr ""
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr ""
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr ""
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr ""
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr ""
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr ""
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr ""
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr ""
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr ""
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr ""
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr ""
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr ""
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr ""
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr ""
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr ""
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
msgid "keyserver"
msgstr ""
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
msgid "set preferred keyserver URL"
msgstr ""
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr ""
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr ""
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr ""
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr ""
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr ""
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr ""
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revuid"
msgstr ""
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
#, fuzzy
msgid "revoke a user ID"
msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr ""
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr ""
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr ""
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr ""
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr ""
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr ""
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr ""
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr ""
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr ""
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr ""
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "Даступны сакрэтны ключ.\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "Загад> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr ""
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr ""
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
msgid "Key is revoked."
msgstr ""
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr ""
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr ""
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr ""
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr ""
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr ""
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr ""
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr ""
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+msgid "Really move the primary key? "
+msgstr ""
+
+#: g10/keyedit.c:1598
+msgid "You must select exactly one key.\n"
+msgstr ""
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr ""
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr ""
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr ""
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
msgid "Really revoke all selected user IDs? "
msgstr ""
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
msgid "Really revoke this user ID? "
msgstr ""
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr ""
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr ""
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
msgid "Set preference list to:\n"
msgstr ""
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr ""
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr ""
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "Захаваць зьмены? "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "Выйсьці не захаваўшы зьмены? "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr ""
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr ""
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr ""
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr ""
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr ""
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keyedit.c:2219
#, c-format
msgid "This key may be revoked by %s key "
msgstr ""
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr ""
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "памылка чытаньня файла"
-#: g10/keyedit.c:2084
-#, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+msgid "revoked"
msgstr ""
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+msgid "expired"
+msgstr ""
+
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
msgstr "збой падпісаньня: %s\n"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
-#, c-format
-msgid "expires: %s"
-msgstr ""
+#: g10/keyedit.c:2246
+#, fuzzy, c-format
+msgid "usage: %s"
+msgstr "памылка чытаньня файла"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, c-format
msgid "trust: %s"
msgstr ""
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr ""
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr ""
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
+#: g10/keyedit.c:2300
+msgid "card-no: "
msgstr ""
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr ""
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-msgid "revoked"
-msgstr ""
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-msgid "expired"
-msgstr ""
-
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr ""
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
msgstr ""
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-msgid "[revoked] "
-msgstr ""
-
-#: g10/keyedit.c:2274
-msgid "[expired] "
-msgstr ""
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
msgstr ""
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
" of PGP to reject this key.\n"
msgstr ""
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
msgid "Are you sure you still want to add it? (y/N) "
msgstr ""
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr ""
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr ""
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr ""
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr ""
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr ""
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr ""
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr ""
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr ""
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
" some versions of PGP to reject this key.\n"
msgstr ""
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
msgid "Enter the user ID of the designated revoker: "
msgstr ""
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
msgid "this key has already been designated as a revoker\n"
msgstr ""
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr ""
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr ""
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr ""
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr ""
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr ""
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr ""
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr ""
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
msgid "Please select exactly one user ID.\n"
msgstr ""
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
#, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr ""
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr ""
+
+#: g10/keyedit.c:3480
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr ""
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr ""
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr ""
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr ""
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, c-format
msgid ""
"\"\n"
"signed with your key %s at %s\n"
msgstr ""
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, c-format
msgid ""
"\"\n"
"locally signed with your key %s at %s\n"
msgstr ""
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, c-format
msgid "This signature expired on %s.\n"
msgstr ""
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr ""
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr ""
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr ""
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, c-format
msgid " signed by %s on %s%s%s\n"
msgstr ""
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, c-format
msgid " revoked by %s on %s\n"
msgstr ""
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr ""
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, c-format
msgid " signed by %s on %s%s\n"
msgstr ""
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr ""
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
msgid "Really create the revocation certificates? (y/N) "
msgstr ""
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr ""
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr ""
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
-#: g10/keylist.c:179
+#: g10/keylist.c:180
msgid "Critical signature policy: "
msgstr ""
-#: g10/keylist.c:181
+#: g10/keylist.c:182
msgid "Signature policy: "
msgstr ""
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr ""
-#: g10/keylist.c:286
+#: g10/keylist.c:287
msgid "Critical signature notation: "
msgstr ""
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr ""
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr ""
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr ""
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr "збой падпісаньня: %s\n"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr ""
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, c-format
-msgid " [revoked: %s]"
-msgstr ""
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
msgid "Primary key fingerprint:"
msgstr ""
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
msgid " Subkey fingerprint:"
msgstr ""
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
msgid " Primary key fingerprint:"
msgstr ""
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
msgid " Subkey fingerprint:"
msgstr ""
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr "паказаць ключы й адбіткі пальцаў"
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3704,76 +3769,76 @@ msgstr ""
msgid "invalid root packet detected in proc_tree()\n"
msgstr ""
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr ""
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr ""
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr ""
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr ""
-#: g10/misc.c:491
+#: g10/misc.c:517
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr ""
-#: g10/misc.c:495
+#: g10/misc.c:521
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr ""
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr ""
-#: g10/misc.c:508
+#: g10/misc.c:534
msgid "Uncompressed"
msgstr ""
-#: g10/misc.c:533
+#: g10/misc.c:559
msgid "uncompressed|none"
msgstr ""
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr ""
-#: g10/misc.c:777
+#: g10/misc.c:826
#, c-format
msgid "ambiguous option `%s'\n"
msgstr ""
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "невядомая вэрсыя"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr ""
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr ""
@@ -3812,7 +3877,7 @@ msgstr ""
msgid "communication problem with gpg-agent\n"
msgstr ""
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr ""
@@ -3848,24 +3913,24 @@ msgstr "пароль занадта доўгі\n"
msgid "invalid response from agent\n"
msgstr ""
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "скасавана карыстальнікам\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr ""
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr ""
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "Увядзіце пароль: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -3875,22 +3940,22 @@ msgstr ""
"Вам неабходна ўвесьці пароль, каб адчыніць сакрэтны ключ для\n"
"карыстальніка: \""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, c-format
msgid " (main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "Паўтарыце пароль: "
@@ -4096,25 +4161,36 @@ msgstr ""
msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
-msgstr ""
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
+msgstr "%s: немагчыма стварыць тэчку: %s\n"
-#: g10/sign.c:794
+#: g10/sign.c:771 g10/sign.c:1008
+#, fuzzy, c-format
+msgid "writing to file `%s'\n"
+msgstr "запіс у stdout\n"
+
+#: g10/sign.c:795
#, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr ""
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "немагчыма адкрыць %s: %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr ""
@@ -4501,7 +4577,7 @@ msgstr ""
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA патрабуе выкарыстаньня 160-і бітавага хэш-альгарытму\n"
@@ -4776,17 +4852,17 @@ msgstr "Даведка адсутнічае"
msgid "No help available for `%s'"
msgstr "Для \"%s\" даведка адсутнічае"
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr ""
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr ""
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr ""
@@ -4829,8 +4905,7 @@ msgstr "паказаць сьпіс ключоў і подпісаў"
msgid "%s: keyring created\n"
msgstr "%s: створаны зьвязак ключоў\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -4839,29 +4914,34 @@ msgid ""
"Keeping the image close to 240x288 is a good size to use.\n"
msgstr ""
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr ""
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, fuzzy, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "немагчыма адкрыць %s: %s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
msgid "Are you sure you want to use it (y/N)? "
msgstr ""
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr ""
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Is this photo correct (y/N/q)? "
msgstr ""
-#: g10/photoid.c:331
+#: g10/photoid.c:332
msgid "unable to display photo ID!\n"
msgstr ""
@@ -4880,43 +4960,48 @@ msgid ""
msgstr ""
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
+msgid "this platform requires temporary files when calling external programs\n"
msgstr ""
-#: g10/exec.c:432
-#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
-msgstr ""
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
+msgstr "немагчыма адкрыць %s: %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:436
+#, fuzzy, c-format
+msgid "unable to execute shell `%s': %s\n"
+msgstr "немагчыма адкрыць %s: %s\n"
+
+#: g10/exec.c:515
#, c-format
msgid "system error while calling external program: %s\n"
msgstr ""
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr ""
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr ""
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr ""
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr ""
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr ""
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr ""
@@ -5067,6 +5152,10 @@ msgstr ""
msgid "read error: %s\n"
msgstr "памылка чытаньня файла"
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr "збой падпісаньня: %s\n"
+
#~ msgid "|[files]|encrypt files"
#~ msgstr "|[файлы]|зашыфраваць файлы"
diff --git a/po/ca.po b/po/ca.po
index 4e6627416..054e45394 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.4rc\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
"PO-Revision-Date: 2003-12-05 19:15+0100\n"
"Last-Translator: Jordi Mallach <[email protected]>\n"
"Language-Team: Catalan <[email protected]>\n"
@@ -70,7 +70,7 @@ msgstr "no"
msgid "nN"
msgstr "nN"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "ix"
@@ -319,6 +319,19 @@ msgstr "la clau secreta �s inusable"
msgid "keyserver error"
msgstr "error de servidor de claus"
+#: util/errors.c:108
+#, fuzzy
+msgid "canceled"
+msgstr "Cancel�la"
+
+# G�nere? Nombre? ivb
+# Werner FIXME: please add translator comment saying *what* is
+# uncompressed so we know the gender. jm
+#: util/errors.c:109
+#, fuzzy
+msgid "no card"
+msgstr "no �s xifrat"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr ""
@@ -341,7 +354,7 @@ msgstr "heu trobat un bug... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "no s'ha trobat cap m�dul d'acumulaci� d'entropia\n"
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "no s'ha pogut obrir �%s�: %s\n"
@@ -375,7 +388,7 @@ msgstr "no s'ha pogut llegir �%s�: %s\n"
msgid "note: random_seed file not updated\n"
msgstr "nota: el fitxer random_seed no s'ha actualitzat\n"
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr "no s'ha pogut crear �%s�: %s\n"
@@ -446,7 +459,7 @@ msgstr "no s'ha pogut generar un prim amb menys de %d bits\n"
msgid "can't generate a prime with less than %d bits\n"
msgstr "no s'ha pogut generar un prim amb menys de %d bits\n"
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -454,130 +467,130 @@ msgstr ""
"@Ordres:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[fitxer]|crea una signatura"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[fitxer]|crea una signatura en text clar"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "crea una signatura separada"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "xifra dades"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "xifra nom�s amb xifratge sim�tric"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "desxifra dades (predeterminat)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "verifica una signatura"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "llista claus"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "llista claus i signatures"
# �de les claus� o �de la clau�? ivb
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "comprova les signatures de la claus"
# �dactilars� o �digitals�? ivb
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "llista claus i empremtes digitals"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "llista claus secretes"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "genera un nou parell de claus"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "elimina claus de l'anell p�blic"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "elimina claus de l'anell secret"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "signa una clau"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "signa una clau localment"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "signa o edita una clau"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "genera un certificat de revocaci�"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "exporta claus"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "exporta claus a un servidor de claus"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "importa claus d'un servidor de claus"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "cerca claus en un servidor de claus"
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "actualitza totes les claus des d'un servidor de claus"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "importa/fon claus"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "actualitza la base de dades de confian�a"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|algo [fitxers]|imprimeix resums de missatges"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -587,56 +600,52 @@ msgstr ""
"Opcions:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "crea eixida amb armadura ascii"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|NOM|xifra per a NOM"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr "usa aquest id per a signar o desxifrar"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr "|N|nivell de compressi� N (0 no comprimeix)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "usa el mode de text can�nic"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "fitxer d'eixida"
# Un dels dos �s en la llista d'opcions amb --help. Urgh. jm
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "detall"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "no fa cap canvi"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "pregunta abans de sobreescriure"
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -647,7 +656,7 @@ msgstr ""
# Crec q (A)lice (orig.), (B)ob (dest.), etc. s�n noms usats pel Zimmerman
# en el manual original de PGP. A, B, C... ivb
# En efecte. Idem per a Mallory m�s endavant. Els deixe com a l'original. jm
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -667,15 +676,15 @@ msgstr ""
" --list-keys [noms] mostra claus\n"
" --fingerprint [noms] mostra empremtes digitals\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Si us plau, informeu sobre els errors a <[email protected]>.\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Forma d'�s: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -690,7 +699,7 @@ msgstr ""
# Precissament acabem de parlar d'�implementat a la llista del GNOME
# i s'ha dit que �s erroni, igual que �suportat� :) Les alternatives
# encara no m'agraden massa... jm
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -698,487 +707,481 @@ msgstr ""
"\n"
"Algoritmes suportats:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr "Clau p�blica: "
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr "Xifratge: "
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr "Dispersi�: "
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
msgid "Compression: "
msgstr "Compressi�: "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "forma d'�s: gpg [opcions] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "les ordres entren en conflicte\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "no s'ha trobat cap signe = en la definici� de grup �%s�\n"
# Indi. ivb
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "AV�S: el propietari �s insegur en %s �%s�\n"
# Indi. ivb
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "AV�S: el propietari �s insegur en %s �%s�\n"
# Indi. ivb
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "AV�S: el propietari �s insegur en %s �%s�\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "AV�S: els permissos s�n insegurs en %s �%s�\n"
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "AV�S: els permissos s�n insegurs en %s �%s�\n"
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "AV�S: els permissos s�n insegurs en %s �%s�\n"
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"AV�S: el propietari del directori envoltant �s insegur en %s �%s�\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr ""
"AV�S: el propietari del directori envoltant �s insegur en %s �%s�\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
"AV�S: el propietari del directori envoltant �s insegur en %s �%s�\n"
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"AV�S: els permissos del directori envoltant s�n insegurs en %s �%s�\n"
-#: g10/g10.c:1205
+#: g10/g10.c:1210
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr ""
"AV�S: els permissos del directori envoltant s�n insegurs en %s �%s�\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
"AV�S: els permissos del directori envoltant s�n insegurs en %s �%s�\n"
-#: g10/g10.c:1334
+#: g10/g10.c:1354
#, fuzzy, c-format
-msgid "unknown configuration item \"%s\"\n"
+msgid "unknown configuration item `%s'\n"
msgstr "s'ha creat el nou fitxer d'opcions �%s�\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic �%s�\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: no existeix el fitxer d'opcions predeterminades �%s�\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "fitxer d'opcions �%s�: %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "s'estan llegint opcions de �%s�\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: %s no �s per a �s normal!\n"
-#: g10/g10.c:1887
-#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+#: g10/g10.c:2021
+#, fuzzy, c-format
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr ""
"la extensi� de xifrat �%s� no s'ha carregat per tindre permissos "
"insegurs\n"
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "%s no �s un joc de car�cters v�lid\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr ""
"no s'ha pogut analitzar sint�cticament la URI del servidor de claus\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d opcions d'exportaci� no v�lides\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opcions d'exportaci� no v�lides\n"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opcions d'importanci� no v�lides\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
msgid "invalid import options\n"
msgstr "opcions d'importaci� no v�lides\n"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d opcions d'exportaci� no v�lides\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
msgid "invalid export options\n"
msgstr "opcions d'exportaci� no v�lides\n"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opcions d'importanci� no v�lides\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "opcions d'importaci� no v�lides\n"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d opcions d'exportaci� no v�lides\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "opcions d'exportaci� no v�lides\n"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "no s'ha pogut fixar l'exec-path a %s\n"
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "AV�S: el programa podria crear un fitxer core!\n"
# FIXME: prefer�ncia? jm
# Ho discut�rem en la llista, segur. Deu ser als arxius. ivb
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AV�S: %s t� prefer�ncia sobre %s\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s no �s perm�s amb %s!\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s no t� sentit amb %s!\n"
# clares -> en clar? ivb
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "nom�s podeu fer signatures separades o en clar en el mode --pgp2\n"
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "no podeu signar i xifrar al mateix temps en el mode --pgp2\n"
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"heu d'utilitzar fitxers (i no un conducte) mentre treballeu amb --pgp2 "
"habilitat.\n"
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "xifrar un missatge en mode --pgp2 requereix el xifratge IDEA\n"
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorisme de xifratge triat no �s v�lid\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "l'algorisme de resum seleccionat no �s v�lid\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "l'algorisme de xifratge triat no �s v�lid\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
msgid "selected certification digest algorithm is invalid\n"
msgstr "l'algorisme de resum de certificaci� seleccionat no �s v�lid\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed ha de ser major que 0\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed ha de ser major que 1\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth ha d'estar en el rang 1 a 255\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
#, fuzzy
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "default-check-level �s inv�lid; ha de ser 0, 1, 2 o 3\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
#, fuzzy
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "default-check-level �s inv�lid; ha de ser 0, 1, 2 o 3\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: el mode S2K simple (0) no �s gens recomanable\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "el mode S2K �s inv�lid; ha de ser 0, 1 o 3\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
msgid "invalid default preferences\n"
msgstr "les prefer�ncies per defecte s�n inv�lides\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
msgid "invalid personal cipher preferences\n"
msgstr "les prefer�ncies personals de xifrat s�n inv�lides\n"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
msgid "invalid personal digest preferences\n"
msgstr "les prefer�ncies personals de digest s�n inv�lides\n"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
msgid "invalid personal compress preferences\n"
msgstr "les prefer�ncies personals de compressi� s�n inv�lides\n"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s encara no funciona amb %s\n"
-#: g10/g10.c:2680
-#, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2797
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr ""
"no podeu usar l'algorisme de xifratge �%s� mentre esteu en mode %s\n"
-#: g10/g10.c:2685
-#, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2802
+#, fuzzy, c-format
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n"
-#: g10/g10.c:2690
-#, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2807
+#, fuzzy, c-format
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "no podeu usar l'algorisme de compressi� %s mentre esteu en mode %s\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "no s'ha pogut inicialitzar la base de dades de confian�a: %s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"AV�S: s'han donat destinataris (-r) sense usar xifratge de clau p�blica\n"
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [nom_del_fitxer]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [nom_del_fitxer]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [nom_del_fitxer]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nom_del_fitxer]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "no podeu usar %s mentre esteu en mode %s\n"
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [nom_del_fitxer]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nom_del_fitxer]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nom_del_fitxer]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "no podeu usar %s mentre esteu en mode %s\n"
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nom_del_fitxer]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [nom_del_fitxer]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [nom_del_fitxer]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrsign-key user-id"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key user-id"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [ordres]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "no s'ha pogut obrir %s: %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [user-id] [anell]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "l'enviament al servidor de claus ha fallat: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "la recepci� des del servidor de claus ha fallat: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, c-format
msgid "key export failed: %s\n"
msgstr "l'exportaci� de la clau ha fallat: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "ha fallat la cerca al servidor de claus: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "ha fallat el refresc des del servidor de claus: %s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "no s'ha pogut llevar l'armadura: %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "l'algoritme de dispersi� �s inv�lid �%s�\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[nom_del_fitxer]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "Endavant, escriviu el missatge...\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "no s'ha pogut obrir �%s�\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@ -1186,49 +1189,49 @@ msgstr ""
"un nom de notaci� nom�s pot tenir car�cters imprimibles o espais i "
"acabar amb el signe �=�\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
msgid "a user notation name must contain the '@' character\n"
msgstr "un nom de notaci� d'usuari no pot contenir el car�cter �@�\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "un valor de notaci� no pot utilitzar cap car�cter de control\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr "la URL de pol�tica de certificaci� donada no �s v�lida\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr "la URL de pol�tica de signatura donada no �s v�lida\n"
-#: g10/g10.c:3747
+#: g10/g10.c:3863
#, fuzzy
-msgid "the given signature preferred keyserver URL is invalid\n"
+msgid "the given preferred keyserver URL is invalid\n"
msgstr "la URL de pol�tica de signatura donada no �s v�lida\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "una mica m�s silenci�s"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
msgid "take the keys from this keyring"
msgstr "pren les claus d'aquest anell"
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
msgid "make timestamp conflicts only a warning"
msgstr "fes els conflictes de marques de temps nom�s un av�s"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr "|FD|escriu informaci� d'estat en aquest FD"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Forma d'�s: gpgv [opcions] [fitxers] (-h per a veure l'ajuda)"
# Werner FIXME: should it use �Usage�?
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1265,12 +1268,13 @@ msgstr "la l�nia escapada amb gui� �s inv�lida: "
# FIXME: un-indiar. jm
#: g10/armor.c:565
-msgid "unexpected armor:"
+#, fuzzy
+msgid "unexpected armor: "
msgstr "armadura inesperada:"
-#: g10/armor.c:695 g10/armor.c:1276
-#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+#: g10/armor.c:695 g10/armor.c:1280
+#, fuzzy, c-format
+msgid "invalid radix64 character %02X skipped\n"
msgstr "el car�cter radix64 %02x inv�lid s'ha om�s\n"
#: g10/armor.c:738
@@ -1281,34 +1285,35 @@ msgstr "fi de fitxer prematur (no CRC)\n"
msgid "premature eof (in CRC)\n"
msgstr "fi de fitxer prematur (en CRC)\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "CRC malformat\n"
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "error de CRC; %06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+#, fuzzy
+msgid "premature eof (in trailer)\n"
msgstr "f� de fitxer prematur (al final)\n"
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "error en l'�ltima l�nia\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "no s'han trobat dades OpenPGP v�lides.\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr ""
"l'armadura �s inv�lida: la l�nia �s m�s llarga que %d car�cters\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1364,7 +1369,7 @@ msgstr " alias \""
msgid " aka \""
msgstr " alias \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1617,96 +1622,116 @@ msgstr "%s: es descarta: la clau p�blica est� desactivada\n"
msgid "no valid addressees\n"
msgstr "no hi ha adreces v�lides\n"
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "la prefer�ncia %c%lu �s duplicada\n"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "hi ha massa prefer�ncies �%c�\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
#, fuzzy
msgid "too many digest preferences\n"
msgstr "hi ha massa prefer�ncies �%c�\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
#, fuzzy
msgid "too many compression preferences\n"
msgstr "hi ha massa prefer�ncies �%c�\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "hi ha un car�cter inv�lid en la cadena de prefer�ncia\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
msgid "writing direct signature\n"
msgstr "s'est� escrivint una signatura directa\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "s'est� escrivint l'autosignatura\n"
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "s'est� escrivint la signatura de comprovaci� de la clau\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "la mida de la clau �s inv�lida; s'hi usaran %u bits\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "Seleccioneu quin tipus de clau voleu:\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA i ElGamal (predeterminat)\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (nom�s signar)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (nom�s xifrar)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (nom�s signar)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (nom�s xifrar)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (signar i xifrar)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, fuzzy, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) RSA (nom�s signar)\n"
+
+#: g10/keygen.c:1224
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) RSA (signar i xifrar)\n"
+
+#: g10/keygen.c:1226
+#, fuzzy, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) RSA (nom�s xifrar)\n"
+
+#: g10/keygen.c:1228
+#, fuzzy, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) RSA (signar i xifrar)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "Seleccioneu: "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "La selecci� �s inv�lida.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1719,31 +1744,31 @@ msgstr ""
" grand�ria predeterminada: 1024 bits\n"
" grand�ria m�xima aconsellada: 2048 bits\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "Quina grand�ria voleu? (1024) "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA nom�s permet claus entre 512 i 1024 bits\n"
-#: g10/keygen.c:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr ""
"la clau �s massa petita; 1024 bits ?s el m�nim perm�s per a claus "
"RSA.\n"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "la clau �s massa petita; 768 bits �s el m�nim perm�s.\n"
# Jo tinc Deep Thought MMX a casa i m'ho fa en 42 segons. ivb
-#: g10/keygen.c:1255
+#: g10/keygen.c:1328
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "la clau �s massa llarga; %d �s el m�xim perm�s.\n"
-#: g10/keygen.c:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1751,11 +1776,11 @@ msgstr ""
"No es recomanen claus m�s llargues de 2048 bits perqu�\n"
"els c�lculs s�n VERITABLEMENT llargs!\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "Segur que voleu aquesta grand�ria? "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1763,17 +1788,17 @@ msgstr ""
"D'acord, per� sapieu que la radiaci� del monitor i del teclat tamb� "
"son molt vulnerables als atacs!\n"
-#: g10/keygen.c:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "La grand�ria sol�licitada �s %u bits\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arrodonida fins a %u bits\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1789,7 +1814,7 @@ msgstr ""
" <n>m = la clau caduca als n mesos\n"
" <n>y = la clau caduca als n anys\n"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1805,31 +1830,31 @@ msgstr ""
" <n>m = la signatura caduca als n mesos\n"
" <n>y = la signatura caduca als n anys\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "Indiqueu la validesa de la clau (0) "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr "Indiqueu la validesa de la signatura (0) "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "el valor no �s v�lid\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s no caduca en absolut\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr "%s caduca el %s\n"
# Amb �it� es refereix a les dates? ivb
# Aix� vaig entendre jo. jm
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1837,16 +1862,17 @@ msgstr ""
"El vostre sistema no pot representar dates posteriors a l'any 2038.\n"
"Tanmateix, les tractar� b� fins l'any 2106.\n"
-#: g10/keygen.c:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "�s correcte? (s/n)"
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
+#, fuzzy
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
@@ -1857,44 +1883,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "Nom i cognoms: "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "Hi ha un car�cter inv�lid en el camp *nom*\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr "El nom no pot comen�ar amb un d�git\n"
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr "El nom ha de tenir, si m�s no, 5 car�cters\n"
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "Adre�a electr�nica: "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "No �s una adre�a v�lida\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "Comentari: "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "Hi ha un car�cter inv�lid en el camp *comentari*\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Esteu usant el joc de car�cters `%s'.\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1905,30 +1931,30 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"No inclogueu l'adre�a ni en el camp *nom* ni en el camp *comentari*\n"
# xX? ivb
# Hmm... s�. jm
-#: g10/keygen.c:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoXx"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix "
-#: g10/keygen.c:1542
+#: g10/keygen.c:1615
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix"
-#: g10/keygen.c:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr "Corregiu l'error primer\n"
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1936,16 +1962,16 @@ msgstr ""
"Cal una contrasenya per a protegir la clau secreta.\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1957,7 +1983,7 @@ msgstr ""
"useu aquest programa amb l'opci� \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1970,63 +1996,63 @@ msgstr ""
"aleatoris\n"
"d'aconseguir prou entropia.\n"
-#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr "no es pot fet aix� en mode desat�s\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "La parella de claus DSA ha de tenir 1024 bits.\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "La generaci� de claus ha estat cancel�lada.\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr "s'est� escrivint la clau p�blica a �%s�\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "s'est� escrivint la clau secreta a �%s�\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "s'est� escrivint la clau secreta a �%s�\n"
# Potser no hi haja cap anell! ivb
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "no s'ha trobat cap anell p�blic escrivible: %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr ""
"no s'ha trobat cap anell secret de escrivible: %s\n"
"\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr ""
"s'ha produ�t un error mentre s'escrivia l'anell p�blic �%s�: %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr ""
"s'ha produ�t un error mentre s'escrivia l'anell secret �%s�: %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "s'han creat i signat les claus p�blica i secreta.\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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"
@@ -2034,13 +2060,13 @@ msgstr ""
"Noteu que aquesta clau no serveix per a xifrar. Potser vulgueu usar l'ordre\n"
"\"--edit-key\" per a generar una clau secund�ria per a tal prop�sit.\n"
-#: g10/keygen.c:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr "La generaci� de claus ha fallat: %s\n"
# Werner FIXME: Use ngettext. jm
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -2049,7 +2075,7 @@ msgstr ""
"amb el rellotge)\n"
# Werner FIXME: use ngettext. jm
-#: g10/keygen.c:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -2057,14 +2083,43 @@ msgstr ""
"la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
"amb el rellotge)\n"
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTA: crear subclaus per a claus v3 no �s conforme amb OpenPGP\n"
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "Crear realment? "
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "no s'ha pogut crear �%s�: %s\n"
+
+#: g10/keygen.c:3248
+#, fuzzy, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "NOTA: la clau secreta %08lX caduca el %s\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "--output no funciona per a aquesta ordre\n"
@@ -2075,7 +2130,7 @@ msgstr "--output no funciona per a aquesta ordre\n"
msgid "%s: can't open: %s\n"
msgstr "%s: no s'ha pogut obrir: %s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "error en la creaci� de la contrasenya: %s\n"
@@ -2104,6 +2159,11 @@ msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
msgstr ""
"nom�s podeu xifrar a claus RSA de 2048 bits o menys en el mode --pgp2\n"
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "no s'ha pogut obrir %s: %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -2116,26 +2176,36 @@ msgstr ""
"no s'ha pogut utilitzar el xifratge IDEA per a totes les claus per a les que "
"esteu xifrant.\n"
-#: g10/encode.c:526 g10/encode.c:721
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#: g10/encode.c:526
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"for�ar el xifrat asim�tric %s (%d) viola les prefer�ncies del "
"destinatari\n"
-#: g10/encode.c:634 g10/sign.c:863
-#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+#: g10/encode.c:634 g10/sign.c:864
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
msgstr ""
"for�ar l'algoritme de compressi� %s (%d) viola les prefer�ncies del "
"destinatari\n"
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"for�ar el xifrat asim�tric %s (%d) viola les prefer�ncies del "
+"destinatari\n"
+
#: g10/encode.c:818
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s xifrat per a: �%s�\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "no s'ha trobat la clau �%s�: %s\n"
@@ -2170,8 +2240,9 @@ msgid "too many entries in pk cache - disabled\n"
msgstr ""
"hi ha massa entrades en la mem�ria cau de claus p�bliques - desactivada\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+#, fuzzy
+msgid "[User ID not found]"
msgstr "[No s'ha trobat l'id d'usuari]"
#: g10/getkey.c:1614
@@ -2326,7 +2397,7 @@ msgstr "clau %08lX: corrupci� de la subclau HKP reparada\n"
#: g10/import.c:722
#, fuzzy, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "clau %08lX: s'ha acceptat la ID d'usuari no autosignada �%s�\n"
#: g10/import.c:728
@@ -2353,7 +2424,7 @@ msgstr "clau %08lX: clau nova - es descarta \n"
msgid "no writable keyring found: %s\n"
msgstr "no s'ha trobat cap anell escrivible: %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "s'est� escrivint en �%s�\n"
@@ -2471,7 +2542,7 @@ msgstr "clau %08lX: no hi ha ID per a la signatura\n"
#: g10/import.c:1299
#, fuzzy, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"clau %08lX: l'algoritme de clau p�blica no es suporta sobre l'id d'usuari "
"�%s�\n"
@@ -2479,7 +2550,7 @@ msgstr ""
#: g10/import.c:1301
#, fuzzy, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr ""
"clau %08lX: l'autosignatura no �s v�lida en l'id d'usuari �%s�\n"
@@ -2520,7 +2591,7 @@ msgstr "clau %08lX: s'han eliminat subclaus de revocaci� m�ltiples\n"
#: g10/import.c:1439
#, fuzzy, c-format
-msgid "key %s: skipped user ID '%s'\n"
+msgid "key %s: skipped user ID \"%s\"\n"
msgstr "clau %08lX: es descarta l'ID d'usuari '"
#: g10/import.c:1460
@@ -2530,7 +2601,7 @@ msgstr "clau %08lX: es descarta la subclau\n"
#: g10/import.c:1487
#, fuzzy, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr ""
"clau %08lX: la signatura �s inexportable (classe %02x) - es descarta\n"
@@ -2572,116 +2643,116 @@ msgstr ""
"AV�S: la clau %08lX pot estar revocada: s'adquireix la clau de revocaci� "
"%08lX\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"AV�S: la clau %08lX pot estar revocada: la clau de revocaci� %08lX no "
"est� present.\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "clau %08lX: s'hi ha afegit el certificat de revocaci� �%s�\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[revocaci�]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[autosignatura]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "1 signatura err�nia\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d signatures err�nies\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "1 signatura no comprovada per falta de clau\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d signatures no comprovades per falta de clau\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "1 signatura no comprovada a causa d'un error\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d signatures no comprovades a causa d'errors\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "Ha estat detectat 1 ID sense autosignatura v�lida\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "Han estat detectats %d IDs sense autosignatura v�lida\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, fuzzy, c-format
msgid " (%d) I trust marginally\n"
msgstr " %d = Hi confie marginalment\n"
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, fuzzy, c-format
msgid " (%d) I trust fully\n"
msgstr " %d = Hi confie plenament\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "L'ID d'usuari �%s� est� revocat."
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Segur que encara voleu signarla? (s/N) "
# O no s'ha pogut? ivb
# FIXME: comprovar context. jm
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr " No es pot signar.\n"
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "L'ID d'usuari �%s� ha caducat."
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "L'ID d'usuari �%s� no est� autosignat."
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2690,11 +2761,11 @@ msgstr ""
"La vostra signatura en �%s�\n"
"�s una signatura d'estil PGP 2.x.\n"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Voleu ascendir-la a una autosignatura OpenPGP? (s/N) "
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2703,11 +2774,11 @@ msgstr ""
"La vostra signatura actual en �%s�\n"
"ha caducat.\n"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Voleu crear una nova signatura per a reempla�ar la caducada? (s/N) "
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2716,54 +2787,54 @@ msgstr ""
"La vostra signatura en �%s�\n"
"�s una signatura local.\n"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Voleu ascendir-la a una signatura completament exportable? (s/N) "
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "�%s� ja estava signada localment amb la clau %08lX\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "�%s� ja estava signada amb la clau %08lX\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Voleu signarla un altre cop, de tota manera? (s/N) "
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "No hi ha res que signar amb la clau %08lX\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "La clau ha caducat!"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Aquesta clau caducar� el %s.\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Voleu que la vostra signatura caduque alhora? (S/n) "
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
msgstr ""
"No podeu fer una signatura OpenPGP en una clau PGP 2.x en el mode --pgp2.\n"
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "A�� inutilitzaria la clau en PGP 2.x.\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2773,33 +2844,33 @@ msgstr ""
"pertany realment a la persona esmentada anteriorment? Si no sabeu qu� \n"
"contestar, entreu �0�.\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) No vaig a contestar.%s\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) No ho he comprovat en absolut.%s\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) He fet algunes comprovacions.%s\n"
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) He fet comprovacions molt acurades.%s\n"
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr ""
"Seleccioneu una opci� (introdu�u �?� per obtindre m�s "
"informaci�):"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2807,7 +2878,7 @@ msgstr ""
"Esteu segur que voleu signar aquesta clau\n"
"amb la vostra clau: \""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2815,7 +2886,7 @@ msgstr ""
"\n"
"A�� ser� una autosignatura.\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2823,7 +2894,7 @@ msgstr ""
"\n"
"AV�S: la signatura no es marcar� com a inexportable.\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2831,7 +2902,7 @@ msgstr ""
"\n"
"AV�S: la signatura no es marcar� com a irrevocable.\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2839,7 +2910,7 @@ msgstr ""
"\n"
"La signatura es marcar� com a inexportable.\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2847,7 +2918,7 @@ msgstr ""
"\n"
"La signatura es marcar� com a irrevocable.\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2855,7 +2926,7 @@ msgstr ""
"\n"
"No he comprovat aquesta clau en absolut.\n"
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2863,7 +2934,7 @@ msgstr ""
"\n"
"He fet algunes comprovacions a aquesta clau.\n"
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2871,34 +2942,34 @@ msgstr ""
"\n"
"He comprovat aquesta clau amb molta cura.\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "Signar realment? "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "Ha fallat el proc�s de signatura: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "Aquesta clau no est� protegida.\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr "Les parts secretes de la clau prim�ria no estan disponibles.\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "La clau est� protegida.\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "No es pot editar aquesta clau: %s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2906,7 +2977,7 @@ msgstr ""
"Introdu�u la nova contrasenya per a la clau secreta.\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2915,149 +2986,149 @@ msgstr ""
"\n"
# No abusis dels pronoms! (Rowan Atkinson @ Llei i Desordre) ivb
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "Esteu segur de voler fer a��? "
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "s'est� posant la signatura al lloc correcte\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "ix del men�"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "q"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "desa"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "desa i ix"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "ajuda"
# �pantalla� o �ajuda�? ivb
# �ajuda�, evidentment. jm
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "mostra aquesta ajuda"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "mostra empremta"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "llista"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "llista claus i ID"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "uid"
# Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents... ivb
# Yeah, els vaig corregir abans de que enviares la teua correcci�. jm
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "tria l'ID d'usuari N"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "clau"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "tria la clau secund�ria N"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "comprova"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "llista les signatures"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "c"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "signa la clau"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "s"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "tsign"
msgstr "sign"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "make a trust signature"
msgstr "crea una signatura separada"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "signa la clau localment"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr "signa la clau irrevocablement"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "sign the key locally and non-revocably"
msgstr "signa la clau localment i irrevocablement"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "depura"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "afegeix un ID d'usuari"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr "addphoto"
@@ -3065,411 +3136,433 @@ msgstr "addphoto"
# Si et refereixes a Photo vs. photo, ho deixe en min�scules, que en tot
# el men� est� tot en min�scules. Tb hi ha molts ID vs. id en els msgids
# i no hem unificat en catal�. Potser li ho dir� a Werner. jm.
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr "afegeix un photo ID"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "esborra un ID d'usuari"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr "delphoto"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "afegeix una clau secund�ria"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+#, fuzzy
+msgid "addcardkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "esborra una clau secund�ria"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "addrevoker"
msgstr "addrevoker"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "add a revocation key"
msgstr "afegeix una clau de revocaci�"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "esborra signatures"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "canvia la data de caducitat"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr "primari"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr "marca l'ID d'usuari com a primari"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "canvia entre el llistat de claus secretes i p�bliques"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "t"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr "llista les prefer�ncies (expert)"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr "llista les prefer�ncies (detallat)"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr "estableix la llista de prefer�ncies"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr "prefer�ncies actualitzades"
# �del servidor�, �en el servidor�? ivb
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "keyserver"
msgstr "error de servidor de claus"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "set preferred keyserver URL"
msgstr ""
"no s'ha pogut analitzar sint�cticament la URI del servidor de claus\n"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "canvia la contrasenya"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "canvia la confian�a"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "revoca signatures"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revuid"
msgstr "revuid"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revoke a user ID"
msgstr "revoca un ID d'usuari"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "revoca una clau secund�ria"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "desactiva una clau"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "activa una clau"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr "showphoto"
# Igual que dalt. ivb
# Idem :) jm
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr "mostra el photo ID"
# Dest�s? ivb
# Desat�s, s�. jm
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "no es pot fet aix� en mode desat�s\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "error en llegir el bloc de claus secretes �%s�: %s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "La clau secreta est� disponible.\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "Ordre> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "Cal la clau secreta per a fer a��.\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr "Useu l'ordre �toggle� abans.\n"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
msgid "Key is revoked."
msgstr "La clau est� revocada."
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "Realment voleu signar tots els ID d'usuari? "
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Aquesta ordre no est� permesa mentre s'est� en mode %s.\n"
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "Heu de seleccionar al menys un ID d'usuari.\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "No podeu esborrar l'�ltim ID d'usuari!\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "Realment voleu eliminar tots els ID d'usuari seleccionats? "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "Realment voleu eliminar aquest ID d'usuari? "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+#, fuzzy
+msgid "Really move the primary key? "
+msgstr "Realment voleu eliminar aquest ID d'usuari? "
+
+#: g10/keyedit.c:1598
+#, fuzzy
+msgid "You must select exactly one key.\n"
+msgstr "Heu de seleccionar, si m�s no, una clau.\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "Heu de seleccionar, si m�s no, una clau.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "Realment voleu eliminar les claus seleccionades? "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "Realment voleu eliminar aquesta clau? "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
msgid "Really revoke all selected user IDs? "
msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
msgid "Really revoke this user ID? "
msgstr "Realment voleu eliminar aquest ID d'usuari? "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "Realment voleu revocar les claus seleccionades? "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "Realment voleu revocar aquesta clau? "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
#, fuzzy
msgid "Set preference list to:\n"
msgstr "estableix la llista de prefer�ncies"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr ""
"Voleu actualitzar les prefer�ncies per a les ID d'usuaris seleccionades?"
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr "Realment voleu actualitzar les prefer�ncies? "
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "Voleu desar els canvis? "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "Voleu eixir sense desar? "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "ha fallat l'actualitzaci�: %s\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "ha fallat l'actualitzaci� de la clau secreta: %s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "La clau no ha canviat, per tant no cal actualitzaci�.\n"
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "L'ordre no �s v�lida (proveu �help�)\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr "Resum: "
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr "Funcionalitats: "
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr ""
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
# Potser %s haja d'anar darrere de �clau�. ivb
# �s cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:2219
#, c-format
msgid "This key may be revoked by %s key "
msgstr "Aquesta clau pot ser revocada per la clau %s "
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr " (sensible)"
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "no s'ha pogut creat %s: %s\n"
-#: g10/keyedit.c:2084
-#, fuzzy, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
msgstr "[revocada]"
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
-msgstr " [caduca: %s]"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
+msgstr "expire"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2246
#, fuzzy, c-format
-msgid "expires: %s"
-msgstr " [caduca: %s]"
+msgid "usage: %s"
+msgstr " confian�a: %c/%c"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, fuzzy, c-format
msgid "trust: %s"
msgstr " confian�a: %c/%c"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "Aquesta clau ha estat desactivada"
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! la subclau ha estat revocada: %s\n"
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
-msgstr "rev- s'ha trobat una revocaci� falsa\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? hi ha problemes en la comprovaci� de la revocaci�: %s\n"
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-#, fuzzy
-msgid "revoked"
-msgstr "[revocada]"
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-#, fuzzy
-msgid "expired"
-msgstr "expire"
+#: g10/keyedit.c:2300
+msgid "card-no: "
+msgstr ""
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "No hi ha prefer�ncies en un ID d'usuari d'estil PGP 2.x.\n"
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3478,15 +3571,7 @@ msgstr ""
"necess�riament\n"
"correcta a no ser que torneu a executar el programa.\n"
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-msgid "[revoked] "
-msgstr "[revocada]"
-
-#: g10/keyedit.c:2274
-msgid "[expired] "
-msgstr "[caducada]"
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@ -3496,7 +3581,7 @@ msgstr ""
"assumida.\n"
# Photo ID com abans. ivb
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3505,49 +3590,49 @@ msgstr ""
"AV�S: Aquesta �s una clau d'estil PGP2. Afegir un photo ID pot fer que "
"algunes versions de PGP rebutgen aquesta clau.\n"
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Esteu segur que encara voleu afegir-lo? (s/N) "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "No podeu afegir un photo ID a una clau d'estil PGP2.\n"
# Aquesta i les seg�ents no haurien de portar (s/N/q) i no (y/N/q)? ivb
# Hmm. S�... (s/N/x) jm
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Voleu esborrar aquesta signatura inv�lida? (s/N/x)"
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
# Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "S'ha esborrat %d signatura.\n"
# Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "S'han esborrat %d signatures.\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "No s'hi ha eliminat res.\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3557,92 +3642,102 @@ msgstr ""
"pot\n"
"fer que algunes versions de PGP rebutjen aquesta clau.\n"
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "No podeu afegir un revocador designat a una clau d'estil PGP 2.x.\n"
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
msgid "Enter the user ID of the designated revoker: "
msgstr "Introdu�u l'ID d'usuari del revocador designat: "
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"no es pot nominar a una clau d'estil PGP 2.x com a revocador designat\n"
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "AV�S: Aquesta clau ha estat revocada pel propietari!\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"AV�S: no es pot desfer la nominaci� d'una clau com a revocador "
"designat!\n"
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr ""
"Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "Per favor, elimineu les seleccions de les claus secretes.\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "Per favor, seleccioneu com a molt una clau secund�ria.\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "S'est� canviant la data de caducitat per a una clau secund�ria.\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "S'est� canviant la data de caducitat per a una clau prim�ria.\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "No podeu canviar la data de caducitat de les claus v3\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
msgid "Please select exactly one user ID.\n"
msgstr "Heu de seleccionar exactament un ID.\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
-#, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "es descarta l'autosignatura v3 en l'id d'usuari �%s�\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+#, fuzzy
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
+
+#: g10/keyedit.c:3480
+#, fuzzy
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "No hi ha cap ID amb l'�ndex %d\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "No hi ha cap clau secund�ria amb l'�ndex %d\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "ID d'usuari: �"
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3651,7 +3746,7 @@ msgstr ""
"�\n"
"signat amb la vostra clau %08lX el %s\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3660,148 +3755,132 @@ msgstr ""
"�\n"
"signat localment amb la vostra clau %08lX el %s\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Aquesta signatura va caducar el %s.\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Esteu segur de que encara voleu revocarla? (s/N) "
# (s/N) ivb
# S! jm
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr ""
"Voleu crear un certificat de revocaci� per a aquesta signatura? (s/N) "
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "Heu signat els seg�ents ID d'usuari:\n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid " signed by %s on %s%s%s\n"
msgstr " signat per %08lX el %s%s%s\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid " revoked by %s on %s\n"
msgstr " revocat per %08lX el %s\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "Esteu a punt de revocar aquestes signatures:\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, fuzzy, c-format
msgid " signed by %s on %s%s\n"
msgstr " signat per %08lX el %s%s\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr " (no-exportable)"
# (s/N)? ivb
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
msgid "Really create the revocation certificates? (y/N) "
msgstr "Realment voleu crear els certificats de revocaci�? (s/N) "
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "ho hi ha clau secreta\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "l'ID d'usuari �%s� ja est� revocat\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"AV�S: una signatura d'ID d'usuari est� datada %d segons en el futur\n"
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"S'est� mostrant el photo ID %s de mida %ld per a la clau 0x%08lX (uid %d)\n"
-#: g10/keylist.c:179
+#: g10/keylist.c:180
msgid "Critical signature policy: "
msgstr "Pol�tica de signatura cr�tica: "
-#: g10/keylist.c:181
+#: g10/keylist.c:182
msgid "Signature policy: "
msgstr "Pol�tica de signatura: "
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "AV�S: s'hi han trobat dades de notaci� inv�lides\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
msgid "Critical signature notation: "
msgstr "Notaci� de signatura cr�tica: "
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr "Notaci� de signatura: "
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr "no llegible per humans"
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr "Anell"
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr " [caduca: %s]"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr " [caduca: %s]"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, fuzzy, c-format
-msgid " [revoked: %s]"
-msgstr "[revocada]"
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
msgid "Primary key fingerprint:"
msgstr "Empremtes digital de la clau prim�ria:"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
msgid " Subkey fingerprint:"
msgstr " Empremta digital de la subclau:"
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
msgid " Primary key fingerprint:"
msgstr " Empremta digital de la clau prim�ria:"
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
msgid " Subkey fingerprint:"
msgstr " Empremta digital de la subclau:"
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr " Empremta digital ="
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -4018,42 +4097,42 @@ msgid "invalid root packet detected in proc_tree()\n"
msgstr "s'ha detectat un paquet arrel inv�lid en proc_tree()\n"
# bolcats de mem�ria? ivb
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "no s'han pogut desactivar els bolcats de mem�ria: %s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "No haur�eu d'usar algoritmes experimentals!\n"
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"aquest algoritme de xifratge est� desaconsellat; useu-ne un de m�s "
"est�ndard!\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr "el m�dul de xifratge IDEA no est� present\n"
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr ""
"vegeu http://www.gnupg.org/why-not-idea.html per a m�s informaci�\n"
-#: g10/misc.c:491
+#: g10/misc.c:517
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: l'opci� �%s� est� desaconsellada.\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AV�S: %s �s una opci� desaconsellada.\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "si us plau, utilitzeu �%s%s� en el seu lloc\n"
@@ -4061,45 +4140,45 @@ msgstr "si us plau, utilitzeu �%s%s� en el seu lloc\n"
# G�nere? Nombre? Passat, futur? ivb
# Werner FIXME: please add translator comment saying *what* is
# uncompressed so we know the gender. jm
-#: g10/misc.c:508
+#: g10/misc.c:534
msgid "Uncompressed"
msgstr "No comprimit"
# G�nere? Nombre? Passat, futur? ivb
# Werner FIXME: please add translator comment saying *what* is
# uncompressed so we know the gender. jm
-#: g10/misc.c:533
+#: g10/misc.c:559
#, fuzzy
msgid "uncompressed|none"
msgstr "No comprimit"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "aquest missatge pot no ser usable per %s\n"
-#: g10/misc.c:777
+#: g10/misc.c:826
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "s'estan llegint opcions de �%s�\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "el destinatari predeterminat �s desconegut �%s�\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "no es pot treballar amb l'algoritme de clau p�blica %d\n"
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"AV�S: la clau de sessi� pot estar xifrada sim�tricament de forma "
"insegura\n"
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "el subpaquet de tipus %d t� el bit cr�tic activat\n"
@@ -4139,7 +4218,7 @@ msgstr "no s'ha pogut connectar amb �%s�: %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "hi ha un problema de comunicaci� amb el gpg-agent\n"
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr "hi ha un problema amb l'agent: es deshabilitar� el seu �s\n"
@@ -4186,24 +4265,24 @@ msgstr "la contrasenya �s massa llarga\n"
msgid "invalid response from agent\n"
msgstr "la resposta de l'agent �s inv�lida\n"
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "s'ha cancel�lat per l'usuari\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "no es pot demanar la contrasenya en mode desat�s\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "Introdu�u la contrasenya: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4213,22 +4292,22 @@ msgstr ""
"Necessiteu la contrasenya per desblocar la clau secreta de\n"
"l'usuari: \""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (ID de la clau principal %08lX)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "Repetiu la contrasenya: "
@@ -4469,28 +4548,39 @@ msgstr ""
"nom�s podeu fer signatures separades amb claus d'estil PGP 2.x mentre "
"esteu en mode --pgp2\n"
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
-msgstr "no s'ha pogut creat %s: %s\n"
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
+msgstr "no s'ha pogut crear �%s�: %s\n"
-#: g10/sign.c:794
-#, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+#: g10/sign.c:771 g10/sign.c:1008
+#, fuzzy, c-format
+msgid "writing to file `%s'\n"
+msgstr "s'est� escrivint en �%s�\n"
+
+#: g10/sign.c:795
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"for�ar l'algoritme de digest %s (%d) viola les prefer�ncies del "
"destinatari\n"
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr "signatura:"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "no es pot obrir el fitxer: %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
"nom�s podeu signar en clar amb claus d'estil PGP 2.x en el mode --pgp2\n"
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr "s'utilitzar� xifratge %s\n"
@@ -4913,7 +5003,7 @@ msgstr ""
"no s'ha pogut evitar una clau feble per a xifratge sim�tric;\n"
"hi ha hagut %d intents!\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA requereix l'�s d'un algoritme de dispersi� de 160 bits\n"
@@ -5308,17 +5398,17 @@ msgstr "No hi ha ajuda disponible"
msgid "No help available for `%s'"
msgstr "No hi ha ajuda disponible per a `%s'"
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "error en crear l'anell �%s�: %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr "s'ha creat l'anell �%s?\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "no s'ha pogut reconstruir la mem�ria cau de l'anell: %s\n"
@@ -5363,8 +5453,7 @@ msgstr "s'han comprovat %lu claus (%lu signatures)\n"
msgid "%s: keyring created\n"
msgstr "%s: s'ha creat l'anell\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5380,29 +5469,34 @@ msgstr ""
"molt gran!\n"
"Es recomana una imatge amb una mida aproximada de 240x288.\n"
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr "Introdu�u el nom del fitxer JPEG per al photo ID: "
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "No s'ha pogut obrir la foto �%s�: %s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
msgid "Are you sure you want to use it (y/N)? "
msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr "�%s� no �s un fitxer JPEG\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Is this photo correct (y/N/q)? "
msgstr "�s aquesta foto correcta (s/N/x)? "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
msgid "unable to display photo ID!\n"
msgstr "no s'ha pogut mostrar el photo ID!\n"
@@ -5424,45 +5518,51 @@ msgstr ""
"d'opcions permissos insegurs\n"
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
+#, fuzzy
+msgid "this platform requires temporary files when calling external programs\n"
msgstr ""
"aquesta plataforma necessita fitxers temporals quan es crida a programes "
"externs\n"
-#: g10/exec.c:432
-#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
msgstr "no s'ha pogut executar %s �%s�: %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:436
+#, fuzzy, c-format
+msgid "unable to execute shell `%s': %s\n"
+msgstr "no s'ha pogut executar %s �%s�: %s\n"
+
+#: g10/exec.c:515
#, c-format
msgid "system error while calling external program: %s\n"
msgstr "s'ha produ�t un error del sistema en cridar el programa extern: %s\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr "s'ha produ�t una eixida no natural del programa extern\n"
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr "no s'ha pogut executar el programa extern\n"
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr "no s'ha pogut llegir la resposta del programa extern: %s\n"
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr "AV�S: no s'ha pogut eliminar el fitxer temporal (%s) �%s�: %s\n"
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "AV�S: no s'ha pogut eliminar el directori temporal �%s�: %s\n"
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr "mai "
@@ -5620,6 +5720,47 @@ msgstr "error en trobar el registre de confian�a: %s\n"
msgid "read error: %s\n"
msgstr "error de lectura: %s\n"
+#, fuzzy
+#~ msgid "revoked: %s"
+#~ msgstr "[revocada]"
+
+#, fuzzy
+#~ msgid "expired: %s"
+#~ msgstr " [caduca: %s]"
+
+#, fuzzy
+#~ msgid "expires: %s"
+#~ msgstr " [caduca: %s]"
+
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "rev! la subclau ha estat revocada: %s\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "rev- s'ha trobat una revocaci� falsa\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "rev? hi ha problemes en la comprovaci� de la revocaci�: %s\n"
+
+#~ msgid "[revoked] "
+#~ msgstr "[revocada]"
+
+#~ msgid "[expired] "
+#~ msgstr "[caducada]"
+
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr " [caduca: %s]"
+
+#~ msgid " [expires: %s]"
+#~ msgstr " [caduca: %s]"
+
+#, fuzzy
+#~ msgid " [revoked: %s]"
+#~ msgstr "[revocada]"
+
+#~ msgid "can't create %s: %s\n"
+#~ msgstr "no s'ha pogut creat %s: %s\n"
+
#~ msgid ""
#~ "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n"
#~ msgstr ""
diff --git a/po/cs.po b/po/cs.po
index ff114b620..a3b7ad42a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.2.3\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
"PO-Revision-Date: 2003-12-07 16:20+0200\n"
"Last-Translator: Roman Pavlik <[email protected]>\n"
"Language-Team: Czech <[email protected]>\n"
@@ -45,7 +45,7 @@ msgstr "ne"
msgid "nN"
msgstr "nN"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "ukon�it"
@@ -278,6 +278,16 @@ msgstr "nepou�iteln� tajn� kl��"
msgid "keyserver error"
msgstr "chyba serveru kl���"
+#: util/errors.c:108
+#, fuzzy
+msgid "canceled"
+msgstr "Zru�it"
+
+#: util/errors.c:109
+#, fuzzy
+msgid "no card"
+msgstr "neza�ifrov�no"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr ""
@@ -300,7 +310,7 @@ msgstr "nalezena chyba v programu ... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "nebyl detekov�n ��dn� modul pro z�sk�n� entropie\n"
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "nemohu otev��t `%s': %s\n"
@@ -332,7 +342,7 @@ msgstr "nemohu ��st `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "pozn�mka: soubor random_seed nen� aktualizov�n\n"
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr "nemohu vytvo�it `%s': %s\n"
@@ -400,7 +410,7 @@ msgstr "nemohu vygenerovat prvo��slo s m�n� ne� %d bity\n"
msgid "can't generate a prime with less than %d bits\n"
msgstr "nemohu vygenerovat prvo��slo s m�n� ne� %d bity\n"
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -408,128 +418,128 @@ msgstr ""
"@P��kazy:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[soubor]|vytvo�it podpis"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "vytvo�it podpis odd�len� od dokumentu"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "�ifrovat data"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "�ifrov�n� pouze se symetrickou �ifrou"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "de�ifrovat data (implicitn�)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "verifikovat podpis"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "vypsat seznam kl���"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "vypsat seznam kl��� a podpis�"
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "zkontrolovat podpisy kl���"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "vypsat seznam kl��� a fingerprint�"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "vypsat seznam tajn�ch kl���"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "vytvo�it nov� p�r kl���"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "odstranit kl�� ze souboru ve�ejn�ch kl���"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "odstranit kl�� ze souboru tajn�ch kl���"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "podepsat kl��"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "podepsat kl�� lok�ln�"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "podepsat nebo modifikovat kl��"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "vytvo�it revoka�n� certifik�t"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "exportovat kl��e"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "exportovat kl��e na server kl���"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "importovat kl��e ze serveru kl���"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "vyhledat kl��e na serveru kl���"
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "aktualizovat v�echny kl��e ze serveru kl���"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "importovat/slou�it kl��e"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "aktualizovat datab�zi d�v�ry"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|algo [soubory] vypi� hash"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -539,59 +549,55 @@ msgstr ""
"Mo�nosti:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|JM�NO|�ifrovat pro JM�NO"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr ""
"pou��t tento id u�ivatele pro podeps�n�\n"
" nebo de�ifrov�n�"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr ""
"|N|nastavit �rov�� komprimace N (0 - ��dn�\n"
" komprimace)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "pou��t kanonick� textov� m�d"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "pou��t jako v�stupn� soubor"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "s dodate�n�mi informacemi"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "neprov�d�t ��dn� zm�ny"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "vy��dat potvrzen� p�ed p�eps�n�m"
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -599,7 +605,7 @@ msgstr ""
"@\n"
"(Pou�ijte manu�lov� str�nky pro kompletn� seznam v�ech p��kaz� a mo�nost�)\n"
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -617,17 +623,17 @@ msgstr ""
" --list-keys [jm�na] vypsat kl��e\n"
" --fingerprint [jm�na] vypsat fingerprinty \n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Chyby oznamte, pros�m, na adresu <[email protected]>.\n"
"P�ipom�nky k p�ekladu <[email protected]>.\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -637,7 +643,7 @@ msgstr ""
"podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
"implicitn� operace z�vis� na vstupn�ch datech\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -645,479 +651,473 @@ msgstr ""
"\n"
"Podporovan� algoritmy:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr "Ve�ejn� kl��: "
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr "�ifra: "
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr "Hash: "
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
msgid "Compression: "
msgstr "Komprese: "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "u�it�: gpg [mo�nosti]"
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "konfliktn� p��kazy\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "no = podpis nalezen v definici skupiny \"%s\"\n"
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "VAROV�N�: vlastnictv� pro %s nastaveno nebezpe�n� \"%s\"\n"
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "VAROV�N�: vlastnictv� pro %s nastaveno nebezpe�n� \"%s\"\n"
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "VAROV�N�: vlastnictv� pro %s nastaveno nebezpe�n� \"%s\"\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "VAROV�N�: p��stupov� pr�va pro %s nejsou nastavena bezpe�n� \"%s\"\n"
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "VAROV�N�: p��stupov� pr�va pro %s nejsou nastavena bezpe�n� \"%s\"\n"
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "VAROV�N�: p��stupov� pr�va pro %s nejsou nastavena bezpe�n� \"%s\"\n"
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "VAROV�N�: vlastnictv� adres��e %s nastaveno nebezpe�n� \"%s\"\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "VAROV�N�: vlastnictv� adres��e %s nastaveno nebezpe�n� \"%s\"\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "VAROV�N�: vlastnictv� adres��e %s nastaveno nebezpe�n� \"%s\"\n"
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"VAROV�N�: p��stupov� pr�va adres��e %s nejsou nastavena bezpe�n� \"%s\"\n"
-#: g10/g10.c:1205
+#: g10/g10.c:1210
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr ""
"VAROV�N�: p��stupov� pr�va adres��e %s nejsou nastavena bezpe�n� \"%s\"\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
"VAROV�N�: p��stupov� pr�va adres��e %s nejsou nastavena bezpe�n� \"%s\"\n"
# c-format
-#: g10/g10.c:1334
-#, c-format
-msgid "unknown configuration item \"%s\"\n"
+#: g10/g10.c:1354
+#, fuzzy, c-format
+msgid "unknown configuration item `%s'\n"
msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "POZN�MKA: star� implicitn� soubor s mo�nostmi `%s ignorov�n'\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "POZN�MKA: neexistuje implicitn� soubor s mo�nostmi `%s'\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "soubor s mo�nostmi `%s': %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "�tu mo�nosti z `%s'\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "POZN�MKA: %s nen� pro norm�ln� pou�it�!\n"
-#: g10/g10.c:1887
-#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+#: g10/g10.c:2021
+#, fuzzy, c-format
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr ""
"�ifra \"%s\" nebyla nahr�na, proto�e p��stupov� pr�va nejsou nastavena "
"bezpe�n�\n"
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "%s nen� platn� znakov� sada\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "nelze pou��t URI serveru kl��� - chyba anal�zy URI\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: neplatn� parametr pro export\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "neplatn� parametr pro export\n"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: neplatn� parametr pro import\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
msgid "invalid import options\n"
msgstr "neplatn� parametr pro import\n"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: neplatn� parametr pro export\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
msgid "invalid export options\n"
msgstr "neplatn� parametr pro export\n"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: neplatn� parametr pro import\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "neplatn� parametr pro import\n"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: neplatn� parametr pro export\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "neplatn� parametr pro export\n"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nelze nastavit exec-path na %s\n"
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROV�N�: %s p�ep��e %s\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Nen� dovoleno pou��vat %s s %s!\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ned�v� s %s smysl!\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"v m�du --pgp2 m��ete vytv��et pouze odd�len� podpisy nebo podpisy �iteln� "
"jako text\n"
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "v m�du --pgp2 nelze sou�asn� �ifrovat a podepisovat\n"
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "v m�du --pgp2 mus�te pou��t soubor (ne rouru).\n"
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "�ifrov�n� zpr�v v m�du --pgp2 vy�aduje algoritmus IDEA\n"
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "vybran� hashovac� algoritmus je neplatn�\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
msgid "selected certification digest algorithm is invalid\n"
msgstr "vybran� hashovac� algoritmus je neplatn�\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr "polo�ka completes-needed mus� b�t v�t�� ne� 0\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr "polo�ka marginals-needed mus� b�t v�t�� ne� 1\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "polo�ka max-cert-depth mus� b�t v rozmez� od 1 do 255\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr ""
"neplatn� implicitn� �rove� certifikace (default-cert-level); mus� b�t 0, 1, "
"2 nebo 3\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr ""
"neplatn� minim�ln� �rove� certifikace (min-cert-level); mus� b�t 0, 1, 2 "
"nebo 3\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razn� nedoporu�ov�n\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "neplatn� m�d S2K; mus� b�t 0, 1 nebo 3\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
msgid "invalid default preferences\n"
msgstr "neplatn� defaultn� p�edvolby\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
msgid "invalid personal cipher preferences\n"
msgstr "neplatn� u�ivatelsk� p�edvolby pro �ifrov�n�\n"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
msgid "invalid personal digest preferences\n"
msgstr "neplatn� u�ivatelsk� p�edvolby pro hashov�n�\n"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
msgid "invalid personal compress preferences\n"
msgstr "neplatn� u�ivatelsk� p�edvolby pro komprimaci\n"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s dosud nen� funk�n� s %s\n"
-#: g10/g10.c:2680
-#, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2797
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "pou�it� �ifrovac�ho algoritmu \"%s\" v m�du %s dovoleno\n"
-#: g10/g10.c:2685
-#, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2802
+#, fuzzy, c-format
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "pou�it� hashovac�ho algoritmu \"%s\" v m�du %s dovoleno\n"
-#: g10/g10.c:2690
-#, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2807
+#, fuzzy, c-format
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "pou�it� komprima�n�ho algoritmu \"%s\" v m�du %s dovoleno\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"VAROV�N�: specifikov�n adres�t (-r) bez pou�it� �ifrov�n� s ve�ejn�m kl��em\n"
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [jm�no souboru]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [jm�no souboru]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [jm�no souboru]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [jm�no souboru]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "pou�it� %s nen� v m�du %s dovoleno\n"
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [jm�no souboru]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [jm�no souboru]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [jm�no souboru]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "pou�it� %s nen� v m�du %s dovoleno\n"
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [jm�no souboru]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [jm�no souboru]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [jm�no souboru]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key id u�ivatele"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key id u�ivatele"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrsign-key id u�ivatele"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key id u�ivatele"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id u�ivatele [p��kazy]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "nelze otev��t %s: %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id u�ivatele] [soubor s kl��i (keyring)]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, c-format
msgid "key export failed: %s\n"
msgstr "export kl��e se nepoda�il: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "hled�n� na keyserveru se nezda�ilo: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "refresh dat na keyserveru se nezda�il: %s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "neplatn� hashovac� algoritmus `%s'\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[jm�no souboru]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "Za�n�te ps�t svou zpr�vu ...\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "nelze otev��t `%s'\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@ -1125,48 +1125,48 @@ msgstr ""
"symbolick� jm�no sm� obsahovat pouze p�smena, ��slice, te�ky nebo podtr��tka "
"a mus� kon�it znakem '='\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
msgid "a user notation name must contain the '@' character\n"
msgstr "jm�no u�ivatele mus� obsahovat znakt '@' \n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "hodnota nem��e obsahovat ��dn� kontroln� znaky\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr "zadan� URL pro certifika�n� politiku je neplatn�\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
-#: g10/g10.c:3747
+#: g10/g10.c:3863
#, fuzzy
-msgid "the given signature preferred keyserver URL is invalid\n"
+msgid "the given preferred keyserver URL is invalid\n"
msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "b�t o trochu v�c tich�"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
msgid "take the keys from this keyring"
msgstr "ber kl��e z t�to kl��enky (keyringu)"
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
msgid "make timestamp conflicts only a warning"
msgstr "pouze varov�n� p�i konfliktu �asov�ho raz�tka"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr "|FD|zapsat informace o stavu do tohoto FD"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1200,12 +1200,13 @@ msgid "invalid dash escaped line: "
msgstr "nespr�vn� ozna�en� ��dku m�nusy: "
#: g10/armor.c:565
-msgid "unexpected armor:"
+#, fuzzy
+msgid "unexpected armor: "
msgstr "neo�ek�van� k�dov�n� ASCII:"
-#: g10/armor.c:695 g10/armor.c:1276
-#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+#: g10/armor.c:695 g10/armor.c:1280
+#, fuzzy, c-format
+msgid "invalid radix64 character %02X skipped\n"
msgstr "neplatn� znak form�tu radix64 %02x byl p�esko�en\n"
#: g10/armor.c:738
@@ -1216,33 +1217,34 @@ msgstr "p�ed�asn� konec souboru (��dn� CRC)\n"
msgid "premature eof (in CRC)\n"
msgstr "p�ed�asn� konec souboru (��dn� CRC)\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "�patn� form�t CRC\n"
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "Chyba CRC; %06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+#, fuzzy
+msgid "premature eof (in trailer)\n"
msgstr "p�ed�asn� konec souboru (v pati�ce)\n"
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "chyba v pati�ce\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "nenalezena ��dn� platn� data ve form�tu OpenPGP.\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "neplatn� k�dov�n� ASCII: ��dek je del�� ne� %d znak�\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1298,7 +1300,7 @@ msgstr " alias \""
msgid " aka \""
msgstr " alias \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1549,96 +1551,116 @@ msgstr "%s: p�esko�eno: ve�ejn� kl�� je neplatn� (disabled)\n"
msgid "no valid addressees\n"
msgstr "��dn� platn� adresy\n"
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "duplicita p�edvolby %c%lu\n"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "p��li� mnoho `%c' p�edvoleb\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
#, fuzzy
msgid "too many digest preferences\n"
msgstr "p��li� mnoho `%c' p�edvoleb\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
#, fuzzy
msgid "too many compression preferences\n"
msgstr "p��li� mnoho `%c' p�edvoleb\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "neplatn� znak v �et�zci s p�edvolbami\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
msgid "writing direct signature\n"
msgstr "zapisuji podpis kl��e j�m sam�m (direct signature)\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "zapisuji podpis kl��e sebou sam�m\n"
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "zapisuji \"key-binding\" podpis\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "neplatn� d�lka kl��e; pou�iji %u bit�\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "d�lka kl��e zaokrouhlena na %u bit�\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "Pros�m, vyberte druh kl��e, kter� chcete:\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA a ElGamal (implicitn�)\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (pouze pro podpis)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (pouze pro �ifrov�n�)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (pouze pro podpis)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (pouze pro �ifrov�n�)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (pro �ifrov�n� a podpis)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, fuzzy, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) RSA (pouze pro podpis)\n"
+
+#: g10/keygen.c:1224
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) RSA (pro �ifrov�n� a podpis)\n"
+
+#: g10/keygen.c:1226
+#, fuzzy, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) RSA (pouze pro �ifrov�n�)\n"
+
+#: g10/keygen.c:1228
+#, fuzzy, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) RSA (pro �ifrov�n� a podpis)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "V� v�b�r? "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "Neplatn� v�b�r.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1651,31 +1673,31 @@ msgstr ""
" implicitn� velikost kl��e je 1024 bit�\n"
" nejvy��� navrhovan� velikost kl��e je 2048 bit�\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "Jakou velikost kl��e si p�ejete? (1024) "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "Kl�� DSA mus� m�t velikost od 512 do 1024 bit�.\n"
-#: g10/keygen.c:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr ""
"velikost kl��e je p��li� mal�; minim�ln� dovolen� velikost pro RSA je 1024 "
"bit�.\n"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr ""
"velikost kl��e je p��li� mal�; minim�ln� dovolen� velikost je 768 bit�.\n"
-#: g10/keygen.c:1255
+#: g10/keygen.c:1328
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "velikost kl��e je p��li� velk�; maxim�ln� dovolen� hodnota je %d.\n"
-#: g10/keygen.c:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1683,11 +1705,11 @@ msgstr ""
"Velikosti kl��e v�t�� jak 2048 bit� se nedoporu�uj�, proto�e\n"
"v�po�ty pak trvaj� VELMI dlouho!\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "Opravdu chcete vytvo�it kl�� t�to d�lky? "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1695,17 +1717,17 @@ msgstr ""
"Dob�e, ale nezapome�te, �e informace mohou b�t vyzrazeny z po��ta�e tak� "
"elektromagnetick�m vyza�ov�n�m monitoru nebo kl�vesnice!\n"
-#: g10/keygen.c:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Po�adovan� d�lka kl��e je %u bit�.\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "zaokrouhleno na %u bit�\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1721,7 +1743,7 @@ msgstr ""
" <n>m = doba platnosti kl��e skon�� za n m�s�c�\n"
" <n>y = doba platnosti kl��e skon�� za n let\n"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1737,29 +1759,29 @@ msgstr ""
" <n>m = doba platnosti podpisu skon�� za n m�s�c�\n"
" <n>y = doba platnosti podpisu skon�� za n let\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "Kl�� je platn� pro? (0) "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr "Podpis je platn� pro? (0) "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "neplatn� hodnota\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr "platnost %s neskon��\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr "platnost %s skon�� %s\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1767,16 +1789,17 @@ msgstr ""
"V� syst�m neum� zobrazit data po roce 2038.\n"
"V ka�d�m p��pad� budou data korektn� zpracov�v�na do roku 2106.\n"
-#: g10/keygen.c:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "Je to spr�vn� (a/n)? "
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
+#, fuzzy
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
@@ -1787,44 +1810,44 @@ msgstr ""
" \"Magda Prochazkova (student) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "Jm�no a p��jmen�: "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "Neplatn� znak ve jm�n�\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr "Jm�no nem��e za��nat ��slic�\n"
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr "Jm�no mus� b�t dlouh� alespo� 5 znak�\n"
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "E-mailov� adresa: "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "Neplatn� e-mailov� adresa\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "Koment��: "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "Neplatn� znak v koment��i\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Pou��v�te znakovou sadu `%s'.\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1835,29 +1858,29 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Do pole jm�no nebo koment�� nepi�te, pros�m, e-mailovou adresu.\n"
-#: g10/keygen.c:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "jJkKeEPpUu"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Zm�nit (J)m�no, (K)oment��, (E)-mail nebo (U)kon�it? "
-#: g10/keygen.c:1542
+#: g10/keygen.c:1615
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"Zm�nit (J)m�no, (K)oment��, (E)-mail, (P)okra�ovat d�l nebo (U)kon�it "
"program? "
-#: g10/keygen.c:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr "Nejd��v, pros�m, opravte chybu\n"
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1865,16 +1888,16 @@ msgstr ""
"Pro ochranu Va�eho tajn�ho kl��e mus�te zadat heslo.\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr "heslo nen� zopakov�no spr�vn�; zkuste to znovu"
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1886,7 +1909,7 @@ msgstr ""
"tohoto programu s parametrem \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1899,58 +1922,58 @@ msgstr ""
"pou��vat disky); d�ky tomu m� gener�tor lep�� �anci z�skat dostatek "
"entropie.\n"
-#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr "nelze prov�st v d�vkov�m m�du\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "P�r kl��� DSA bude dlouh� 1024 bit�.\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "Vytv��en� kl��e bylo zru�eno.\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr "zapisuji ve�ejn� kl�� do `%s'\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "zapisuji tajn� kl�� do `%s'\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "zapisuji tajn� kl�� do `%s'\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nenalezen zapisovateln� soubor ve�ejn�ch kl��� (pubring): %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "nenalezen zapisovateln� soubor tajn�ch kl��� (secring): %s\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "chyba p�i z�pisu do souboru ve�ejn�ch kl��� `%s': %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "chyba p�i z�pisu do souboru tajn�ch kl��� `%s': %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "ve�ejn� a tajn� kl�� byly vytvo�eny a podeps�ny.\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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"
@@ -1958,12 +1981,12 @@ msgstr ""
"Tento kl�� nem��e b�t pou�it� pro �ifrov�n�. K vytvo�en�\n"
"sekund�rn�ho kl��e pro tento ��el m��ete pou��t p��kaz \"--edit-key\".\n"
-#: g10/keygen.c:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1971,7 +1994,7 @@ msgstr ""
"kl�� byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
"je probl�m se syst�mov�m �asem)\n"
-#: g10/keygen.c:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1979,14 +2002,43 @@ msgstr ""
"kl�� byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
"je probl�m se syst�mov�m �asem)\n"
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "POZN�MKA: vytvo�en� podkl��e pro kl��e v3 nen� v souladu s OpenPGP\n"
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "Opravdu vytvo�it? "
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "smaz�n� bloku kl��e se nezda�ilo: %s\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "nemohu vytvo�it `%s': %s\n"
+
+#: g10/keygen.c:3248
+#, fuzzy, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "POZN�MKA: platnost tajn�ho kl��e %08lX skon�ila %s\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "--output pro tento p��kaz nen� platn�\n"
@@ -1997,7 +2049,7 @@ msgstr "--output pro tento p��kaz nen� platn�\n"
msgid "%s: can't open: %s\n"
msgstr "%s: nemohu otev��t: %s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "chyba p�i vytv��en� hesla: %s\n"
@@ -2026,6 +2078,11 @@ msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
msgstr ""
"v m�du --pgp2 m��ete �ifrovat pouze RSA kl��em o d�lce 2048 bit� a m�n�\n"
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "nelze otev��t %s: %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -2036,23 +2093,31 @@ msgid ""
"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
msgstr "algoritmus IDEA nelze pou��t pro v�echny kl��e, pro kter� �ifrujete.\n"
-#: g10/encode.c:526 g10/encode.c:721
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#: g10/encode.c:526
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "vy��dan� symetrick� �ifra %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
-#: g10/encode.c:634 g10/sign.c:863
-#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+#: g10/encode.c:634 g10/sign.c:864
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
msgstr ""
"vy��dan� komprima�n� algoritmus %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "vy��dan� symetrick� �ifra %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
+
#: g10/encode.c:818
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s za�ifrovan� pro: %s\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "kl�� `%s' nenalezen: %s\n"
@@ -2085,8 +2150,9 @@ msgstr "VAROV�N�: nebylo nic vyexportov�no\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "p��li� mnoho polo�ek v bufferu ve�ejn�ch kl��� - vypnuto\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+#, fuzzy
+msgid "[User ID not found]"
msgstr "[User ID not found]"
# c-format
@@ -2242,7 +2308,7 @@ msgstr "kl�� %08lX: HKP po�kozen� podkl��e opraveno\n"
# c-format
#: g10/import.c:722
#, fuzzy, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "kl�� %08lX: p�ijat id u�ivatele '%s',kter� nen� podeps�n j�m sam�m\n"
#: g10/import.c:728
@@ -2269,7 +2335,7 @@ msgstr "kl�� %08lX: nov� kl�� - p�esko�en\n"
msgid "no writable keyring found: %s\n"
msgstr "nenalezen zapisovateln� soubor kl��� (keyring): %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "zapisuji do '%s'\n"
@@ -2382,14 +2448,14 @@ msgstr "kl�� %08lX: neexistuje id u�ivatele pro podpis\n"
#: g10/import.c:1299
#, fuzzy, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"kl�� %08lX: nepodporovan� algoritmus ve�ejn�ho kl��e u u�ivatelsk�ho id \"%s"
"\"\n"
#: g10/import.c:1301
#, fuzzy, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr ""
"kl�� %08lX: neplatn� podpis kl��e j�m sam�m u u�ivatelsk�ho id \"%s\"\n"
@@ -2430,7 +2496,7 @@ msgstr "kl�� %08lX: smaz�na v�cen�sobn� revokace podkl��e\n"
#: g10/import.c:1439
#, fuzzy, c-format
-msgid "key %s: skipped user ID '%s'\n"
+msgid "key %s: skipped user ID \"%s\"\n"
msgstr "kl�� %08lX: identifik�tor u�ivatele p�esko�en '"
#: g10/import.c:1460
@@ -2440,7 +2506,7 @@ msgstr "kl�� %08lX: podkl�� p�esko�en\n"
#: g10/import.c:1487
#, fuzzy, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "kl�� %08lX: podpis nen� exportovateln� (t��da %02x) - p�esko�eno\n"
#: g10/import.c:1497
@@ -2474,113 +2540,113 @@ msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"VAROV�N�: kl�� %08lX m��e b�t revokov�n: zkou��m z�skat revoka�n�kl�� %08lX\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"VAROV�N�: kl�� %08lX m��e b�t revokov�n: revoka�n� kl�� %08lX nenalezen.\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "kl�� %08lX: \"%s\" p�id�n revoka�n� certifik�t\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "kl�� %08lX: podpis kl��e j�m sam�m (direct key signature)\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[revokace]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[podpis kl��e j�m sam�m]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "1 �patn� podpis\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d �patn�ch podpis�\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "1 podpis neov��en, proto�e chyb� kl��\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d podpis� neov��en�ch, proto�e chyb� kl��\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "1 podpis neov��en, proto�e vznikla chyba\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d podpis� neov��en�ch, proto�e vznikly chyby\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "objeven 1 identifik�tor u�ivatele bez platn�ho podpisu j�m sam�m\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "objeveno %d identifik�tor� u�ivatele bez platn�ho podpisu j�m sam�m\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, fuzzy, c-format
msgid " (%d) I trust marginally\n"
msgstr " %d = D�v��uji ��ste�n�\n"
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, fuzzy, c-format
msgid " (%d) I trust fully\n"
msgstr " %d = D�v��uji �pln�\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "U�ivatelsk� ID \"%s\" je revokov�no."
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Jste si jist�(�), �e st�le chcete podepsat tento kl��? (a/N) "
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr " Nelze podepsat.\n"
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Vypr�ela platnost u�ivatelsk�ho ID \"%s\"."
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "ID u�ivatele \"%s\" nen� podeps�no j�m sam�m."
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2589,11 +2655,11 @@ msgstr ""
"Podpis kl��e \"%s\" j�m sam�m je\n"
"podpis form�tu PGP 2.x.\n"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "P�ejete si jej zm�nit na form�t OpenPGP? (a/N) "
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2603,13 +2669,13 @@ msgstr ""
"vypr�ela.\n"
"\n"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Chcete vytvo�it nov� podpis a nahradit j�m ten, jeho� platnost vypr�ela? (a/"
"N) "
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2619,54 +2685,54 @@ msgstr ""
"je pouze lok�ln�.\n"
"\n"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "P�ejete si jej zm�nit na pln� exportovateln� podpise? (a/N) "
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" je ji� lok�ln� podeps�n kl��em %08lX\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" je ji� podeps�n kl��em %08lX\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Chcete kl�� p�esto znova podepsat? (a/N) "
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nic k podeps�n� kl��em %08lX\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "Platnost kl��e vypr�ela!"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Platnost kl��e vypr�� %s.\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Chcete, aby platnost Va�eho podpisu vypr�ela ve stejnou dobu? (A/n) "
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
msgstr ""
"Nem��ete ud�lat OpenPGP podpis kl��e typu PGP 2.x, kdy� jste v --pgp2 m�du.\n"
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "To by zp�sobilo nepou�itelnost kl��e v PGP 2.x.\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2676,31 +2742,31 @@ msgstr ""
"pat�� v��e uveden� osob�.\n"
"Pokud nezn�te odpov��, zadejte \"0\".\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Neodpov�m.%s\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Nijak jsem to nekontroloval(a).%s\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) ��ste�n� jsem to ov��il(a).%s\n"
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Velmi pe�liv� jsem to ov��il(a).%s\n"
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr "Va� v�b�r? (pro detailn�j�� informace stiskn�t� '?'):"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2708,7 +2774,7 @@ msgstr ""
"Jste si jist�(�), �e chcete podepsat tento kl��\n"
"sv�m kl��em: \""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2716,7 +2782,7 @@ msgstr ""
"\n"
"Jedn� se o podpis kl��e j�m sam�m\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2724,7 +2790,7 @@ msgstr ""
"\n"
"VAROV�N�: podpis nebude ozna�en jako neexportovateln�.\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2732,7 +2798,7 @@ msgstr ""
"\n"
"VAROV�N�: podpis nebude ozna�en jako neodvolateln� (non-revocable).\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2740,7 +2806,7 @@ msgstr ""
"\n"
"Podpis bude ozna�en jako neexportovateln�.\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2748,7 +2814,7 @@ msgstr ""
"\n"
"Podpis bude ozna�en jako neodvolateln� (non-revocable).\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2756,7 +2822,7 @@ msgstr ""
"\n"
"Nijak jsem tento kl�� neov��il.\n"
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2764,7 +2830,7 @@ msgstr ""
"\n"
"��ste�n� jsem ov��il tento kl��.\n"
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2772,34 +2838,34 @@ msgstr ""
"\n"
"Velmi pe�liv� jsem ov��il tento kl��.\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "Skute�n� podepsat? "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "podeps�n� selhalo: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "Tento kl�� nen� chr�n�n�.\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr "Tajn� ��sti prim�rn�ho kl��e nejsou dostupn�.\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "Kl�� je chr�n�n�.\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Nen� mo�n� editovat tento kl��: %s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2807,7 +2873,7 @@ msgstr ""
"Vlo�te nov� heslo (passphrase) pro tento tajn� kl��.\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2815,544 +2881,566 @@ msgstr ""
"Nechcete heslo - to *nen�* dobr� n�pad!\n"
"\n"
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "Opravdu to chcete ud�lat? "
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "p�esunuji podpis kl��e na spr�vn� m�sto\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "ukon�it toto menu"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "u"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "ulo�it"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "ulo�it a ukon�it"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "help"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "uk�zat tuto pomoc"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "vypsat fingerprint"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "list"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "vypsat seznam kl��� a id u�ivatel�"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "vyberte identifik�tor u�ivatele N"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "key"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "vyberte sekund�rn� kl�� N"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "check"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "vypsat seznam podpis�"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "c"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "podepsat kl��"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "s"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "tsign"
msgstr "sign"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "make a trust signature"
msgstr "vytvo�it podpis odd�len� od dokumentu"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "podepsat kl�� lok�ln�"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr "podepsat kl�� bez mo�nosti odvolat podpis (non-revocably)"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "sign the key locally and non-revocably"
msgstr "podepsat kl�� lok�ln� a bez mo�nosti odvolat podpis (non-revocably)"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "p�idat identifik�tor u�ivatele"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr "addphoto"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr "p�idat fotografick� ID"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "smazat identifik�tor u�ivatele"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr "delphoto"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "p�idat sekund�rn� kl��"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+#, fuzzy
+msgid "addcardkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "smazat sekund�rn� kl��"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "addrevoker"
msgstr "addrevoker"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "add a revocation key"
msgstr "p�idat revoka�n� kl��"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "smazat podpisy"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "zm�nit dobu platnosti"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr "primary"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr "ozna�it u�ivatelsk� ID jako prim�rn�"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "p�epnout mezi vyps�n�m seznamu tajn�ch a ve�ejn�ch kl���"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "t"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr "vypsat seznam p�edvoleb (pro experty)"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr "vypsat seznam p�edvoleb (podrobn�)"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr "nastavit seznam p�edvoleb"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr "aktualizovat p�edvolby"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "keyserver"
msgstr "chyba serveru kl���"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "set preferred keyserver URL"
msgstr "nelze pou��t URI serveru kl��� - chyba anal�zy URI\n"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "zm�nit heslo"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "zm�nit d�v�ryhodnost vlastn�ka kl��e"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "revokovat podpisy"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revuid"
msgstr "revuid"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revoke a user ID"
msgstr "odvolat platnost id u�ivatele"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "revokovat sekund�rn� kl��"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "nastavit kl�� jako neplatn� (disable)"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "nastavit kl�� jako platn� (enable)"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr "showphoto"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr "uk�zat fotografick� ID"
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "nelze prov�st v d�vkov�m m�du\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "chyba p�i �ten� bloku tajn�ho kl��e `%s': %s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "Tajn� kl�� je dostupn�.\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "P��kaz> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "Pro proveden� t�to operace je pot�eba tajn� kl��.\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr "Pros�m, nejd��ve pou�ijte p��kaz \"toggle\" (p�epnout).\n"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
msgid "Key is revoked."
msgstr "Kl�� revokov�n."
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "Opravdu podepsat v�echny id u�ivatele? "
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "N�pov�da: Vyberte id u�ivatele k podeps�n�\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Tento p��kaz nen� v m�d� %s dovolen�.\n"
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "Mus�te vybrat alespo� jeden id u�ivatele.\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "Nem��ete smazat posledn� id u�ivatele!\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "Opravdu odstranit v�echny vybran� id u�ivatele? "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "Opravdu odstranit tento id u�ivatele? "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+#, fuzzy
+msgid "Really move the primary key? "
+msgstr "Opravdu odstranit tento id u�ivatele? "
+
+#: g10/keyedit.c:1598
+#, fuzzy
+msgid "You must select exactly one key.\n"
+msgstr "Mus�te vybrat alespo� jeden kl��.\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "Mus�te vybrat alespo� jeden kl��.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "Opravdu chcete smazat vybran� kl��e? "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "Opravdu chcete smazat tento kl��? "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
msgid "Really revoke all selected user IDs? "
msgstr "Opravdu odstranit v�echny vybran� id u�ivatele? "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
msgid "Really revoke this user ID? "
msgstr "Opravdu odstranit tento id u�ivatele? "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "Opravdu chcete revokovat vybran� kl��e? "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "Opravdu chcete revokovat tento kl��? "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
#, fuzzy
msgid "Set preference list to:\n"
msgstr "nastavit seznam p�edvoleb"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr "Opravdu aktualizovat p�edvolby pro vybran� id u�ivatele? "
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr "Opravdu aktualizovat p�edvolby? "
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "Ulo�it zm�ny? "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "Ukon�it bez ulo�en�? "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "aktualizace selhala: %s\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "Kl�� nebyl zm�n�n, tak�e nen� pot�eba jej aktualizovat.\n"
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr "Hash: "
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr "Vlastnosti: "
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keyedit.c:2219
#, c-format
msgid "This key may be revoked by %s key "
msgstr "Tento kl�� m��e b�t revokov�n kl��em %s "
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr "(citliv� informace)"
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "%s: nemohu vytvo�it: %s\n"
-#: g10/keyedit.c:2084
-#, fuzzy, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
msgstr "[revokov�n] "
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
-msgstr " [platnost skon��: %s]"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
+msgstr "expire"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2246
#, fuzzy, c-format
-msgid "expires: %s"
-msgstr " [platnost skon��: %s]"
+msgid "usage: %s"
+msgstr "d�v�ra: %c/%c"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, fuzzy, c-format
msgid "trust: %s"
msgstr "d�v�ra: %c/%c"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "Tento kl�� byl ozna�en za neplatn� (disabled)"
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! podkl�� byl revokov�n: %s\n"
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
-msgstr "rev- nalezena pad�lan� revokace\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? probl�m ov��en� revokace: %s\n"
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-#, fuzzy
-msgid "revoked"
-msgstr "[revokov�n] "
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-#, fuzzy
-msgid "expired"
-msgstr "expire"
+#: g10/keyedit.c:2300
+msgid "card-no: "
+msgstr ""
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "U�ivatelsk� ID form�tu PGP 2.x nem� ��dn� p�edvolby\n"
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3360,15 +3448,7 @@ msgstr ""
"Pros�m nezapome�te, �e zobrazovan� �daje o platnosti kl��� nemus�\n"
"b�t nutn� spr�vn�, dokud znova nespust�te program.\n"
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-msgid "[revoked] "
-msgstr "[revokov�n] "
-
-#: g10/keyedit.c:2274
-msgid "[expired] "
-msgstr "[expirov�n] "
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@ -3376,7 +3456,7 @@ msgstr ""
"VAROV�N�: ��dn� u�ivatelsk� ID nebylo ozna�eno jako prim�rn�. Tento p��kaz\n"
" m��e zp�sobit, �e za prim�rn� bude pova�ov�no jin� user ID.\n"
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3385,45 +3465,45 @@ msgstr ""
"VAROV�N�: Toto je PGP2 kl��. P�id�n� fotografick�ho ID m��e v n�kter�ch\n"
" verz�ch PGP v�st k odm�tnut� tohoto kl��e.\n"
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Jste si jist�, �e jej chcete st�le p�idat? (a/N) "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Nem�li by jste p�id�vat fotografick� ID k PGP2 kl��i.\n"
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "Smazat tento dobr� podpis? (a/N/u)"
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Smazat tento neplatn� podpis? (a/N/u)"
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Smazat tento nezn�m� podpis? (a/N/u)"
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "Opravdu smazat tento podpis podepsan� sebou sam�m? (a/N)"
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Smaz�n %d podpis.\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Smaz�no %d podpis�.\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "Nic nebylo smaz�no.\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3432,89 +3512,99 @@ msgstr ""
"VAROV�N�: Toto je PGP2 kl��. P�id�n� 'pov��en� revokace' m��e v n�kter�ch\n"
" verz�ch PGP v�st k odm�tnut� tohoto kl��e.\n"
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Nem�li by jste p�id�vat 'pov��en� revokace' k PGP2 kl��i.\n"
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
msgid "Enter the user ID of the designated revoker: "
msgstr "Vlo�te identifik�tor u�ivatele pov��en�ho revokac�: "
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "kl�� form�tu PGP 2.x nelze pov��it revokac�\n"
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "kl�� nelze pov��it revokac� j�m sam�m\n"
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "VAROV�N�: Tento kl�� byl revokov�n kl��em s pov��en�m k revokaci!\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"VAROV�N�: ustanoven� kl��e 'pov�en�m revok�torem' je nevratn� operace!\n"
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr "Jste si jist�, �e tento kl�� chcete pov��it revokac�? (a/N): "
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "Pros�m, odstra�te v�b�r z tajn�ch kl���.\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "Pros�m, vyberte nejv��e jeden sekund�rn� kl��.\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "M�n�m dobu platnosti sekund�rn�ho kl��e.\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "M�n�m dobu platnosti prim�rn�ho kl��e.\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Nem��ete zm�nit dobu platnosti kl��e verze 3\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
msgid "Please select exactly one user ID.\n"
msgstr "Pros�m, vyberte pr�v� jeden id u�ivatele .\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
-#, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "p�esko�en v3 podpis kl��e j�m sam�m u u�ivatelsk�ho id \"%s\"\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+#, fuzzy
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "Jste si jist�(�), �e jej chcete pou��t (a/N)? "
+
+#: g10/keyedit.c:3480
+#, fuzzy
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "Jste si jist�(�), �e jej chcete pou��t (a/N)? "
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "Neexistuje identifik�tor u�ivatele s indexem %d\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Neexistuje sekund�rn� kl�� s indexem %d\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "id u�ivatele: \""
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3523,7 +3613,7 @@ msgstr ""
"\"\n"
"podeps�no Va��m kl��em %08lX v %s\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3532,143 +3622,127 @@ msgstr ""
"\"\n"
"lok�ln� podeps�no Va��m kl��em %08lX v %s\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Platnost podpisu vypr�� %s.\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Jste si jist�, �e jej chcete st�le revokovat? (a/N) "
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Vytvo�it pro tento podpis revoka�n� certifik�t? (a/N)"
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "Podepsal(a) jste n�sleduj�c� identifik�tory u�ivatele:\n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid " signed by %s on %s%s%s\n"
msgstr " podeps�no %08lX v %s%s%s\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid " revoked by %s on %s\n"
msgstr " revokov�no %08lX v %s\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "Chyst�te se revokovat tyto podpisy:\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, fuzzy, c-format
msgid " signed by %s on %s%s\n"
msgstr " podeps�no %08lX v %s%s\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr " (neexportovateln�)"
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
msgid "Really create the revocation certificates? (y/N) "
msgstr "Opravdu vytvo�it revoka�n� certifik�ty? (a/N) "
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "neexistuje tajn� kl��\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "VAROV�N�: podpis ID u�ivatele je datov�n %d sekund v budoucnosti\n"
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Zobrazuji %s fotografick� ID o velikosti %ld pro kl�� 0x%08lX (uid %d)\n"
-#: g10/keylist.c:179
+#: g10/keylist.c:180
msgid "Critical signature policy: "
msgstr "Kritick� podepisovac� politika: "
-#: g10/keylist.c:181
+#: g10/keylist.c:182
msgid "Signature policy: "
msgstr "Podepisovac� politika: "
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "VAROV�N�: nalezen neplatn� form�t z�pisu data\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
msgid "Critical signature notation: "
msgstr "Kritick� podepisovac� notace: "
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr "Podepisovac� notace: "
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr "nen� v p��mo �iteln�m form�tu"
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr "soubor kl��� (keyring)"
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr " [platnost skon��: %s]"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr " [platnost skon��: %s]"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, fuzzy, c-format
-msgid " [revoked: %s]"
-msgstr "[revokov�n] "
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
msgid "Primary key fingerprint:"
msgstr "Prim�rn� fingerprint kl��e:"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
msgid " Subkey fingerprint:"
msgstr " Fingerprint podkl��e:"
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
msgid " Primary key fingerprint:"
msgstr " Prim�rn� fingerprint kl��e:"
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
msgid " Subkey fingerprint:"
msgstr " Fingerprint podkl��e:"
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr " Fingerprint kl��e ="
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3880,80 +3954,80 @@ msgstr "podpis star�ho typu (PGP 2.x)\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "nalezen neplatn� ko�enov� paket v proc_tree()\n"
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "nemohu vypnout vytv��en� core soubor�: %s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "Experiment�ln� algoritmy by se nem�ly pou��vat!\n"
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"tento �ifrovac� algoritmus se nedoporu�uje; pros�m, pou�ijte n�jak� "
"standardn�j��!\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr "IDEA modul pro GnuPG nenalezen\n"
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr ""
"v�ce informac� naleznete v dokumentu http://www.gnupg.cz/why-not-idea.html\n"
-#: g10/misc.c:491
+#: g10/misc.c:517
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: pou�it� parametru \"%s\" se nedoporu�uje\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "VAROV�N�: pou��v�n� parametru \"%s\" se nedoporu�uje\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "pou�ijte m�sto n�j \"%s%s\" \n"
-#: g10/misc.c:508
+#: g10/misc.c:534
msgid "Uncompressed"
msgstr "Nezakomprimov�no"
-#: g10/misc.c:533
+#: g10/misc.c:559
#, fuzzy
msgid "uncompressed|none"
msgstr "Nezakomprimov�no"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "tato zpr�va nemus� b�t s %s pou�iteln�\n"
-#: g10/misc.c:777
+#: g10/misc.c:826
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "�tu mo�nosti z `%s'\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "nezn�m� implicitn� adres�t `%s'\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "nemohu pracovat s algoritmem ve�ejn�ho kl��e %d\n"
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "VAROV�N�: potencion�ln� nebezpe�n� symetricky za�ifrov�n kl�� sezen�\n"
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
@@ -3992,7 +4066,7 @@ msgstr "nemohu se p�ipojit k `%s': %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "probl�m v komunikaci s gpg-agentem\n"
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr "probl�m s agentem - pou��v�n� agenta vypnuto\n"
@@ -4028,24 +4102,24 @@ msgstr "heslo je p��li� dlouh�\n"
msgid "invalid response from agent\n"
msgstr "neplatn� reakce od agenta\n"
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "zru�eno u�ivatelem\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "probl�m s agentem: agent vrac� 0x%lx\n"
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "v d�vkov�m re�imu se nemohu pt�t na heslo\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "Vlo�te heslo: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4055,22 +4129,22 @@ msgstr ""
"Mus�te zn�t heslo, abyste odemknul(a) tajn� kl�� pro\n"
"u�ivatele: \""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "d�lka %u bit�, typ %s, kl�� %08lX, vytvo�en� %s"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (hlavn� ID kl��e %08lX)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "Opakujte heslo: "
@@ -4296,26 +4370,37 @@ msgstr ""
"v m�du --pgp2 m��ete vytvo�it pouze odd�len� podpis (detach-sign)s kl��i "
"form�tu PGP-2.x\n"
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
-msgstr "%s: nemohu vytvo�it: %s\n"
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
+msgstr "nemohu vytvo�it `%s': %s\n"
-#: g10/sign.c:794
-#, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+#: g10/sign.c:771 g10/sign.c:1008
+#, fuzzy, c-format
+msgid "writing to file `%s'\n"
+msgstr "zapisuji do '%s'\n"
+
+#: g10/sign.c:795
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "vy��dan� hashovac� algoritmus %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr "podepisuji:"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "nelze otev��t soubor: %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
"v m�du --pgp2 m��ete vytv��et jen �iteln� podpisy s kl��i form�tu PGP-2.x\n"
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr "bude pou�ito �ifrov�n� %s\n"
@@ -4713,7 +4798,7 @@ msgstr ""
"nemohu se vyvarovat slab�ho kl��e pro symetrickou �ifru; operaci jsem zkusil "
"%d kr�t!\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA po�aduje pou�it� 160-ti bitov�ho hashovac�ho algoritmu\n"
@@ -5079,17 +5164,17 @@ msgstr "Pomoc nen� k dispozici"
msgid "No help available for `%s'"
msgstr "Pomoc nen� dostupn� pro '%s'"
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "chyba p�i vytv��en� souboru kl��� (keyring)`%s': %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr "soubor kl��� (keyring) `%s' vytvo�en\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "selhalo obnoven� vyrovn�vac� pam�ti kl���: %s\n"
@@ -5132,8 +5217,7 @@ msgstr "%lu kl��� zkontrolov�n (%lu podpis�)\n"
msgid "%s: keyring created\n"
msgstr "%s: soubor kl��� (keyring) vytvo�en\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5147,29 +5231,34 @@ msgstr ""
"kl��i - velk� obr�zek bude m�t za n�sledek velmi velk� ve�ejn� kl�� !\n"
"Vhodn� velikost obr�zku je asi 240x288.\n"
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr "Vlo�te jm�no JPEG souboru s fotografick�m ID: "
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "Nelze otev��t fotografii \"%s\": %s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
msgid "Are you sure you want to use it (y/N)? "
msgstr "Jste si jist�(�), �e jej chcete pou��t (a/N)? "
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr "\"%s\" nen� soubor ve form�tu JPEG\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Is this photo correct (y/N/q)? "
msgstr "Je tato fotografie spr�vn� (a/N/u)? "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
msgid "unable to display photo ID!\n"
msgstr "nelze zobrazit photo ID!\n"
@@ -5190,45 +5279,51 @@ msgstr ""
"nastaveny nebezpe�n�\n"
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
+#, fuzzy
+msgid "this platform requires temporary files when calling external programs\n"
msgstr ""
"na t�to platform� jsou p�i vol�n� extern�ch program� vy�adov�ny\n"
"do�asn� soubory (temp files)\n"
-#: g10/exec.c:432
-#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
msgstr "nelze spustit %s \"%s\": %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:436
+#, fuzzy, c-format
+msgid "unable to execute shell `%s': %s\n"
+msgstr "nelze spustit %s \"%s\": %s\n"
+
+#: g10/exec.c:515
#, c-format
msgid "system error while calling external program: %s\n"
msgstr "syst�mov� chyba p�i vol�n� extern�ho programu: %s\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr "neo�ek�van� konec extern�ho programu\n"
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr "nelze spustit extern� program\n"
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr "nelze p�e��st odpov�� extern�ho programu: %s\n"
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr "VAROV�N�: nelze smazat do�asn� soubor (%s) `%s': %s\n"
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "VAROV�N�: nelze smazat do�asn� adres�� `%s': %s\n"
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr "nikdy "
@@ -5384,6 +5479,47 @@ msgstr "chyba p�i hled�n� z�znamu d�v�ryhodnosti: %s\n"
msgid "read error: %s\n"
msgstr "chyba p�i �ten�: %s\n"
+#, fuzzy
+#~ msgid "revoked: %s"
+#~ msgstr "[revokov�n] "
+
+#, fuzzy
+#~ msgid "expired: %s"
+#~ msgstr " [platnost skon��: %s]"
+
+#, fuzzy
+#~ msgid "expires: %s"
+#~ msgstr " [platnost skon��: %s]"
+
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "rev! podkl�� byl revokov�n: %s\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "rev- nalezena pad�lan� revokace\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "rev? probl�m ov��en� revokace: %s\n"
+
+#~ msgid "[revoked] "
+#~ msgstr "[revokov�n] "
+
+#~ msgid "[expired] "
+#~ msgstr "[expirov�n] "
+
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr " [platnost skon��: %s]"
+
+#~ msgid " [expires: %s]"
+#~ msgstr " [platnost skon��: %s]"
+
+#, fuzzy
+#~ msgid " [revoked: %s]"
+#~ msgstr "[revokov�n] "
+
+#~ msgid "can't create %s: %s\n"
+#~ msgstr "%s: nemohu vytvo�it: %s\n"
+
#~ msgid ""
#~ "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n"
#~ msgstr ""
diff --git a/po/da.po b/po/da.po
index 7172573d9..ffecedfe4 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.0h\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
"PO-Revision-Date: 2003-12-03 16:11+0100\n"
"Last-Translator: Birger Langkjer <[email protected]>\n"
"Language-Team: Danish <[email protected]>\n"
@@ -49,7 +49,7 @@ msgstr "n"
msgid "nN"
msgstr "nN"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "afslut"
@@ -285,6 +285,15 @@ msgstr "d�rlig hemmelig n�gle"
msgid "keyserver error"
msgstr "generel fejl"
+#: util/errors.c:108
+msgid "canceled"
+msgstr ""
+
+#: util/errors.c:109
+#, fuzzy
+msgid "no card"
+msgstr "ikke krypteret"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr ""
@@ -307,7 +316,7 @@ msgstr "du fandt en fejl ... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr ""
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "kan ikke �bne '%s': %s\n"
@@ -339,7 +348,7 @@ msgstr "kan ikke �bne '%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr ""
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, fuzzy, c-format
msgid "can't create `%s': %s\n"
msgstr "kan ikke oprette %s: %s\n"
@@ -405,7 +414,7 @@ msgstr ""
msgid "can't generate a prime with less than %d bits\n"
msgstr ""
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -413,132 +422,132 @@ msgstr ""
"@Kommandoer:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[filer]|opret en signatur"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[filer]|opret rentekst signatur"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "opret en separat signatur"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "krypt�r data"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "krypt�r kun med symmetriske cifre"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "afkrypt�r data (standard)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "godkend en signatur"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "vis n�gler"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "vis n�gler og signaturer"
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "tjek n�glesignaturer"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "vis n�gle og fingeraftryk"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "vis hemmelige n�gler"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "gener�r et nyt n�glepar"
-#: g10/g10.c:374
+#: g10/g10.c:378
#, fuzzy
msgid "remove keys from the public keyring"
msgstr "fjern n�gle fra den offentlige n�glering"
-#: g10/g10.c:376
+#: g10/g10.c:380
#, fuzzy
msgid "remove keys from the secret keyring"
msgstr "fjern n�gle fra den hemmelige n�glering"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "sign�r en n�gle"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "sign�r en n�gle lokalt"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "sign�r eller redig�r en n�gle"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "Gener�r en annull�rbar certifikat"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "eksport�r n�gler"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "eksport�r n�gler til en n�gletjener"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "import�r n�gler fra en n�gleserver"
-#: g10/g10.c:388
+#: g10/g10.c:392
#, fuzzy
msgid "search for keys on a key server"
msgstr "eksport�r n�gler til en n�gletjener"
-#: g10/g10.c:390
+#: g10/g10.c:394
#, fuzzy
msgid "update all keys from a keyserver"
msgstr "import�r n�gler fra en n�gleserver"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "import�r/fusion�r n�gler"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "opdat�r tillidsdatabasen"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|algo [filer]|print meddelelsesresum�"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -548,61 +557,57 @@ msgstr ""
"Indstillinger:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "opret ascii beskyttet uddata"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|NAME|krypt�r for NAME"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr "brug denne bruger-id til at signere eller dekryptere"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "brug kanonisk tekstmodus"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "brug som uddatafil"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "meddelsom"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "lav ingen �ndringer"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr ""
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -622,16 +627,16 @@ msgstr ""
" --list-keys [navne] vis n�gler\n"
" --fingerprint [navne] vis fingeraftryk\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
# Skal alt dette overs�ttes eller er det flagene?
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -641,7 +646,7 @@ msgstr ""
"sign, check, encrypt eller decrypt\n"
"standard operation afh�nger af inddata\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -649,532 +654,526 @@ msgstr ""
"\n"
"Underst�ttede algoritmer:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr ""
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr ""
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr ""
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
#, fuzzy
msgid "Compression: "
msgstr "Kommentar: "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "brug: gpg [flag] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "konfliktende kommandoer\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr ""
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr ""
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr ""
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr ""
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr ""
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr ""
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr ""
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr ""
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
-#: g10/g10.c:1205
+#: g10/g10.c:1210
#, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr ""
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
-#: g10/g10.c:1334
-#, c-format
-msgid "unknown configuration item \"%s\"\n"
-msgstr ""
+#: g10/g10.c:1354
+#, fuzzy, c-format
+msgid "unknown configuration item `%s'\n"
+msgstr "ukendt standard modtager '%s'\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, fuzzy, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTITS: ingen standard alternativfil '%s'\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTITS: ingen standard alternativfil '%s'\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "alternativfil`%s': %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "l�ser indstillinger fra `%s'\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTITS: %s er ikke til normal brug!\n"
-#: g10/g10.c:1887
+#: g10/g10.c:2021
#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr ""
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "%s er ikke et gyldigt tegns�t\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "import�r n�gler fra en n�gleserver: %s\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "ADVARSEL: '%s' er en tom fil\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "ugyldig n�glering"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, fuzzy, c-format
msgid "%s:%d: invalid import options\n"
msgstr "ADVARSEL: '%s' er en tom fil\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
#, fuzzy
msgid "invalid import options\n"
msgstr "ugyldig rustning"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, fuzzy, c-format
msgid "%s:%d: invalid export options\n"
msgstr "ADVARSEL: '%s' er en tom fil\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
#, fuzzy
msgid "invalid export options\n"
msgstr "ugyldig n�glering"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "ADVARSEL: '%s' er en tom fil\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "ugyldig rustning"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "ADVARSEL: '%s' er en tom fil\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "ugyldig n�glering"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr ""
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr ""
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr ""
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ikke tilladt med %s!\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s er meningsl�s sammen med %s!\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "valgte cifferalgoritme er ugyldig\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "valgte resum�algoritme er ugyldig\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "valgte cifferalgoritme er ugyldig\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
#, fuzzy
msgid "selected certification digest algorithm is invalid\n"
msgstr "valgte resum�algoritme er ugyldig\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr ""
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr ""
-#: g10/g10.c:2565
+#: g10/g10.c:2682
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr ""
-#: g10/g10.c:2567
+#: g10/g10.c:2684
#, fuzzy
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
#, fuzzy
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTE: simpel S2K modus (0) frar�des p� det skarpeste\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
#, fuzzy
msgid "invalid default preferences\n"
msgstr "vis pr�ferencer"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
#, fuzzy
msgid "invalid personal cipher preferences\n"
msgstr "vis pr�ferencer"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
#, fuzzy
msgid "invalid personal digest preferences\n"
msgstr "vis pr�ferencer"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
#, fuzzy
msgid "invalid personal compress preferences\n"
msgstr "vis pr�ferencer"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s er meningsl�s sammen med %s!\n"
-#: g10/g10.c:2680
+#: g10/g10.c:2797
#, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr ""
-#: g10/g10.c:2685
+#: g10/g10.c:2802
#, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr ""
-#: g10/g10.c:2690
-#, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
-msgstr ""
+#: g10/g10.c:2807
+#, fuzzy, c-format
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
+msgstr "valgte cifferalgoritme er ugyldig\n"
# er det klogt at overs�tte TrustDB?
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "kunne ikke initialisere TillidsDB: %s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [filnavn (som gemmes)]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [filnavn]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [filnavn (som krypteres)]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [filnavn]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr ""
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [filnavn (som signeres)]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnavn]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [filnavn]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
-#: g10/g10.c:2908
+#: g10/g10.c:3025
#, fuzzy
msgid "--sign --symmetric [filename]"
msgstr "--symmetric [filnavn]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [filnavn]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [filnavn (som dekrypteres)]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key bruger-id"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key bruger-id"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
#, fuzzy
msgid "--nrsign-key user-id"
msgstr "--sign-key bruger-id"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
#, fuzzy
msgid "--nrlsign-key user-id"
msgstr "--sign-key bruger-id"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key bruger-id [kommandoer]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "kan ikke �bne %s: %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "signering fejlede: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr ""
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "fjernelse af beskyttelse fejlede: %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "ugyldig hash-algoritme `%s'\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[filnavn]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "G� til sagen og skriv meddelelsen ...\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "kan ikke �bne `%s'\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
msgstr ""
-#: g10/g10.c:3668
+#: g10/g10.c:3784
#, fuzzy
msgid "a user notation name must contain the '@' character\n"
msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
#, fuzzy
msgid "the given certification policy URL is invalid\n"
msgstr "den givne politik-URL er ugyldig\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
#, fuzzy
msgid "the given signature policy URL is invalid\n"
msgstr "den givne politik-URL er ugyldig\n"
-#: g10/g10.c:3747
+#: g10/g10.c:3863
#, fuzzy
-msgid "the given signature preferred keyserver URL is invalid\n"
+msgid "the given preferred keyserver URL is invalid\n"
msgstr "den givne politik-URL er ugyldig\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "v�r mere stille"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
#, fuzzy
msgid "take the keys from this keyring"
msgstr "Slet denne n�gle fra n�gleringen? "
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
#, fuzzy
msgid "make timestamp conflicts only a warning"
msgstr "tidsstempelkonflikt"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr "|FD|skriv statusinfo til denne FD"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
#, fuzzy
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1206,12 +1205,13 @@ msgid "invalid dash escaped line: "
msgstr ""
#: g10/armor.c:565
-msgid "unexpected armor:"
+#, fuzzy
+msgid "unexpected armor: "
msgstr "uforventet beskyttelse:"
-#: g10/armor.c:695 g10/armor.c:1276
-#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+#: g10/armor.c:695 g10/armor.c:1280
+#, fuzzy, c-format
+msgid "invalid radix64 character %02X skipped\n"
msgstr "ugyldigt radix64 tegn %02x udeladt\n"
#: g10/armor.c:738
@@ -1222,33 +1222,34 @@ msgstr "for tidlig eof (ingen CRC)\n"
msgid "premature eof (in CRC)\n"
msgstr "for tidlig eof (i CRC)\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "d�rlig CRC\n"
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC fejl; %06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+#, fuzzy
+msgid "premature eof (in trailer)\n"
msgstr "for tidlig eof (i trailer)\n"
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "fejl i trailerlinie\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "ingen gyldig OpenPGP data fundet.\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "ugyldigt panser: linie l�ngere end %d tegn\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr "quoted printable-tegn i panser - m�ske pga. en fejlbeh�ftet MTA\n"
@@ -1304,7 +1305,7 @@ msgstr " alias \""
msgid " aka \""
msgstr " alias \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1548,97 +1549,117 @@ msgstr "%s: udelod: offentlign�gle er sl�et fra\n"
msgid "no valid addressees\n"
msgstr "ingen gyldige adresser\n"
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "vis pr�ferencer"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "vis pr�ferencer"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
#, fuzzy
msgid "too many digest preferences\n"
msgstr "vis pr�ferencer"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
#, fuzzy
msgid "too many compression preferences\n"
msgstr "vis pr�ferencer"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "Ugyldige bogstaver i navn\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
#, fuzzy
msgid "writing direct signature\n"
msgstr "skriver selvsignatur\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "skriver selvsignatur\n"
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr ""
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "�nsket n�glest�rrelse er %u bit\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "rundet op til %u bit\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
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:1167
+#: g10/keygen.c:1212
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA og ElGamal (standard)\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (sign�r kun)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (krypt�r kun)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, fuzzy, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) DSA (sign�r kun)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, fuzzy, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) ElGamal (krypt�r kun)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, fuzzy, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) ElGamal (sign�r og krypt�r)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, fuzzy, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) DSA (sign�r kun)\n"
+
+#: g10/keygen.c:1224
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) ElGamal (sign�r og krypt�r)\n"
+
+#: g10/keygen.c:1226
+#, fuzzy, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) ElGamal (krypt�r kun)\n"
+
+#: g10/keygen.c:1228
+#, fuzzy, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) ElGamal (sign�r og krypt�r)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "Dit valg? "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "Ugyldigt valg.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1647,54 +1668,54 @@ msgid ""
" highest suggested keysize is 2048 bits\n"
msgstr ""
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "Hvilken n�glest�rrelse �nsker du? (1024) "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
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:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr ""
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr ""
-#: g10/keygen.c:1255
+#: g10/keygen.c:1328
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr ""
-#: g10/keygen.c:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
msgstr ""
-#: g10/keygen.c:1263
+#: g10/keygen.c:1336
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:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
msgstr ""
-#: g10/keygen.c:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "�nsket n�glest�rrelse er %u bit\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "rundet op til %u bit\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1704,7 +1725,7 @@ msgid ""
" <n>y = key expires in n years\n"
msgstr ""
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1714,88 +1735,88 @@ msgid ""
" <n>y = signature expires in n years\n"
msgstr ""
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "N�gle er gyldig for? (0) "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
#, fuzzy
msgid "Signature is valid for? (0) "
msgstr "N�gle er gyldig for? (0) "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "ugyldig v�rdi\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, fuzzy, c-format
msgid "%s does not expire at all\n"
msgstr "N�glen udl�ber aldrig\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, fuzzy, c-format
msgid "%s expires at %s\n"
msgstr "N�gle udl�ber d. %s\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
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:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "Er dette korrekt (j/n)? "
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "Rigtige navn: "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "Ugyldige bogstaver i navn\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr "Navn m� ikke starte med et tal\n"
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr "Navn skal v�re mindst 5 bogstaver langt\n"
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "Epostadresse: "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "Ikke en gyldig epostadresse\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "Kommentar: "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "Ugyldigt tegn i kommentar\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Du bruger '%s' tegns�ttet.\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1806,28 +1827,28 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
-#: g10/keygen.c:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
#, 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:1542
+#: g10/keygen.c:1615
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:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1835,17 +1856,17 @@ msgstr ""
"Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
#, fuzzy
msgid "passphrase not correctly repeated; try again"
msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr ""
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1853,7 +1874,7 @@ msgid ""
"\n"
msgstr ""
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1861,88 +1882,117 @@ msgid ""
"generator a better chance to gain enough entropy.\n"
msgstr ""
-#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr ""
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA n�glepar vil have 1024 bit.\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "N�gleoprettelse annulleret.\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "skriver offentligt certifikat til '%s'\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "skriver hemmeligt certifikat til '%s'\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "skriver hemmeligt certifikat til '%s'\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, fuzzy, c-format
msgid "no writable public keyring found: %s\n"
msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, fuzzy, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "skriver hemmeligt certifikat til '%s'\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, fuzzy, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "fejl ved skrivning af n�glering `%s': %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, fuzzy, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "fejl ved skrivning af n�glering `%s': %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "offentlig og hemmelig n�gle oprettet og signeret.\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr ""
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
-#: g10/keygen.c:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "Vil du virkelig oprette?"
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "fjernelse af beskyttelse fejlede: %s\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "kan ikke oprette %s: %s\n"
+
+#: g10/keygen.c:3248
+#, fuzzy, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "hemmelige n�gler import: %lu\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr ""
@@ -1953,7 +2003,7 @@ msgstr ""
msgid "%s: can't open: %s\n"
msgstr "%s: kan ikke �bne: %s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "fejl ved oprettelse af kodes�tning: %s\n"
@@ -1981,6 +2031,11 @@ msgstr "%s: ADVARSEL: tom fil\n"
msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
msgstr ""
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "kan ikke �bne %s: %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -1991,14 +2046,22 @@ msgid ""
"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
msgstr ""
-#: g10/encode.c:526 g10/encode.c:721
+#: g10/encode.c:526
#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:634 g10/sign.c:864
+#, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
msgstr ""
-#: g10/encode.c:634 g10/sign.c:863
+#: g10/encode.c:721
#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
#: g10/encode.c:818
@@ -2006,7 +2069,7 @@ msgstr ""
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s krypteret for: %s\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, fuzzy, c-format
msgid "key `%s' not found: %s\n"
msgstr "%s: bruger ikke fundet: %s\n"
@@ -2039,9 +2102,9 @@ msgstr "ADVARSEL: intet blev eksporteret\n"
msgid "too many entries in pk cache - disabled\n"
msgstr ""
-#: g10/getkey.c:186 g10/getkey.c:2693
+#: g10/getkey.c:186 g10/getkey.c:2691
#, fuzzy
-msgid "[User id not found]"
+msgid "[User ID not found]"
msgstr "[bruger ikke fundet]"
#: g10/getkey.c:1614
@@ -2193,7 +2256,7 @@ msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
#: g10/import.c:722
#, fuzzy, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
#: g10/import.c:728
@@ -2220,7 +2283,7 @@ msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
msgid "no writable keyring found: %s\n"
msgstr "fejl ved skrivning af n�glering `%s': %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "skriver til `%s'\n"
@@ -2332,12 +2395,12 @@ msgstr "n�gle %08lX: ingen bruger-id\n"
#: g10/import.c:1299
#, fuzzy, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
#: g10/import.c:1301
#, fuzzy, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
#: g10/import.c:1319
@@ -2377,7 +2440,7 @@ msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
#: g10/import.c:1439
#, fuzzy, c-format
-msgid "key %s: skipped user ID '%s'\n"
+msgid "key %s: skipped user ID \"%s\"\n"
msgstr "%s: udelod: %s\n"
#: g10/import.c:1460
@@ -2387,7 +2450,7 @@ msgstr "%s: udelod: %s\n"
#: g10/import.c:1487
#, fuzzy, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
#: g10/import.c:1497
@@ -2420,1188 +2483,1192 @@ msgstr ""
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "n�gle %08lX: offentlig n�gle importeret\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "n�gle %08lX: offentlig n�gle importeret\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr ""
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[selv-signatur]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "1 d�rlig signature\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d d�rlige signaturer\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr ""
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr ""
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr ""
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr ""
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr ""
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr ""
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, c-format
msgid " (%d) I trust marginally\n"
msgstr ""
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, fuzzy, c-format
msgid " (%d) I trust fully\n"
msgstr " (%d) ElGamal (krypt�r kun)\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, fuzzy, c-format
msgid "User ID \"%s\" is revoked."
msgstr "N�glen er beskyttet.\n"
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
#, fuzzy
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr ""
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, fuzzy, c-format
msgid "User ID \"%s\" is expired."
msgstr "N�glen er beskyttet.\n"
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, fuzzy, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "ADVARSEL: '%s' er en tom fil\n"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
"is a PGP 2.x-style signature.\n"
msgstr ""
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr ""
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"has expired.\n"
msgstr ""
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"is a local signature.\n"
msgstr ""
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr ""
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr ""
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
#, fuzzy
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr ""
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
#, fuzzy
msgid "This key has expired!"
msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, fuzzy, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Denne n�gle er ikke beskyttet.\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr ""
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
msgstr ""
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr ""
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
"to the person named above? If you don't know what to answer, enter \"0\".\n"
msgstr ""
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr ""
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr ""
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr ""
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr ""
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr ""
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
msgstr ""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
#, fuzzy
msgid ""
"\n"
"This will be a self-signature.\n"
msgstr "skriver selvsignatur\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
msgstr ""
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
msgstr ""
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
msgstr ""
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
msgstr ""
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
msgstr ""
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "Vil du gerne signere? "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "signering fejlede: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "Denne n�gle er ikke beskyttet.\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
#, fuzzy
msgid "Secret parts of primary key are not available.\n"
msgstr "hemmelig n�gle ikke tilg�ngelig"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "N�glen er beskyttet.\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Kan ikke redigere denne n�gle: %s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
msgstr ""
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
msgstr ""
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "Vil du virkelig gerne g�re dette?"
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr ""
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "afslut denne menu"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "a"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "gem"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "gem og afslut"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "hj�lp"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "vis denne hj�lp"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "vis fingeraftryk"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "vis"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "vis n�gler og bruger-id'er"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr ""
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "n�gle"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "v�lg sekund�r n�gle N"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "tjek"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "vis signaturer"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "c"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "sign�r"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "sign�r n�glen"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "s"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "tsign"
msgstr "sign�r"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "make a trust signature"
msgstr "opret en separat signatur"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "lsign�r"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "sign�r n�glen lokalt"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
#, fuzzy
msgid "nrsign"
msgstr "sign�r"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
#, fuzzy
msgid "sign the key non-revocably"
msgstr "sign�r n�glen lokalt"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
#, fuzzy
msgid "nrlsign"
msgstr "sign�r"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
#, fuzzy
msgid "sign the key locally and non-revocably"
msgstr "sign�r n�glen lokalt"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "aflus"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "tilf�j-bid"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "tilf�j bruger-id"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr ""
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
#, fuzzy
msgid "add a photo ID"
msgstr "tilf�j bruger-id"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "sletbid"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "slet bruger id"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr ""
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "tilf�j n�gle"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "tilf�j sekund�r n�gle"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+#, fuzzy
+msgid "addcardkey"
+msgstr "tilf�j n�gle"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "sletn�gle"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "slet sekund�r n�gle"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
#, fuzzy
msgid "addrevoker"
msgstr "tilf�j n�gle"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
#, fuzzy
msgid "add a revocation key"
msgstr "tilf�j sekund�r n�gle"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "sletsig"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "slet signaturer"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "udl�b"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "�ndr udl�bsdatoen"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr ""
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr ""
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "skift"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "skift imellem hemmelig og offentlig n�gle visning"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "s"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pr�f"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
#, fuzzy
msgid "list preferences (expert)"
msgstr "vis pr�ferencer"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
#, fuzzy
msgid "showpref"
msgstr "vispr�f"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
#, fuzzy
msgid "list preferences (verbose)"
msgstr "vis pr�ferencer"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
#, fuzzy
msgid "setpref"
msgstr "pr�f"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
#, fuzzy
msgid "set preference list"
msgstr "vis pr�ferencer"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
#, fuzzy
msgid "updpref"
msgstr "pr�f"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
#, fuzzy
msgid "updated preferences"
msgstr "vis pr�ferencer"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "keyserver"
msgstr "generel fejl"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
msgid "set preferred keyserver URL"
msgstr ""
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "kodeord"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "�ndr kodes�tningen"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "betro"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr ""
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr ""
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr ""
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
#, fuzzy
msgid "revuid"
msgstr "sletbid"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
#, fuzzy
msgid "revoke a user ID"
msgstr "tilf�j bruger-id"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr ""
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr ""
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "sl�fra"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "sl� n�gle fra"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "sl�til"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "sl� n�gle til"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr ""
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr ""
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr ""
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, fuzzy, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "fejl ved l�sning af '%s': %s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr ""
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr ""
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr ""
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr ""
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
#, fuzzy
msgid "Key is revoked."
msgstr "N�glen er beskyttet.\n"
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr ""
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr ""
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr ""
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr ""
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr ""
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr ""
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr ""
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+msgid "Really move the primary key? "
+msgstr ""
+
+#: g10/keyedit.c:1598
+#, fuzzy
+msgid "You must select exactly one key.\n"
+msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr ""
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr ""
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr ""
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
msgid "Really revoke all selected user IDs? "
msgstr ""
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
#, fuzzy
msgid "Really revoke this user ID? "
msgstr "Vil du virkelig oprette?"
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr ""
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr ""
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
#, fuzzy
msgid "Set preference list to:\n"
msgstr "vis pr�ferencer"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr ""
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr ""
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "Gem �ndringer? "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "Afslut uden at gemme? "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr ""
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr ""
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr ""
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr ""
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr ""
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr ""
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keyedit.c:2219
#, fuzzy, c-format
msgid "This key may be revoked by %s key "
msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr ""
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "kan ikke oprette %s: %s\n"
-#: g10/keyedit.c:2084
-#, fuzzy, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
msgstr "tilf�j n�gle"
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
-msgstr "N�gle udl�ber d. %s\n"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "udl�b"
+
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
+msgstr "udl�b"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2246
#, fuzzy, c-format
-msgid "expires: %s"
-msgstr "N�gle udl�ber d. %s\n"
+msgid "usage: %s"
+msgstr "betro"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, fuzzy, c-format
msgid "trust: %s"
msgstr "betro"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr ""
-#: g10/keyedit.c:2146
-#, fuzzy, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! undern�gle er blevet annulleret! %s\n"
-
-#: g10/keyedit.c:2149
-#, fuzzy
-msgid "rev- faked revocation found\n"
-msgstr "rev- forkert n�gletilbagekald\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
+#: g10/keyedit.c:2300
+msgid "card-no: "
msgstr ""
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-#, fuzzy
-msgid "revoked"
-msgstr "tilf�j n�gle"
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-#, fuzzy
-msgid "expired"
-msgstr "udl�b"
-
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr ""
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
msgstr ""
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-#, fuzzy
-msgid "[revoked] "
-msgstr "tilf�j n�gle"
-
-#: g10/keyedit.c:2274
-#, fuzzy
-msgid "[expired] "
-msgstr "udl�b"
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
msgstr ""
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
" of PGP to reject this key.\n"
msgstr ""
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
#, fuzzy
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr ""
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr ""
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr ""
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr ""
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr ""
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Slettede %d signatur.\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr ""
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr ""
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
" some versions of PGP to reject this key.\n"
msgstr ""
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
#, fuzzy
msgid "Enter the user ID of the designated revoker: "
msgstr "Indtast n�glens st�rrelse"
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr ""
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr ""
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr ""
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr ""
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr ""
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr ""
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
#, fuzzy
msgid "Please select exactly one user ID.\n"
msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
#, fuzzy, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+#, fuzzy
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
+
+#: g10/keyedit.c:3480
+#, fuzzy
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "Ingen bruger-id med indeks %d\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Ingen sekund�r n�gle med indeks %d\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "bruger-id: \""
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, c-format
msgid ""
"\"\n"
"signed with your key %s at %s\n"
msgstr ""
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, c-format
msgid ""
"\"\n"
"locally signed with your key %s at %s\n"
msgstr ""
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, fuzzy, c-format
msgid "This signature expired on %s.\n"
msgstr "Denne n�gle er ikke beskyttet.\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
#, fuzzy
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
#, fuzzy
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Gener�r en annull�rbar certifikat"
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr ""
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, c-format
msgid " signed by %s on %s%s%s\n"
msgstr ""
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid " revoked by %s on %s\n"
msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr ""
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, c-format
msgid " signed by %s on %s%s\n"
msgstr ""
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr ""
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
#, fuzzy
msgid "Really create the revocation certificates? (y/N) "
msgstr "Gener�r en annull�rbar certifikat"
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr ""
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, fuzzy, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "N�glen er beskyttet.\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
-#: g10/keylist.c:179
+#: g10/keylist.c:180
#, fuzzy
msgid "Critical signature policy: "
msgstr "%s signatur fra: %s\n"
-#: g10/keylist.c:181
+#: g10/keylist.c:182
#, fuzzy
msgid "Signature policy: "
msgstr "%s signatur fra: %s\n"
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr ""
-#: g10/keylist.c:286
+#: g10/keylist.c:287
msgid "Critical signature notation: "
msgstr ""
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr ""
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr ""
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr ""
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr "N�gle udl�ber d. %s\n"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, fuzzy, c-format
-msgid " [expires: %s]"
-msgstr "N�gle udl�ber d. %s\n"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, fuzzy, c-format
-msgid " [revoked: %s]"
-msgstr "tilf�j n�gle"
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
#, fuzzy
msgid "Primary key fingerprint:"
msgstr "vis n�gle og fingeraftryk"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
#, fuzzy
msgid " Subkey fingerprint:"
msgstr " Fingeraftryk:"
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
#, fuzzy
msgid " Primary key fingerprint:"
msgstr " Fingeraftryk:"
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
#, fuzzy
msgid " Subkey fingerprint:"
msgstr " Fingeraftryk:"
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr " Fingeraftryk:"
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3813,78 +3880,78 @@ msgstr "gammeldags (PGP 2.x) signatur\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr ""
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "kan ikke sl� core-dump fra: %s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr ""
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr ""
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr ""
-#: g10/misc.c:491
+#: g10/misc.c:517
#, fuzzy, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "ADVARSEL: '%s' er en tom fil\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "ADVARSEL: '%s' er en tom fil\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr ""
-#: g10/misc.c:508
+#: g10/misc.c:534
#, fuzzy
msgid "Uncompressed"
msgstr "ikke bearbejdet"
-#: g10/misc.c:533
+#: g10/misc.c:559
#, fuzzy
msgid "uncompressed|none"
msgstr "ikke bearbejdet"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr ""
-#: g10/misc.c:777
+#: g10/misc.c:826
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "l�ser indstillinger fra `%s'\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "ukendt standard modtager '%s'\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr ""
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr ""
@@ -3923,7 +3990,7 @@ msgstr "kan ikke �bne '%s': %s\n"
msgid "communication problem with gpg-agent\n"
msgstr ""
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr ""
@@ -3958,46 +4025,46 @@ msgstr ""
msgid "invalid response from agent\n"
msgstr ""
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr ""
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr ""
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr ""
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "Indtast kodes�tning: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
"user: \""
msgstr ""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr ""
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (hovedn�gle-ID %08lX)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "Gentag kodes�tning: "
@@ -4206,25 +4273,36 @@ msgstr "ADVARSEL: '%s' er en tom fil\n"
msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
msgstr "kan ikke oprette %s: %s\n"
-#: g10/sign.c:794
+#: g10/sign.c:771 g10/sign.c:1008
+#, fuzzy, c-format
+msgid "writing to file `%s'\n"
+msgstr "skriver til `%s'\n"
+
+#: g10/sign.c:795
#, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr "signerer:"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "kan ikke �bne %s: %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr ""
@@ -4613,7 +4691,7 @@ msgstr ""
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr ""
@@ -4890,17 +4968,17 @@ msgstr "Ingen hj�lp tilg�ngelig"
msgid "No help available for `%s'"
msgstr "Ingen hj�lp tilg�ngelig for `%s'"
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, fuzzy, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "fejl ved skrivning af n�glering `%s': %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr ""
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, fuzzy, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "ingen standard offentlig n�glering\n"
@@ -4943,8 +5021,7 @@ msgstr "vis n�gler og signaturer"
msgid "%s: keyring created\n"
msgstr ""
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -4953,32 +5030,37 @@ msgid ""
"Keeping the image close to 240x288 is a good size to use.\n"
msgstr ""
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr ""
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, fuzzy, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "kan ikke �bne %s: %s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
#, fuzzy
msgid "Are you sure you want to use it (y/N)? "
msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr ""
# virker j automatisk istedetfor y?
-#: g10/photoid.c:129
+#: g10/photoid.c:130
#, fuzzy
msgid "Is this photo correct (y/N/q)? "
msgstr "Er dette korrekt (j/n)? "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
#, fuzzy
msgid "unable to display photo ID!\n"
msgstr "kan ikke �bne %s: %s\n"
@@ -4998,43 +5080,48 @@ msgid ""
msgstr ""
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
+msgid "this platform requires temporary files when calling external programs\n"
msgstr ""
-#: g10/exec.c:432
-#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
-msgstr ""
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
+msgstr "kan ikke �bne %s: %s\n"
+
+#: g10/exec.c:436
+#, fuzzy, c-format
+msgid "unable to execute shell `%s': %s\n"
+msgstr "kan ikke �bne %s: %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:515
#, c-format
msgid "system error while calling external program: %s\n"
msgstr ""
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr ""
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr ""
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr ""
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr ""
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr ""
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr ""
@@ -5188,6 +5275,49 @@ msgstr "fejl ved l�sning af '%s': %s\n"
msgid "read error: %s\n"
msgstr "panser: %s\n"
+#, fuzzy
+#~ msgid "revoked: %s"
+#~ msgstr "tilf�j n�gle"
+
+#, fuzzy
+#~ msgid "expired: %s"
+#~ msgstr "N�gle udl�ber d. %s\n"
+
+#, fuzzy
+#~ msgid "expires: %s"
+#~ msgstr "N�gle udl�ber d. %s\n"
+
+#, fuzzy
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "rev! undern�gle er blevet annulleret! %s\n"
+
+#, fuzzy
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "rev- forkert n�gletilbagekald\n"
+
+#, fuzzy
+#~ msgid "[revoked] "
+#~ msgstr "tilf�j n�gle"
+
+#, fuzzy
+#~ msgid "[expired] "
+#~ msgstr "udl�b"
+
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr "N�gle udl�ber d. %s\n"
+
+#, fuzzy
+#~ msgid " [expires: %s]"
+#~ msgstr "N�gle udl�ber d. %s\n"
+
+#, fuzzy
+#~ msgid " [revoked: %s]"
+#~ msgstr "tilf�j n�gle"
+
+#~ msgid "can't create %s: %s\n"
+#~ msgstr "kan ikke oprette %s: %s\n"
+
#~ msgid "store only"
#~ msgstr "gem kun"
diff --git a/po/de.po b/po/de.po
index 0831d6b55..9a38ce7ef 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.2.2\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
-"PO-Revision-Date: 2004-07-20 16:01+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
+"PO-Revision-Date: 2004-09-29 16:20+0200\n"
"Last-Translator: Walter Koch <[email protected]>\n"
"Language-Team: German <[email protected]>\n"
"MIME-Version: 1.0\n"
@@ -48,7 +48,7 @@ msgstr "nein"
msgid "nN"
msgstr "nN"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "quit"
@@ -281,6 +281,16 @@ msgstr "unbrauchbarer geheimer Schl�ssel"
msgid "keyserver error"
msgstr "Schl�sselserverfehler"
+#: util/errors.c:108
+#, fuzzy
+msgid "canceled"
+msgstr "Abbruch"
+
+#: util/errors.c:109
+#, fuzzy
+msgid "no card"
+msgstr "nicht verschl�sselt"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr "FEHLER: "
@@ -303,7 +313,7 @@ msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "Kein Modul zum sammeln von Entropie vorhanden\n"
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
@@ -325,7 +335,7 @@ msgstr "Hinweis: 'random_seed'-Datei ist leer\n"
#: cipher/random.c:407
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr ""
-"WARNUNG: Falsche Gr��e der 'random_seed'-Datei - sie wird nicht verwendet\n"
+"WARNUNG: Falsche Gr���e der 'random_seed'-Datei - sie wird nicht verwendet\n"
#: cipher/random.c:415
#, c-format
@@ -336,7 +346,7 @@ msgstr "'%s' ist unlesbar: %s\n"
msgid "note: random_seed file not updated\n"
msgstr "Hinweis: 'random_seed'-Datei bleibt unver�ndert\n"
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr "'%s' kann nicht erzeugt werden: %s\n"
@@ -406,7 +416,7 @@ msgstr "Eine Primzahl mit weniger als %d Bits kann nicht erzeugt werden\n"
msgid "can't generate a prime with less than %d bits\n"
msgstr "Eine Primzahl mit weniger als %d Bits kann nicht erzeugt werden\n"
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -414,128 +424,128 @@ msgstr ""
"@Befehle:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[Datei]|Eine Unterschrift erzeugen"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "Eine abgetrennte Unterschrift erzeugen"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "Daten verschl�sseln"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "Daten symmetrisch verschl�sseln"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "Daten entschl�sseln (Voreinstellung)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "Signatur pr�fen"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "Liste der Schl�ssel"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "Liste der Schl�ssel und ihrer Signaturen"
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "Signaturen der Schl�ssel pr�fen"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\""
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "Liste der geheimen Schl�ssel"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "Ein neues Schl�sselpaar erzeugen"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "Schl�ssel aus dem �ff. Schl�sselbund entfernen"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "Schl�ssel aus dem geh. Schl�sselbund entfernen"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "Schl�ssel signieren"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "Schl�ssel nur f�r diesen Rechner signieren"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "Unterschreiben oder bearbeiten eines Schl."
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "Schl�ssel exportieren"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "Schl�ssel zu einem Schl�.server exportieren"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "Schl�ssel von einem Schl�.server importieren"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "Schl�ssel auf einem Schl�.server suchen"
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "alle Schl�ssel per Schl�.server aktualisieren"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "Schl�ssel importieren/kombinieren"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "�ndern der \"Trust\"-Datenbank"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|algo [Dateien]|Message-Digests f�r die Dateien ausgeben"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -545,55 +555,51 @@ msgstr ""
"Optionen:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "Ausgabe mit ASCII-H�lle versehen"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|NAME|Verschl�sseln f�r NAME"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr "Mit dieser User-ID signieren"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr "Kompressionsstufe auf N setzen (0=keine)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "Textmodus benutzen"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "Als Ausgabedatei benutzen"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "Detaillierte Informationen"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "Keine wirklichen �nderungen durchf�hren"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "vor �berschreiben nachfragen"
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -602,7 +608,7 @@ msgstr ""
"(Auf der \"man\"-Seite ist eine vollst�ndige Liste aller Kommandos und "
"Optionen)\n"
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -622,17 +628,17 @@ msgstr ""
" --list-keys [Namen] Schl�ssel anzeigen\n"
" --fingerprint [Namen] \"Fingerabdr�cke\" anzeigen\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Berichte �ber Programmfehler bitte in englisch an <[email protected]>.\n"
"Sinn- oder Schreibfehler in den deutschen Texten bitte an <[email protected]>.\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -642,7 +648,7 @@ msgstr ""
"Signieren, pr�fen, verschl�sseln, entschl�sseln.\n"
"Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -650,487 +656,481 @@ msgstr ""
"\n"
"Unterst�tzte Verfahren:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr "�ff.Schl�ssel: "
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr "Verschl�.: "
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr "Hash: "
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
msgid "Compression: "
msgstr "Komprimierung: "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "Aufruf: gpg [Optionen] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "Widerspr�chliche Befehle\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "Kein '='-Zeichen in der Gruppendefinition \"%s\"\n"
-#: g10/g10.c:1166
-#, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+#: g10/g10.c:1171
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverh�ltnis des Home-Verzeichnis \"%s\"\n"
-#: g10/g10.c:1169
-#, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+#: g10/g10.c:1174
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverh�ltnis der Konfigurationsdatei \"%s\"\n"
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverh�ltnis (%s) \"%s\"\n"
-#: g10/g10.c:1178
-#, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+#: g10/g10.c:1183
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis \"%s\"\n"
-#: g10/g10.c:1181
-#, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+#: g10/g10.c:1186
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei \"%s\"\n"
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte (%s) \"%s\"\n"
-#: g10/g10.c:1190
-#, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+#: g10/g10.c:1195
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"WARNUNG: Unsicheres Besitzverh�ltnis des Verzeichnisses f�r Home-Verzeichnis "
"\"%s\"\n"
-#: g10/g10.c:1193
-#, c-format
+#: g10/g10.c:1198
+#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr ""
"WARNUNG: Unsicheres Besitzverh�ltnis des Verzeichnisses der "
"Konfigurationsdatei \"%s\"\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverh�ltnis des Verzeichnisses (%s) \"%s\"\n"
-#: g10/g10.c:1202
-#, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+#: g10/g10.c:1207
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"WARNUNG: Unsichere Zugriffsrechte des Verzeichnisses des Home-"
"Verzeichnisses \"%s\"\n"
-#: g10/g10.c:1205
-#, c-format
+#: g10/g10.c:1210
+#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr ""
"WARNUNG: Unsichere Zugriffsrechte des Verzeichnisses der Konfigurationsdatei "
"\"%s\"\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte des Verzeichnisses (%s) \"%s\"\n"
-#: g10/g10.c:1334
-#, c-format
-msgid "unknown configuration item \"%s\"\n"
+#: g10/g10.c:1354
+#, fuzzy, c-format
+msgid "unknown configuration item `%s'\n"
msgstr "Unbekanntes Konfigurationselement `%s'\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "Optionendatei '%s': %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "Optionen werden aus '%s' gelesen\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "Hinweis: %s ist nicht f�r den �blichen Gebrauch gedacht!\n"
-#: g10/g10.c:1887
-#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+#: g10/g10.c:2021
+#, fuzzy, c-format
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr ""
"Verschl�sselungserweiterung \"%s\" wurde wegen falscher Rechte nicht "
"geladen\n"
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "%s ist kein g�ltiger Zeichensatz.\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "Schl�sselserver-URI konnte nicht zerlegt werden\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ung�ltige Export Option.\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "Ung�ltige export Option\n"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ung�ltige Import Option.\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
msgid "invalid import options\n"
msgstr "Ung�ltige Import Option\n"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ung�ltige Export Option.\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
msgid "invalid export options\n"
msgstr "Ung�ltige export Option\n"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ung�ltige Import Option.\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "Ung�ltige Import Option\n"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ung�ltige Export Option.\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "Ung�ltige export Option\n"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "Der Ausf�hrungspfad konnte nicht auf %s gesetzt werden.\n"
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "WARNUNG: Programm k�nnte eine core-dump-Datei schreiben!\n"
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "WARNUNG: %s ersetzt %s\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"Im --pgp2-Modus k�nnen Sie nur abgetrennte oder Klartextunterschriften "
"machen\n"
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
"Im --pgp2-Modus k�nnen Sie nicht gleichzeitig unterschreiben und "
"verschl�sseln\n"
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"Im --pgp2-Modus m�ssen Sie Dateien benutzen und k�nnen keine Pipes "
"verwenden.\n"
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
"Verschl�ssen einer Botschaft ben�tigt im --pgp2-Modus die IDEA-"
"Verschl�sselung\n"
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "Das ausgew�hlte Verschl�sselungsverfahren ist ung�ltig\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
msgid "selected compression algorithm is invalid\n"
msgstr "Das ausgew�hlte Komprimierungsverfahren ist ung�ltig\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
msgid "selected certification digest algorithm is invalid\n"
msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
-msgstr "completes-needed m�ssen gr��er als 0 sein\n"
+msgstr "completes-needed m�ssen gr���er als 0 sein\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
-msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
+msgstr "marginals-needed m�ssen gr���er als 1 sein\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth mu� im Bereich 1 bis 255 liegen\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "ung�ltiger \"default-cert-level\"; Wert mu� 0, 1, 2 oder 3 sein\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "ung�ltiger \"min-cert-level\"; Wert mu� 0, 1, 2 oder 3 sein\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ung�ltiger \"simple S2K\"-Modus; Wert mu� 0, 1 oder 3 sein\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
msgid "invalid default preferences\n"
msgstr "ung�ltige Standard Voreinstellungen\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
msgid "invalid personal cipher preferences\n"
msgstr "ung�ltige private Verschl�sselungsvoreinstellungen\n"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
msgid "invalid personal digest preferences\n"
msgstr "ung�ltige private Hashvoreinstellungen\n"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
msgid "invalid personal compress preferences\n"
msgstr "ung�ltige private Komprimierungsvoreinstellungen\n"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s arbeitet noch nicht mit %s zusammen\n"
-#: g10/g10.c:2680
-#, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2797
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr ""
"Die Benutzung des Verschl�sselungsverfahren %s ist im %s-Modus nicht "
"erlaubt.\n"
-#: g10/g10.c:2685
-#, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2802
+#, fuzzy, c-format
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "Die Benutzung der Hashmethode %s ist im %s-Modus nicht erlaubt.\n"
-#: g10/g10.c:2690
-#, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2807
+#, fuzzy, c-format
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr ""
"Die Benutzung des Komprimierverfahren %s ist im %s-Modus nicht erlaubt.\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"WARNUNG: Empf�nger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n"
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [Dateiname]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [Dateiname]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [Dateiname]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [Dateiname]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [Dateiname]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [Dateiname]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [Dateiname]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [Dateiname]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [Dateiname]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [Dateiname]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key User-ID"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key User-ID"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrsign-key User-ID"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key User-ID"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key User-ID [Befehle]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "Senden an Schl�sselserver fehlgeschlagen: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "Empfangen vom Schl�sselserver fehlgeschlagen: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, c-format
msgid "key export failed: %s\n"
msgstr "Schl�sselexport fehlgeschlagen: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Suche auf dem Schl�sselserver fehlgeschlagen: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Refresh vom Schl�sselserver fehlgeschlagen: %s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "Ung�ltiges Hashverfahren '%s'\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[Dateiname]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "Auf geht's - Botschaft eintippen ...\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "'%s' kann nicht ge�ffnet werden\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@ -1138,48 +1138,48 @@ msgstr ""
"Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
"enthalten und mu� mit einem '=' enden\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
msgid "a user notation name must contain the '@' character\n"
msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ung�ltig\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
-#: g10/g10.c:3747
+#: g10/g10.c:3863
#, fuzzy
-msgid "the given signature preferred keyserver URL is invalid\n"
+msgid "the given preferred keyserver URL is invalid\n"
msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "Etwas weniger Infos"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
msgid "take the keys from this keyring"
msgstr "Schl�ssel aus diesem Schl�sselbund nehmen"
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
msgid "make timestamp conflicts only a warning"
msgstr "differierende Zeitangaben sind kein Fehler"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1211,12 +1211,13 @@ msgid "invalid dash escaped line: "
msgstr "Ung�ltige mit Bindestrich \"escapte\" Zeile: "
#: g10/armor.c:565
-msgid "unexpected armor:"
+#, fuzzy
+msgid "unexpected armor: "
msgstr "Unerwartete ASCII-H�lle:"
-#: g10/armor.c:695 g10/armor.c:1276
-#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+#: g10/armor.c:695 g10/armor.c:1280
+#, fuzzy, c-format
+msgid "invalid radix64 character %02X skipped\n"
msgstr "Ung�ltiges \"radix64\" Zeichen %02x ignoriert\n"
#: g10/armor.c:738
@@ -1227,33 +1228,34 @@ msgstr "vorzeitiges Dateiende (keine Pr�fsumme)\n"
msgid "premature eof (in CRC)\n"
msgstr "vorzeitiges Dateiende (innerhalb der Pr�fsumme)\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "Falsch aufgebaute Pr�fsumme\n"
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "Pr�fsummenfehler; %06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+#, fuzzy
+msgid "premature eof (in trailer)\n"
msgstr "vorzeitiges Dateiende (im Nachsatz)\n"
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "Fehler in der Nachsatzzeile\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "Keine g�ltigen OpenPGP-Daten gefunden.\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "ung�ltige ASCII-H�lle: Zeile ist l�nger als %d Zeichen\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1309,7 +1311,7 @@ msgstr " alias \""
msgid " aka \""
msgstr " alias \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1573,94 +1575,114 @@ msgstr "%s: �bersprungen: �ffentlicher Schl�ssel ist abgeschaltet\n"
msgid "no valid addressees\n"
msgstr "Keine g�ltigen Adressaten\n"
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "Voreinstellung %c%lu ist doppelt\n"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "zu viele Hashvoreinstellungen\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
msgid "too many digest preferences\n"
msgstr "zu viele Hashvoreinstellungen\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
msgid "too many compression preferences\n"
msgstr "zu viele Komprimierungsvoreinstellungen\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "Ung�ltiges Feld in der Voreinstellungszeichenkette\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
msgid "writing direct signature\n"
msgstr "Die \"Direct Key Signature\" wird geschrieben\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "Die Eigenbeglaubigung wird geschrieben\n"
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "Schreiben der \"key-binding\" Signatur\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Ung�ltig Schl�ssell�nge; %u Bit werden verwendet\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "Schl�ssell�nge auf %u Bit aufgerundet\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
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:1167
+#: g10/keygen.c:1212
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA und ElGamal (voreingestellt)\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (nur signieren/beglaubigen)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (nur verschl�sseln)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (nur signieren/beglaubigen)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (nur verschl�sseln)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (signieren/beglaubigen und verschl�sseln)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, fuzzy, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) RSA (nur signieren/beglaubigen)\n"
+
+#: g10/keygen.c:1224
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) RSA (signieren/beglaubigen und verschl�sseln)\n"
+
+#: g10/keygen.c:1226
+#, fuzzy, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) RSA (nur verschl�sseln)\n"
+
+#: g10/keygen.c:1228
+#, fuzzy, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) RSA (signieren/beglaubigen und verschl�sseln)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "Ihre Auswahl? "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "Ung�ltige Auswahl.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1671,42 +1693,42 @@ msgstr ""
"Es wird ein neues %s Schl�sselpaar erzeugt.\n"
" kleinste Schl�ssell�nge ist 768 Bit\n"
" standard Schl�ssell�nge ist 1024 Bit\n"
-" gr��te sinnvolle Schl�ssell�nge ist 2048 Bit\n"
+" gr���te sinnvolle Schl�ssell�nge ist 2048 Bit\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "Welche Schl�ssell�nge w�nschen Sie? (1024) "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
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:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "zu kurz; 1024 ist die kleinste f�r RSA m�gliche Schl�ssell�nge.\n"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
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:1255
+#: g10/keygen.c:1328
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "Sch�sselgr��e zu hoch; %d ist der Maximalwert.\n"
+msgstr "Sch�sselgr���e zu hoch; %d ist der Maximalwert.\n"
-#: g10/keygen.c:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
msgstr ""
-"Schl�ssell�ngen gr��er als 2048 werden nicht empfohlen, da die\n"
+"Schl�ssell�ngen gr���er als 2048 werden nicht empfohlen, da die\n"
"Berechnungen dann WIRKLICH lange brauchen!\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "Sind Sie sicher, da� Sie diese Schl�ssell�nge w�nschen? "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1714,17 +1736,17 @@ 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:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Die verlangte Schl�ssell�nge betr�gt %u Bit\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "aufgerundet auf %u Bit\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1740,7 +1762,7 @@ msgstr ""
" <n>m = Schl�ssel verf�llt nach n Monaten\n"
" <n>y = Schl�ssel verf�llt nach n Jahren\n"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1756,29 +1778,29 @@ msgstr ""
" <n>m = Schl�ssel verf�llt nach n Monaten\n"
" <n>y = Schl�ssel verf�llt nach n Jahren\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "Wie lange bleibt der Schl�ssel g�ltig? (0) "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr "Wie lange bleibt die Beglaubigung g�ltig? (0) "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "Ung�ltiger Wert.\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s verf�llt nie.\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr "%s verf�llt am %s\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1786,16 +1808,17 @@ msgstr ""
"Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
"Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
-#: g10/keygen.c:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "Ist dies richtig? (j/n) "
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
+#, fuzzy
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
@@ -1806,44 +1829,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "Ihr Name (\"Vorname Nachname\"): "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "Ung�ltiges Zeichen im Namen\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr "Der Name mu� min. 5 Zeichen lang sein.\n"
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "E-Mail-Adresse: "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "Diese E-Mail-Adresse ist ung�ltig\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "Kommentar: "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "Ung�ltiges Zeichen im Kommentar.\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Sie benutzen den Zeichensatz `%s'\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1854,27 +1877,27 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
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:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "NnKkEeFfBb"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
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:1542
+#: g10/keygen.c:1615
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:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1882,16 +1905,16 @@ msgstr ""
"Sie ben�tigen eine Passphrase, um den geheimen Schl�ssel zu sch�tzen.\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen"
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1904,7 +1927,7 @@ msgstr ""
"aufrufen.\n"
"\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1915,58 +1938,58 @@ 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:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "Das DSA-Schl�sselpaar wird 1024 Bit haben.\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "Schl�sselerzeugung abgebrochen.\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr "schreiben des �ffentlichen Schl�ssels nach '%s'\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kein schreibbarer �ffentlicher Schl�sselbund gefunden: %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "kein schreibbarer geheimer Schl�sselbund gefunden: %s\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "Fehler beim Schreiben des �ff. Schl�sselbundes `%s': %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "Fehler beim Schreiben des geheimen Schl�sselbundes `%s': %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "�ffentlichen und geheimen Schl�ssel erzeugt und signiert.\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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"
@@ -1975,12 +1998,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:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1988,7 +2011,7 @@ msgstr ""
"Der Schl�ssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
"stimmen nicht �berein)\n"
-#: g10/keygen.c:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1996,14 +2019,43 @@ msgstr ""
"Der Schl�ssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
"Uhren stimmen nicht �berein)\n"
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "HINWEIS: Unterschl�ssel f�r v3-Schl�ssen sind nicht OpenPGP-konform\n"
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "Wirklich erzeugen? "
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "l�schen des Schl�sselblocks fehlgeschlagen: %s\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "'%s' kann nicht erzeugt werden: %s\n"
+
+#: g10/keygen.c:3248
+#, fuzzy, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "Hinweis: geheimer Schl�ssel %08lX verf�llt am %s\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "--output funktioniert nicht bei diesem Kommando\n"
@@ -2014,7 +2066,7 @@ msgstr "--output funktioniert nicht bei diesem Kommando\n"
msgid "%s: can't open: %s\n"
msgstr "%s: kann nicht ge�ffnet werden: %s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
@@ -2046,6 +2098,11 @@ msgstr ""
"Im --pgp2-Modus kann nur f�r RSA-Schl�ssel mit maximal 2048 Bit "
"verschl�sselt werden\n"
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -2058,26 +2115,36 @@ msgstr ""
"Die IDEA-Verschl�sselung kann nicht mit allen Zielschl�sseln verwendet "
"werden.\n"
-#: g10/encode.c:526 g10/encode.c:721
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#: g10/encode.c:526
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"Erzwungene Verwendung des symmetrischen Verschl�sselungsverfahren %s (%d) "
"verletzt die Empf�ngervoreinstellungen\n"
-#: g10/encode.c:634 g10/sign.c:863
-#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+#: g10/encode.c:634 g10/sign.c:864
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
msgstr ""
"Erzwungenes Kompressionsverfahren %s (%d) verletzt die "
"Empf�ngervoreinstellungen.\n"
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"Erzwungene Verwendung des symmetrischen Verschl�sselungsverfahren %s (%d) "
+"verletzt die Empf�ngervoreinstellungen\n"
+
#: g10/encode.c:818
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s verschl�sselt f�r: %s\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "Schl�ssel `%s' nicht gefunden: %s\n"
@@ -2111,8 +2178,9 @@ msgstr "WARNUNG: Nichts exportiert\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "zu viele Eintr�ge im pk-Cache - abgeschaltet\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+#, fuzzy
+msgid "[User ID not found]"
msgstr "[User-ID nicht gefunden]"
#: g10/getkey.c:1614
@@ -2270,7 +2338,7 @@ msgstr "Schl�ssel %08lX: HKP Unterschl�sseldefekt repariert\n"
#: g10/import.c:722
#, fuzzy, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "Schl�ssel %08lX: Nicht eigenbeglaubigte User-ID `%s' �bernommen\n"
#: g10/import.c:728
@@ -2297,7 +2365,7 @@ msgstr "Schl�ssel %08lX: neuer Schl�ssel - �bersprungen\n"
msgid "no writable keyring found: %s\n"
msgstr "kein schreibbarer Schl�sselbund gefunden: %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "Schreiben nach '%s'\n"
@@ -2416,14 +2484,14 @@ msgstr "Schl�ssel %08lX: Keine User-ID f�r Signatur\n"
#: g10/import.c:1299
#, fuzzy, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"Schl�ssel %08lX: Nicht unterst�tztes Public-Key-Verfahren f�r User-ID \"%s"
"\"\n"
#: g10/import.c:1301
#, fuzzy, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "Schl�ssel %08lX: Ung�ltige Eigenbeglaubigung f�r User-ID \"%s\"\n"
#: g10/import.c:1319
@@ -2468,7 +2536,7 @@ msgstr ""
#: g10/import.c:1439
#, fuzzy, c-format
-msgid "key %s: skipped user ID '%s'\n"
+msgid "key %s: skipped user ID \"%s\"\n"
msgstr "Schl�ssel %08lX: User-ID �bergangen '"
#: g10/import.c:1460
@@ -2478,7 +2546,7 @@ msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
#: g10/import.c:1487
#, fuzzy, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr ""
"Schl�ssel %08lX: Nicht exportf�hige Unterschrift (Klasse %02x) - �bergangen\n"
@@ -2514,120 +2582,120 @@ msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"WARNUNG: Schl�ssel %08lX ist u.U. widerrufen: hole Widerrufschl�ssel %08lX\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"WARNUNG: Schl�ssel %08lX ist u.U. widerrufen: Widerrufschl�ssel %08lX ist "
"nicht vorhanden\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "Schl�ssel %08lX: \"%s\" Widerrufzertifikat hinzugef�gt\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "Schl�ssel %08lX: \"direct-key\"-Signaturen hinzugef�gt\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[Widerruf]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[Eigenbeglaubigung]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "1 falsche Beglaubigung\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d falsche Beglaubigungen\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "1 Beglaubigung wegen fehlendem Schl�ssel nicht gepr�ft\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d Beglaubigungen wegen fehlenden Schl�sseln nicht gepr�ft\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "1 Beglaubigung aufgrund von Fehler nicht gepr�ft\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d Beglaubigungen aufgrund von Fehlern nicht gepr�ft\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "Eine User-ID ohne g�ltige Eigenbeglaubigung entdeckt\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "%d User-IDs ohne g�ltige Eigenbeglaubigung entdeckt\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, c-format
msgid " (%d) I trust marginally\n"
msgstr " (%d) Ich vertraue ihm marginal\n"
# c-format
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, c-format
msgid " (%d) I trust fully\n"
msgstr " (%d) Ich vertraue ihm vollst�ndig\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
"Geben Sie bitte die Tiefe dieser \"Trust\"-Unterschrift ein.\n"
-"Eine Tiefe gr��er 1 erlaubt dem zu unterschreibenden Schl�ssel\n"
+"Eine Tiefe gr���er 1 erlaubt dem zu unterschreibenden Schl�ssel\n"
"Trust-Signatures f�r Sie zu machen.\n"
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
"Geben Sie bitte eine Domain ein, um die Unterschrift einzuschr�nken,\n"
"oder nur die Eingabetaste f�r keine Domain\n"
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "User-ID \"%s\" ist widerrufen."
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Wollen Sie ihn immmer noch beglaubigen? (j/N) "
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr " Beglaubigen ist nicht m�glich.\n"
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "User-ID \"%s\" ist abgelaufen."
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "User-ID \"%s\" ist nicht eigenbeglaubigt."
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2636,11 +2704,11 @@ msgstr ""
"Die Eigenbeglaubigung von \"%s\"\n"
"ist eine PGP 2.x artige Signatur.\n"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Soll sie zu einer OpenPGP Eigenbeglaubigung ge�ndert werden? (j/N) "
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2649,13 +2717,13 @@ msgstr ""
"Ihre derzeitige Beglaubigung von \"%s\"\n"
"ist abgelaufen.\n"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Soll eine neue Beglaubigung als Ersatz f�r die abgelaufene erstellt werden? "
"(J/n) "
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2664,44 +2732,44 @@ msgstr ""
"Die derzeitige Beglaubigung von \"%s\"\n"
"ist nur f�r diesen Rechner g�ltig.\n"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
"Soll sie zu einer voll exportierbaren Beglaubigung erhoben werden? (j/N) "
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" wurde bereits durch Schl�ssel %08lX lokal beglaubigt\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" wurde bereits durch Schl�ssel %08lX beglaubigt\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Wollen Sie ihn immmer noch wieder beglaubigen? (j/N) "
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nichts zu beglaubigen f�r Schl�ssel %08lX\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "Dieser Schl�ssel ist verfallen!"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Dieser Schl�ssel wird %s verfallen.\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Soll Ihre Beglaubigung zur selben Zeit verfallen? (J/n) "
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
@@ -2709,11 +2777,11 @@ msgstr ""
"Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schl�sseln unterschrieben "
"werden\n"
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "Dies w�rde den Schl�ssel f�r PGP 2.x unbrauchbar machen\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2723,32 +2791,32 @@ msgstr ""
"wollen, wirklich der o.g. Person geh�rt?\n"
"Wenn Sie darauf keine Antwort wissen, geben Sie \"0\" ein.\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Ich antworte nicht.%s\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Ich habe es �berhaupt nicht �berpr�ft.%s\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Ich habe es fl�chtig �berpr�ft.%s\n"
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Ich habe es sehr sorgf�ltig �berpr�ft.%s\n"
# translated by wk
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr "Ihre Auswahl? ('?' f�r weitere Informationen): "
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2756,7 +2824,7 @@ msgstr ""
"Sind Sie wirklich sicher, da� Sie vorstehenden Schl�ssel mit Ihrem\n"
"Schl�ssel beglaubigen wollen: \""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2764,7 +2832,7 @@ msgstr ""
"\n"
"Dies wird eine Eigenbeglaubigung sein.\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2773,7 +2841,7 @@ msgstr ""
"WARNUNG: Die Unterschrift wird nicht als nicht-exportierbar markiert "
"werden.\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2781,7 +2849,7 @@ msgstr ""
"\n"
"Die Unterschrift wird nicht als nicht-widerrufbar markiert werden.\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2789,7 +2857,7 @@ msgstr ""
"\n"
"Die Unterschrift wird als nicht exportf�hig markiert werden.\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2797,7 +2865,7 @@ msgstr ""
"\n"
"Die Unterschrift wird als nicht exportf�hig markiert werden.\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2805,7 +2873,7 @@ msgstr ""
"\n"
"Ich habe diesen Schl�ssel �berhaupt nicht �berpr�ft.\n"
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2813,7 +2881,7 @@ msgstr ""
"\n"
"Ich habe diesen Schl�ssel fl�chtig �berpr�ft.\n"
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2821,34 +2889,34 @@ msgstr ""
"\n"
"Ich habe diesen Schl�ssel sehr sorgf�ltig �berpr�ft.\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "Wirklich unterschreiben? "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "Beglaubigung fehlgeschlagen: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "Dieser Schl�ssel ist nicht gesch�tzt.\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr "Geheime Teile des Haupschl�ssels sind nicht vorhanden\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "Schl�ssel ist gesch�tzt.\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Dieser Schl�ssel kann nicht editiert werden: %s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2856,7 +2924,7 @@ msgstr ""
"Geben Sie die neue Passphrase f�r diesen geheimen Schl�ssel ein.\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2864,543 +2932,565 @@ msgstr ""
"Sie wollen keine Passphrase - dies ist *nicht* zu empfehlen!\n"
"\n"
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "M�chten Sie dies wirklich tun? "
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "Men� verlassen"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "q"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "save"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "speichern und Men� verlassen"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "help"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "Diese Hilfe zeigen"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "\"Fingerabdruck\" anzeigen"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "Liste der Schl�ssel"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "Schl�ssel und User-IDs auflisten"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "User-ID N ausw�hlen"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "key"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "Zweitschl�ssel N ausw�hlen"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "check"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "Liste der Signaturen"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "c"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "Den Schl�ssel signieren"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "s"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
msgid "tsign"
msgstr "tsign"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
msgid "make a trust signature"
msgstr "Eine Trust-Unterschrift erzeugen"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "Den Schl�ssel nur f�r diesen Rechner beglaubigen"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr "Den Schl�ssel nicht-widerrufbar beglaubigen"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "sign the key locally and non-revocably"
msgstr "Den Schl�ssel nicht-widerrufbar und nur f�r diesen Rechner signieren"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "Eine User-ID hinzuf�gen"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr "addphoto"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr "Eine Foto-ID hinzuf�gen"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "User-ID entfernen"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr "delphoto"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "Einen Zweitschl�ssel hinzuf�gen"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+#, fuzzy
+msgid "addcardkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "Einen Zweitschl�ssel entfernen"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "addrevoker"
msgstr "addrevoker"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "add a revocation key"
msgstr "Einen Widerrufschl�ssel hinzuf�gen"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "Signatur entfernen"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "�ndern des Verfallsdatums"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr "primary"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr "User-ID als Haupt-User-ID kennzeichnen"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "Umschalten zwischen Anzeige geheimer und �ffentlicher Schl�ssel"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "t"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr "Liste der Voreinstellungen (f�r Experten)"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr "Liste der Voreinstellungen (ausf�hrlich)"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr "Liste der Voreinstellungen einstellen"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr "ge�nderte Voreinstellungen"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "keyserver"
msgstr "Schl�sselserverfehler"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "set preferred keyserver URL"
msgstr "Schl�sselserver-URI konnte nicht zerlegt werden\n"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "Die Passphrase �ndern"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "Den \"Owner trust\" �ndern"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "Signaturen widerrufen"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revuid"
msgstr "revuid"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revoke a user ID"
msgstr "Eine User-ID widerrufen"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "Einen Zweitschl�ssel widerrufen"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "Schl�ssel abschalten"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "Schl�ssel anschalten"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr "showphoto"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr "Foto-ID anzeigen"
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "Fehler beim Lesen des geheimen Schl�sselblocks `%s': %s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "Geheimer Schl�ssel ist vorhanden.\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "Befehl> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "Hierzu wird der geheime Schl�ssel ben�tigt.\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr "Bitte verwenden sie zun�chst den Befehl \"toggle\"\n"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
msgid "Key is revoked."
msgstr "Schl�ssel wurde widerrufen."
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "Wirklich alle User-IDs beglaubigen? "
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "Tip: W�hlen Sie die User-IDs, die beglaubigt werden sollen\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Dieses Kommando ist im %s-Modus nicht erlaubt.\n"
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "Zumindestens eine User-ID mu� ausgew�hlt werden.\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "Die letzte User-ID kann nicht gel�scht werden!\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich entfernen? "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "Diese User-ID wirklich entfernen? "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+#, fuzzy
+msgid "Really move the primary key? "
+msgstr "Diese User-ID wirklich entfernen? "
+
+#: g10/keyedit.c:1598
+#, fuzzy
+msgid "You must select exactly one key.\n"
+msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich entfernen? "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "M�chten Sie diesen Schl�ssel wirklich entfernen? "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
msgid "Really revoke all selected user IDs? "
msgstr "M�chten Sie wirklich alle ausgew�hlten User-IDs widerrufen? "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
msgid "Really revoke this user ID? "
msgstr "Diese User-ID wirklich widerrufen? "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich widerrufen? "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "M�chten Sie diesen Schl�ssel wirklich wiederrufen? "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
#, fuzzy
msgid "Set preference list to:\n"
msgstr "Liste der Voreinstellungen einstellen"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr ""
"M�chten Sie die Voreinstellungen der ausgew�hlten User-IDs wirklich �ndern? "
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr "Die Voreinstellungen wirklich �ndern? "
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "�nderungen speichern? "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "Beenden ohne zu speichern? "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "�nderung fehlgeschlagen: %s\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "�nderung des Geheimnisses fehlgeschlagen: %s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "Schl�ssel ist nicht ge�ndert worden, also ist kein Speichern n�tig.\n"
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr "Digest: "
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr "Eigenschaften: "
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr "Keyserver no-modify"
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keyedit.c:2219
#, c-format
msgid "This key may be revoked by %s key "
msgstr "Dieser Schl�ssel k�nnte widerrufen worden sein von %s Schl�ssel "
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr "(empfindlich)"
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "%s kann nicht erzeugt werden: %s\n"
-#: g10/keyedit.c:2084
-#, fuzzy, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
msgstr "[widerrufen]"
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
-msgstr " [verf�llt: %s]"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
+msgstr "expire"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2246
#, fuzzy, c-format
-msgid "expires: %s"
-msgstr " [verf�llt: %s]"
+msgid "usage: %s"
+msgstr " Vertrauen: %c/%c"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, fuzzy, c-format
msgid "trust: %s"
msgstr " Vertrauen: %c/%c"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr "G�ltigkeit: %s"
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "Hinweis: Dieser Schl�ssel ist abgeschaltet"
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! Unterschl�ssel wurde widerrufen: %s\n"
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
-msgstr "rev- gef�lschter Schl�sselwiderruf entdeckt\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? Schwierigkeiten bei der Widerruf-�berpr�fung: %s\n"
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-#, fuzzy
-msgid "revoked"
-msgstr "[widerrufen]"
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-#, fuzzy
-msgid "expired"
-msgstr "expire"
+#: g10/keyedit.c:2300
+msgid "card-no: "
+msgstr ""
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x-artige Schl�ssel haben keine Voreinstellungen.\n"
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3408,16 +3498,8 @@ msgstr ""
"Bitte beachten Sie, da� ohne einen Programmneustart die angezeigte\n"
"Schl�sselg�ltigkeit nicht notwendigerweise korrekt ist.\n"
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-msgid "[revoked] "
-msgstr "[widerrufen]"
-
-#: g10/keyedit.c:2274
-msgid "[expired] "
-msgstr "[verfallen]"
-
# translated by wk
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@ -3425,7 +3507,7 @@ msgstr ""
"WARNUNG: Keine User-ID ist als prim�r markiert. Dieses Kommando kann\n"
"dazu f�hren, da� eine andere User-ID as prim�r angesehen wird.\n"
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3435,45 +3517,45 @@ msgstr ""
"k�nnte\n"
" bei einigen PGP-Versionen zur Zur�ckweisung des Schl�ssels f�hren.\n"
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Wollen Sie ihn immmer noch hinzuf�gen? (j/N) "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
-msgstr "Sie k�nnen einem PGP2-artigen Schl��sel keine Foto-ID hinzuf�gen.\n"
+msgstr "Sie k�nnen einem PGP2-artigen Schl���sel keine Foto-ID hinzuf�gen.\n"
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Diese ung�ltige Beglaubigung entfernen= (j/N/q)"
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d Beglaubigungen entfernt.\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d Beglaubigungen entfernt.\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "Nichts entfernt.\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3483,95 +3565,105 @@ msgstr ""
" Widerrufers k�nnte bei einigen PGP-Versionen zur Zur�ckweisung\n"
" des Schl�ssels f�hren.\n"
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
-"Sie k�nnen einem PGP2-artigen Schl��sel keine vorgesehenen Widerrufer "
+"Sie k�nnen einem PGP2-artigen Schl���sel keine vorgesehenen Widerrufer "
"hinzuf�gen.\n"
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
msgid "Enter the user ID of the designated revoker: "
msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"Ein PGP 2.x-artiger Schl�ssel kann nicht als vorgesehener Widerrufer "
"eingetragen werden\n"
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "Ein Schl�ssel kann nicht sein eigener vorgesehener Widerrufer werden\n"
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
msgid "this key has already been designated as a revoker\n"
msgstr "Dieser Schl�ssel wurde bereits als ein Widerrufer vorgesehen\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"WARNUNG: Einen Schl�ssel als vorgesehenen Widerrufer zu deklarieren, kann "
"nicht r�ckgangig gemacht werden!\n"
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr ""
"M�chten Sie diesen Schl�ssel wirklich als vorgesehenen Widerrufer "
"deklarieren? (j/N): "
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schl�sseln.\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "Bitte w�hlen Sie h�chstens einen Zweitschl�ssel aus.\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "�ndern des Verfallsdatums des Zweitschl�ssels.\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "�ndern des Verfallsdatums des Hauptschl�ssels.\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Sie k�nnen das Verfallsdatum eines v3-Schl�ssels nicht �ndern\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
msgid "Please select exactly one user ID.\n"
msgstr "Bitte genau eine User-ID ausw�hlen.\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
-#, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "�berspringen der v3 Eigenbeglaubigung von User-ID \"%s\"\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+#, fuzzy
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "Wollen Sie es wirklich benutzen? (j/N) "
+
+#: g10/keyedit.c:3480
+#, fuzzy
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "Wollen Sie es wirklich benutzen? (j/N) "
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "Keine User-ID mit Index %d\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Kein Zweitschl�ssel mit Index %d\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "User-ID: \""
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3580,7 +3672,7 @@ msgstr ""
"\"\n"
"unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3589,144 +3681,128 @@ msgstr ""
"\"\n"
"lokal unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Diese Unterschrift ist seit %s verfallen.\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Wollen Sie ihn immmer noch widerrufen? (j/N) "
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Ein Widerrufszertifikat f�r diese Unterschrift erzeugen (j/N)"
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "Sie haben folgende User-IDs beglaubigt:\n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid " signed by %s on %s%s%s\n"
msgstr " beglaubigt durch %08lX um %s%s%s\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid " revoked by %s on %s\n"
msgstr " widerrufen durch %08lX um %s\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, fuzzy, c-format
msgid " signed by %s on %s%s\n"
msgstr " beglaubigt durch %08lX am %s%s\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr " (nicht-exportierbar)"
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
msgid "Really create the revocation certificates? (y/N) "
msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "Kein geheimer Schl�ssel\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "User-ID \"%s\" ist bereits widerrufen\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"WARNUNG: Eine User-ID-Unterschrift datiert mit %d Sekunden aus der Zukunft\n"
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Anzeigen einer %s Photo ID (%ld Byte) f�r Schl�ssel %08lX (User-ID %d)\n"
-#: g10/keylist.c:179
+#: g10/keylist.c:180
msgid "Critical signature policy: "
msgstr "Krititische Beglaubigungsrichtlinie: "
-#: g10/keylist.c:181
+#: g10/keylist.c:182
msgid "Signature policy: "
msgstr "Beglaubigungsrichtlinie: "
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "WARNUNG: Ung�ltige \"Notation\"-Daten gefunden\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
msgid "Critical signature notation: "
msgstr "Krititische Beglaubigungs-\"Notation\": "
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr "Beglaubigungs-\"Notation\": "
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr "nicht als Klartext darstellbar"
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr "Schl�sselbund"
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr " [verf�llt: %s]"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr " [verf�llt: %s]"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, fuzzy, c-format
-msgid " [revoked: %s]"
-msgstr "[widerrufen]"
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
msgid "Primary key fingerprint:"
msgstr "Haupt-Fingerabdruck ="
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
msgid " Subkey fingerprint:"
msgstr "Unter-Fingerabdruck ="
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
msgid " Primary key fingerprint:"
msgstr " Haupt-Fingerabdruck ="
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
msgid " Subkey fingerprint:"
msgstr " Unter-Fingerabdruck ="
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr " Schl.-Fingerabdruck ="
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3938,79 +4014,79 @@ msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "core-dump-Dateierzeugung kann nicht abgeschaltet werden: %s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "Experimentiermethoden sollten nicht benutzt werden!\n"
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr "Es ist davon abzuraten, diese Verschl�sselungsmethode zu benutzen!\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr "das IDEA-Verschl�sselungs-Plugin ist nicht vorhanden\n"
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr "F�r weitere Info siehe http://www.gnupg.org/why-not-idea.html\n"
-#: g10/misc.c:491
+#: g10/misc.c:517
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: mi�billigte Option \"%s\".\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "WARNUNG: \"%s\" ist eine mi�billigte Option.\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "Bitte benutzen Sie stattdessen \"%s%s\".\n"
-#: g10/misc.c:508
+#: g10/misc.c:534
msgid "Uncompressed"
msgstr "nicht komprimiert"
-#: g10/misc.c:533
+#: g10/misc.c:559
#, fuzzy
msgid "uncompressed|none"
msgstr "nicht komprimiert"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "Diese Botschaft k�nnte f�r %s unbrauchbar sein\n"
-#: g10/misc.c:777
+#: g10/misc.c:826
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "Optionen werden aus '%s' gelesen\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "Unbekannter voreingestellter Empf�nger '%s'\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"WARNUNG: M�glicherweise unsicherer symmetrisch verschl�sselter "
"Sitzungsschl�ssel\n"
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
@@ -4049,7 +4125,7 @@ msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "Kommunikationsproblem mit GPG-Agent\n"
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr ""
"Schwierigkeiten mit dem Agenten - Agent-Ansteuerung wird abgeschaltet\n"
@@ -4067,7 +4143,7 @@ msgid ""
"%u-bit %s key, ID %08lX, created %s%s\n"
msgstr ""
"Sie ben�tigen eine Passphrase, um den geheimen Schl�ssel zu entsperren.\n"
-"Benutzer: \"\"%.*s\"\n"
+"Benutzer: \"%.*s\"\n"
"%u-bit %s Schl�ssel, ID %08lX, erzeugt %s%s\n"
#: g10/passphrase.c:713
@@ -4086,24 +4162,24 @@ msgstr "Passphrase ist zu lang\n"
msgid "invalid response from agent\n"
msgstr "Falsche Antwort des Agenten\n"
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "Abbruch durch Benutzer\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "Schwierigkeiten mit dem Agenten: Agent antwortet 0x%lx\n"
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "Passphrase kann im Batchmodus nicht abgefragt werden\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "Geben Sie die Passphrase ein: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4113,22 +4189,22 @@ msgstr ""
"Sie ben�tigen eine Passphrase, um den geheimen Schl�ssel zu entsperren.\n"
"Benutzer: \""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-Bit %s Schl�ssel, ID %08lX, erzeugt %s"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (Hauptschl�ssel-ID %08lX)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "Geben Sie die Passphrase nochmal ein: "
@@ -4370,28 +4446,39 @@ msgstr ""
"Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schl�sseln eine abgetrennte "
"Unterschrift erzeugt werden\n"
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
-msgstr "%s kann nicht erzeugt werden: %s\n"
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
+msgstr "'%s' kann nicht erzeugt werden: %s\n"
-#: g10/sign.c:794
-#, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+#: g10/sign.c:771 g10/sign.c:1008
+#, fuzzy, c-format
+msgid "writing to file `%s'\n"
+msgstr "Schreiben nach '%s'\n"
+
+#: g10/sign.c:795
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"Erzwingen des Hashverfahrens %s (%d) verletzt die Empf�ngervoreinstellungen\n"
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr "unterschreibe:"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "Datei kann nicht ge�ffnet werden: %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
"Im --pgp2-Modus k�nnen Sie Klartextunterschriften nur mit PGP-2.x-artigen "
"Schl�ssel machen\n"
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s Verschl�sselung wird verwendet\n"
@@ -4799,7 +4886,7 @@ msgstr ""
"Trotz %d-fachen Versuch konnte die Erzeugung eines unsicheren Schl�ssels f�r "
"sym.Verschl�sselung nicht vermieden werden!\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA ben�tigt einen 160-bit Hash Algorithmus\n"
@@ -5188,17 +5275,17 @@ msgstr "Keine Hilfe vorhanden."
msgid "No help available for `%s'"
msgstr "Keine Hilfe f�r '%s' vorhanden."
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "Fehler beim Erzeugen des Schl�sselbundes `%s': %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr "Schl�sselbund `%s' erstellt\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "Schl�sselbund-Cache konnte nicht neu erzeugt werden: %s\n"
@@ -5242,8 +5329,7 @@ msgid "%s: keyring created\n"
msgstr "%s: Schl�sselbund erstellt\n"
# translated by wk
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5255,32 +5341,37 @@ msgstr ""
"W�hlen Sie ein Bild f�r Ihre Photo ID aus. Das Bild mu� eine JPEG Datei\n"
"sein. Bitte beachten Sie, da� das Bild in Ihrem �ffentlichen\n"
"Schl�ssel gespeichert wird. Wenn Sie ein sehr gro�es Bild benutzen,\n"
-"wir Ihr Schl�ssel leider auch sehr gro� werden. Ein Bild der Gr��e\n"
+"wir Ihr Schl�ssel leider auch sehr gro� werden. Ein Bild der Gr���e\n"
"240x288 Pixel ist eine gute Wahl.\n"
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr "Dateiname mit JPEG f�r die Photo ID eingeben: "
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "Das Bild \"%s\" konnte nicht ge�ffnet werden: %s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
msgid "Are you sure you want to use it (y/N)? "
msgstr "Wollen Sie es wirklich benutzen? (j/N) "
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr "`%s' ist keine JPEG Datei\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Is this photo correct (y/N/q)? "
msgstr "Ist dieses Bild richtig? (j/N) "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
msgid "unable to display photo ID!\n"
msgstr "Die Photo ID kann nicht angezeigt werden!\n"
@@ -5301,46 +5392,52 @@ msgstr ""
"nicht sicher sind\n"
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
+#, fuzzy
+msgid "this platform requires temporary files when calling external programs\n"
msgstr ""
"Diese Plattform ben�tigt tempor�re Dateien zur Ausf�hrung von externen\n"
"Programmen\n"
-#: g10/exec.c:432
-#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
+msgstr "Ausf�hren von %s \"%s\" nicht m�glich: %s\n"
+
+#: g10/exec.c:436
+#, fuzzy, c-format
+msgid "unable to execute shell `%s': %s\n"
msgstr "Ausf�hren von %s \"%s\" nicht m�glich: %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:515
#, c-format
msgid "system error while calling external program: %s\n"
msgstr "Fehler beim Aufruf eines externen Programms: %s\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr "ungew�hnliches Ende eines externen Programms\n"
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr "Externes Programm konnte nicht aufgerufen werden\n"
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr "Die Ausgabe des externen Programms konnte nicht gelesen werden: %s\n"
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr ""
"WARNUNG: die tempor�re Datei (%s) `%s' konnte nicht entfernt werden: %s\n"
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "WARNUNG: Tempor�res Verzeichnis `%s' kann nicht entfernt werden: %s\n"
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr "niemals "
@@ -5499,6 +5596,47 @@ msgstr "Fehler beim Suchen des \"Trust records\": %s\n"
msgid "read error: %s\n"
msgstr "Lesefehler: %s\n"
+#, fuzzy
+#~ msgid "revoked: %s"
+#~ msgstr "[widerrufen]"
+
+#, fuzzy
+#~ msgid "expired: %s"
+#~ msgstr " [verf�llt: %s]"
+
+#, fuzzy
+#~ msgid "expires: %s"
+#~ msgstr " [verf�llt: %s]"
+
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "rev! Unterschl�ssel wurde widerrufen: %s\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "rev- gef�lschter Schl�sselwiderruf entdeckt\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "rev? Schwierigkeiten bei der Widerruf-�berpr�fung: %s\n"
+
+#~ msgid "[revoked] "
+#~ msgstr "[widerrufen]"
+
+#~ msgid "[expired] "
+#~ msgstr "[verfallen]"
+
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr " [verf�llt: %s]"
+
+#~ msgid " [expires: %s]"
+#~ msgstr " [verf�llt: %s]"
+
+#, fuzzy
+#~ msgid " [revoked: %s]"
+#~ msgstr "[widerrufen]"
+
+#~ msgid "can't create %s: %s\n"
+#~ msgstr "%s kann nicht erzeugt werden: %s\n"
+
# translated by wk
#~ msgid ""
#~ "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n"
diff --git a/po/el.po b/po/el.po
index ad12bc6c5..060a84275 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.1.92\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
"PO-Revision-Date: 2003-06-27 12:00+0200\n"
"Last-Translator: Dokianakis Theofanis <[email protected]>\n"
"Language-Team: Greek <[email protected]>\n"
@@ -46,7 +46,7 @@ msgstr "���|���"
msgid "nN"
msgstr "nN"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "�����������"
@@ -279,6 +279,16 @@ msgstr "�� ��������������� ������� ������"
msgid "keyserver error"
msgstr "������ ���������� ��������"
+#: util/errors.c:108
+#, fuzzy
+msgid "canceled"
+msgstr "�������"
+
+#: util/errors.c:109
+#, fuzzy
+msgid "no card"
+msgstr "�� ���������������"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr ""
@@ -301,7 +311,7 @@ msgstr "������� ��� bug ... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "��� ����������� ������� �������� ���������\n"
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "�������� ��������� ��� `%s': %s\n"
@@ -335,7 +345,7 @@ msgstr "�������� ��������� ��� `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "��������: ��� ���� ��������� �� ������ random_seed\n"
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr "�������� ����������� ��� `%s': %s\n"
@@ -404,7 +414,7 @@ msgstr "�������� ��������� ������ ������� �� �������� ��� %d bits\n"
msgid "can't generate a prime with less than %d bits\n"
msgstr "�������� ��������� ������ ������� �� �������� ��� %d bits\n"
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -412,128 +422,128 @@ msgstr ""
"@�������:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[������]|���������� ���� ���������"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[������]|���������� ���� �� ���������������� ���������"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "���������� ���� �� ������������� ���������"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "������������� ���������"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "������������� �� ����� ���� ����������� ����������"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "���������������� ��������� (��������������)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "���������� ���� ���������"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "���������� ��� ������ ��������"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "���������� ��� ������ �������� ��� ���������"
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "������� ��������� ��������"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "���������� ��� ������ �������� ��������"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "���������� ���� ���� ������� ��������"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "�������� ��� �������� ��� �� ������� ����������"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "�������� ��� �������� ��� �� ������� ����������"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "�������� ���� ��������"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "�������� ���� �������� ������"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "�������� � ����������� ���� ��������"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "���������� ���� �������������� ���������"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "������� ��������"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "������� �������� �� ��� ���������� ��������"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "�������� �������� ��� ��� ���������� ��������"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "��������� �������� �� ��� ���������� ��������"
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "�������� ���� ��� �������� ��� ��� ���������� ��������"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "��������/���������� ��������"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "�������� ��� ����� ��������� ������������"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|����� [������]| ���������� ���������� ��� ���������"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -543,55 +553,51 @@ msgstr ""
"��������:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "���������� ascii ������������ ������"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|�����|������������� ��� �����"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr "|N|���������� �������� ��������� N (0 �������������)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "����� ��������� ���������� ��������"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "����� �� ������� ������"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "���������"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "�� �� ����� ������ ������"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "������� ���� ��� ���������"
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -599,7 +605,7 @@ msgstr ""
"@\n"
"(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -619,15 +625,15 @@ msgstr ""
" --list-keys [�������] ���������� ��������\n"
" --fingerprint [�������] ���������� ������������ (fingerprints)\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr "��������� �� ���������� ��� <[email protected]>\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "�����: gpg [��������] [������] (-h ��� �������)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -637,7 +643,7 @@ msgstr ""
"��������, �������, ������������� � ����������������\n"
"� �������������� ���������� ��������� ��� �� �������� �������\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -645,481 +651,475 @@ msgstr ""
"\n"
"��������������� ����������:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr "�����������:"
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr "���������������: "
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr "Hash: "
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
msgid "Compression: "
msgstr "��������: "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "�����: gpg [��������] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "������������� �������\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr ""
"�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
"�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
-#: g10/g10.c:1205
+#: g10/g10.c:1210
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
-#: g10/g10.c:1334
-#, c-format
-msgid "unknown configuration item \"%s\"\n"
+#: g10/g10.c:1354
+#, fuzzy, c-format
+msgid "unknown configuration item `%s'\n"
msgstr "������� ����������� ��������� \"%s\"\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "��������: �� �������������� ������ �������� `%s'\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "������ �������� `%s': %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "�������� �������� ��� `%s'\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
-#: g10/g10.c:1887
-#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+#: g10/g10.c:2021
+#, fuzzy, c-format
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr ""
"� �������� ��� ��������������� \"%s\" ��� ��������� ������ ��������\n"
"���������� ������\n"
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "�� ������� �������� ��������\n"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: �� ������� �������� ���������\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
msgid "invalid import options\n"
msgstr "�� ������� �������� ���������\n"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
msgid "invalid export options\n"
msgstr "�� ������� �������� ��������\n"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: �� ������� �������� ���������\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "�� ������� �������� ���������\n"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "�� ������� �������� ��������\n"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "�������� ������� ��� exec-path �� %s\n"
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "�������������: �� %s ����������� �� %s\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "�� %s ��� ����������� �� �� %s!\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
"��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
"���������\n"
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
"� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
msgid "selected certification digest algorithm is invalid\n"
msgstr ""
"� ����������� ���������� ��������� ��� �����������\n"
"��� ����� �������\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth ������ �� ����� ������ 1 ��� 255\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "�� ������ default-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
msgid "invalid default preferences\n"
msgstr "�� ������� �����������\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
msgid "invalid personal cipher preferences\n"
msgstr "�� ������� ����������� ���������� ���������������\n"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
msgid "invalid personal digest preferences\n"
msgstr "�� ������� ����������� ���������� ���������� ���������\n"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
msgid "invalid personal compress preferences\n"
msgstr "�� ������� ����������� ���������� ���������� ���������\n"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
-#: g10/g10.c:2680
-#, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2797
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
-#: g10/g10.c:2685
-#, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2802
+#, fuzzy, c-format
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr ""
"����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
-#: g10/g10.c:2690
-#, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2807
+#, fuzzy, c-format
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr ""
"����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "�������� ������������� ��� TrustDB: %s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"�������������: ������� ���������� (-r) ����� ����� ��������������\n"
"�������� ��������\n"
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [����� �������]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [����� �������]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [����� �������]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [����� �������]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [����� �������]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [����� �������]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [����� �������]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [����� �������]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [����� �������]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [����� �������]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrsign-key user-id"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key user-id"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [�������]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "�������� ��������� ��� %s: %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [user-id] [����������]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "keyserver �������� �������: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "keyserver ���� �������: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, c-format
msgid "key export failed: %s\n"
msgstr "������� �������� �������: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "keyserver ��������� �������: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "keyserver �������� �������: %s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "����������� �������: %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "�������� �������: %s\n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "�� ������� ���������� hash `%s'\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[����� �������]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "�������� ��������� ��� `%s'\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@ -1127,48 +1127,48 @@ msgstr ""
"��� ����� ��������� ������ �� �������� ���� ������������ ���������� ��� ���� "
"��� �� ����� �� ��� '='\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
msgid "a user notation name must contain the '@' character\n"
msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "� ���� ��������� ������ �� �� ������������ ���������� control\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
-#: g10/g10.c:3747
+#: g10/g10.c:3863
#, fuzzy
-msgid "the given signature preferred keyserver URL is invalid\n"
+msgid "the given preferred keyserver URL is invalid\n"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "����� ������"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
msgid "take the keys from this keyring"
msgstr "������� ��� �������� ��� ���� �� ����������"
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
msgid "make timestamp conflicts only a warning"
msgstr "������� ��� ����������� ���� (timestamp) ���� ��� �������������"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr "|FD|������� ��� ����������� ���������� ��� FD"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "�����: gpgv [��������] [������] (-h ��� �������)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1202,12 +1202,13 @@ msgid "invalid dash escaped line: "
msgstr "�� ������ dash escaped ������: "
#: g10/armor.c:565
-msgid "unexpected armor:"
+#, fuzzy
+msgid "unexpected armor: "
msgstr "�� ����������� ��������:"
-#: g10/armor.c:695 g10/armor.c:1276
-#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+#: g10/armor.c:695 g10/armor.c:1280
+#, fuzzy, c-format
+msgid "invalid radix64 character %02X skipped\n"
msgstr "�� ������� radix64 ���������� %02x ���������\n"
#: g10/armor.c:738
@@ -1218,33 +1219,34 @@ msgstr "������ ����� ������� (������� CRC)\n"
msgid "premature eof (in CRC)\n"
msgstr "������ ����� ������� (����� CRC)\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "����� ����� CRC\n"
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "������ CRC: %06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+#, fuzzy
+msgid "premature eof (in trailer)\n"
msgstr "������ ����� ������� (��� �railer)\n"
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "������ ��� ������ trailer\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "�� �������� ������ OpenPGP ��������.\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "�� ������ ��������: � ������ ����� ���� ��� %d ����������\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1300,7 +1302,7 @@ msgstr " ������ ��� \""
msgid " aka \""
msgstr " ������ ��� \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1557,96 +1559,116 @@ msgstr "%s: ������������: �� ������� ������ ���� ���������������.\n"
msgid "no valid addressees\n"
msgstr "������ ������ ���������\n"
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "� ���������� %c%lu ������������\n"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "���� ������ `%c' �����������\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
#, fuzzy
msgid "too many digest preferences\n"
msgstr "���� ������ `%c' �����������\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
#, fuzzy
msgid "too many compression preferences\n"
msgstr "���� ������ `%c' �����������\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
msgid "writing direct signature\n"
msgstr "������� ������ ���������\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "������� ����-���������\n"
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "������� ��������� \"�������\" ��������\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "�� ������ ������� ��������, ����� %u bits\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "��������������� ��� ������� �������� ��� %u bits\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA ��� ElGamal (��������������)\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (��� �������� ����)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (��� ������������� ����)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (��� �������� ����)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (��� ������������� ����)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (�������� ��� �������������)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, fuzzy, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) RSA (��� �������� ����)\n"
+
+#: g10/keygen.c:1224
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) RSA (�������� ��� �������������)\n"
+
+#: g10/keygen.c:1226
+#, fuzzy, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) RSA (��� ������������� ����)\n"
+
+#: g10/keygen.c:1228
+#, fuzzy, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) RSA (�������� ��� �������������)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "� ������� ���; "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "�� ������ �������.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1659,33 +1681,33 @@ msgstr ""
" �������������� ������� �������� ����� 1024 bits\n"
" ������� ������������ ������� �������� ����� 2048 bits\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "�� ������� �������� �� ������; (1024) "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "� DSA ��������� ���� ������� �������� ��� 512 ��� 1024\n"
-#: g10/keygen.c:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr ""
"�� ������� �������� ����� ���� �����, 1024 ����� � �������� ���� ��� RSA.\n"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr ""
"�� ������� �������� ����� ���� �����, 768 ����� � �������� ������������ "
"����.\n"
-#: g10/keygen.c:1255
+#: g10/keygen.c:1328
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr ""
"�� ������� �������� ����� ���� ������, %d ����� � ������� ���� ��� "
"�����������.\n"
-#: g10/keygen.c:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1693,11 +1715,11 @@ msgstr ""
"������ �������� ���������� ��� 2048 ��� ����������� �����\n"
"�� ����������� ����� ����������!\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "������� ������ ���� �� ������� ��������; "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1705,17 +1727,17 @@ msgstr ""
"�������, ���� �� ����� ��'��� ��� � ����� ��� �� ������������ �����\n"
"������ ���� ����� �� ���������!\n"
-#: g10/keygen.c:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "�� ������� �������� ��� �������� ����� %u bits\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "����������������� ��� �� %u bits\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1731,7 +1753,7 @@ msgstr ""
" <n>m = �� ������ ����� �� n �����\n"
" <n>y = �� ������ ����� �� n ���\n"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1747,29 +1769,29 @@ msgstr ""
" <n>m = �� ������ ����� �� n �����\n"
" <n>y = �� ������ ����� �� n ���\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "�� ������ ����� ������ ���; (0) "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr "� �������� ����� ������ ���; (0) "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "�� ������ ����\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr "�� %s ��� ����� ����\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr "�� %s ����� ���� %s\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1777,16 +1799,17 @@ msgstr ""
"�� ������� ��� ��� ������ �� ����������� ����������� ���� ��� 2038.\n"
"����, �� ����������� ����� ��� �� 2106.\n"
-#: g10/keygen.c:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "����� ���� ����� (y/n); "
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
+#, fuzzy
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
@@ -1797,44 +1820,44 @@ msgstr ""
" \"Nikolaoy Nikos (toy Ioanni) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "������� �����: "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "�� ������� ���������� ��� �����\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr "�� ����� ��� ����������� �� ������ �� ���������� �����\n"
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr "�� ����� ������ �� ���� ����������� 5 ����������\n"
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "��������� Email: "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "�� ������ ��������� Email\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "������: "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "�� ������� ���������� ��� ������\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "�������������� �� `%s' ��� ����������.\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1845,27 +1868,27 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
-#: g10/keygen.c:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "������ (N)�����, (C)������, (E)mail � (Q)�����������; "
-#: g10/keygen.c:1542
+#: g10/keygen.c:1615
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "������ (N)�����, (C)������, (E)mail � (O)�������/(Q)�����������; "
-#: g10/keygen.c:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr "��������, ��������� ����� �� ������\n"
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1873,16 +1896,16 @@ msgstr ""
"���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1894,7 +1917,7 @@ msgstr ""
"����� ������, �� ��� ������� \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1906,58 +1929,58 @@ msgstr ""
"���� �������) ���� �� �������� ����������� ������ �������. ���� �����\n"
"��� ��������� ������� ������� ��� �������� �� ������� ������ ��������.\n"
-#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr "�������, ��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "�� ������ �������� DSA �� ����� 1024 bits.\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "� ���������� �������� ����������.\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "�� ������� ��������� ������� ����������: %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "�� ������� ��������� ������� ����������: %s\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "�������� �������� �������� ����������� `%s': %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "�������� �������� �������� ����������� `%s': %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "�� ������� ��� �� ������� ������ �������������� ��� �����������.\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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"
@@ -1967,12 +1990,12 @@ msgstr ""
"�������� �� ��������������� ��� ������ \"--edit-key\" ��� �� ������������\n"
"��� ���������� ������ ��� ���� �� ����.\n"
-#: g10/keygen.c:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr "� ���������� �������� �������: %s\n"
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1980,7 +2003,7 @@ msgstr ""
"�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
"����� �������� ��� �����)\n"
-#: g10/keygen.c:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1988,16 +2011,45 @@ msgstr ""
"�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
"����� �������� ��� �����)\n"
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"��������: � ���������� ����������� ��� ������� v3 ��� ����� �������\n"
"�� �� OpenPGP\n"
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "������� �� ������������; "
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "�������� block �������� �������: %s\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "�������� ����������� ��� `%s': %s\n"
+
+#: g10/keygen.c:3248
+#, fuzzy, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "--output ��� ���������� ��� ���� ��� ������\n"
@@ -2008,7 +2060,7 @@ msgstr "--output ��� ���������� ��� ���� ��� ������\n"
msgid "%s: can't open: %s\n"
msgstr "%s: �������� ��������� ���: %s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
@@ -2038,6 +2090,11 @@ msgstr ""
"������������� �� ������� RSA ��� 2048 bit � ��� ���� ���� �� ��������� --"
"pgp2\n"
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "�������� ��������� ��� %s: %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -2050,26 +2107,36 @@ msgstr ""
"�������� ������ ��� ��������������� IDEA ��� ��� �� ������� �� �� "
"�������������������.\n"
-#: g10/encode.c:526 g10/encode.c:721
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#: g10/encode.c:526
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"� ������������ ����������� ���������� %s (%d) ���������� ���\n"
"�������� ��� ���������\n"
-#: g10/encode.c:634 g10/sign.c:863
-#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+#: g10/encode.c:634 g10/sign.c:864
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
msgstr ""
"� ������������ ������ ��� ���������� ��������� %s (%d) ���������� ���\n"
"�������� ��� ���������\n"
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"� ������������ ����������� ���������� %s (%d) ���������� ���\n"
+"�������� ��� ���������\n"
+
#: g10/encode.c:818
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s ��������������� ���: \"%s\"\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "�� ������ '%s' �� �������: %s\n"
@@ -2102,8 +2169,9 @@ msgstr "�������������: ��� ����� ������ �������\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "���� ������ ������������ ��� pk cache - ����������������\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+#, fuzzy
+msgid "[User ID not found]"
msgstr "[User id ��� �������]"
#: g10/getkey.c:1614
@@ -2257,7 +2325,7 @@ msgstr "������ %08lX: ����������� ��������� ����������� HKP\n"
#: g10/import.c:722
#, fuzzy, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "������ %08lX: ����� �� ����-������������� user ID '%s'\n"
#: g10/import.c:728
@@ -2284,7 +2352,7 @@ msgstr "������ %08lX: ��� ������ - ������������\n"
msgid "no writable keyring found: %s\n"
msgstr "��� ������� ��������� ����������: %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "������� ��� `%s'\n"
@@ -2398,14 +2466,14 @@ msgstr "������ %08lX: ��� ������� user ID ��� ��� ��������\n"
#: g10/import.c:1299
#, fuzzy, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"������ %08lX: �� ��������������� ���������� �������� �������� ��� user id \"%"
"s\"\n"
#: g10/import.c:1301
#, fuzzy, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "������ %08lX: �� ������ ����-�������� ��� user id \"%s\"\n"
#: g10/import.c:1319
@@ -2445,7 +2513,7 @@ msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
#: g10/import.c:1439
#, fuzzy, c-format
-msgid "key %s: skipped user ID '%s'\n"
+msgid "key %s: skipped user ID \"%s\"\n"
msgstr "������ %08lX: ������������ user ID '"
#: g10/import.c:1460
@@ -2455,7 +2523,7 @@ msgstr "������ %08lX: ������������ ���������\n"
#: g10/import.c:1487
#, fuzzy, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "������ %08lX: �� ��������� �������� (����� %02x) - ������������\n"
#: g10/import.c:1497
@@ -2492,114 +2560,114 @@ msgstr ""
"�������������: ������ %08lX ������ �� ���������: ���� �������� ��������� %"
"08lX\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"�������������: ������ %08lX ������ �� ���������: �� ������ ��������� %08lX\n"
"��� ����� �����.\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "������ %08lX: \"%s\" ������������� ��������� ����������\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "������ %08lX: ����� �������� �������� ����������\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[��������]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[����-��������]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "1 ���� ��������\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d ����� ���������\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "1 �������� ��� ��������� ���� ������� ��������\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d ��������� ��� ���������� ���� ������� ��������\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "1 �������� ��� ��������� ���� ���� ���������\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d ��������� ��� ���������� ���� ���������\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "1 user ID ����������� ����� ������ ����-��������\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "%d user ID ������������ ����� ������� ����-���������\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, fuzzy, c-format
msgid " (%d) I trust marginally\n"
msgstr " %d = ��� ������ �����������\n"
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, fuzzy, c-format
msgid " (%d) I trust fully\n"
msgstr " %d = ��� ����� �����������\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "�� user ID \"%s\" ����������."
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "������� ������ ����� �� �� ����������; (y/N) "
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr " �������� ���������.\n"
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "�� user ID \"%s\" ���� �����."
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2608,11 +2676,11 @@ msgstr ""
"� ����-�������� ��� \"%s\"\n"
"����� ��� �������� ����� PGP 2.x.\n"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "������ �� �� �������� �� ��� OpenPGP ����-��������; (y/N) "
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2621,12 +2689,12 @@ msgstr ""
"� ������������ �������� ��� ��� \"%s\"\n"
"���� �����.\n"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"������ �� ������� ��� ��� �������� ���� ������������� ��� ��������; (y/N) "
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2635,43 +2703,43 @@ msgstr ""
"� ������������ �������� ��� ��� \"%s\"\n"
"����� ��� ������ ��������.\n"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "������ �� �� �������� �� ��� ����� ��������� ��������; (y/N) "
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "������� ������ ����� �� �� ��������������; (y/N) "
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "������ ��� �� ��������� �� �� ������ %08lX\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "���� �� ������ ���� �����!"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "���� �� ������ �������� �� ����� ���� %s.\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "������ � ���������� �� ����� ����������; (Y/n) "
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
@@ -2679,11 +2747,11 @@ msgstr ""
"�������� �� ��������������� ��� OpenPGP �������� �� ��� PGP 2.x ���� �� "
"��������� --pgp2.\n"
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "���� �� ����� �� ������ ������� �� �� PGP 2.x.\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2693,31 +2761,31 @@ msgstr ""
"������ �������� ��� ����������� �����; ��� ��� ������ �� �� ���������� "
"�������\"0\".\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) ��� ������.%s\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) ��� ��� ������� �������.%s\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) ��� ����� ��� ������ ������.%s\n"
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) ��� ����� ���������� ������.%s\n"
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr "� ������� ���; (�������������� ? ��� �����������): "
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2725,7 +2793,7 @@ msgstr ""
"������� ������ �� ���������� ���� �� ������\n"
"�� �� ������ ���: \""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2733,7 +2801,7 @@ msgstr ""
"\n"
"���� �� ����� ��� ����-��������.\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2741,7 +2809,7 @@ msgstr ""
"\n"
"�������������: � �������� �� �� ��������� ��� ��-���������.\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2750,7 +2818,7 @@ msgstr ""
"�������������: � �������� �� �� ��������� ��� ��-�����������.\n"
"\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2758,7 +2826,7 @@ msgstr ""
"\n"
"� �������� �� ��������� ��� ��-���������.\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2767,7 +2835,7 @@ msgstr ""
"� �������� �� ��������� ��� ��-�����������.\n"
"\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2775,7 +2843,7 @@ msgstr ""
"\n"
"��� ��� ������� ������� ���� �� ������.\n"
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2783,7 +2851,7 @@ msgstr ""
"\n"
"��� ����� ����������� ������ �� ���� �� ������.\n"
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2791,34 +2859,34 @@ msgstr ""
"\n"
"��� ������� ���� ���������� ���� �� ������.\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "������� �� ���������; "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "� �������� �������: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "���� �� ������ ��� �������������.\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "�� ������ �������������.\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "������� � ����������� ����� ��� ��������:%s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2826,551 +2894,573 @@ msgstr ""
"�������������� ��� ��� ����� ������ ��� ���� �� ������� ������.\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
msgstr "��� ������ ����� ������ - ���� ����� ������ *����* ����!\n"
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "������� ������ �� ������ ����; "
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "���������� ��������� �������� ��� ����� ����\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "����������� ����� ��� �����"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "q"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "save"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "���������� ��� ������"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "help"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "���������� ����� ��� ��������"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "���������� ��� fingerprint"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "list"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "���������� ��� �������� ��� ��� user ID"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "������� user ID N"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "key"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "������� ������������� �������� N"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "check"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "���������� ���������"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "c"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "�������� ��� ��������"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "s"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "tsign"
msgstr "sign"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "make a trust signature"
msgstr "���������� ���� �� ������������� ���������"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "�������� ��� �������� ������"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr "�������� ��� �������� ��-�����������"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "sign the key locally and non-revocably"
msgstr "�������� ��� �������� ������ ��� ��-�����������"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "�������� ���� user ID"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr "addphoto"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr "�������� ���� photo ID"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "�������� ���� user ID"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr "delphoto"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "�������� ���� ������������� ��������"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+#, fuzzy
+msgid "addcardkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "�������� ���� ������������� ��������"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "addrevoker"
msgstr "addrevoker"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "add a revocation key"
msgstr "�������� ���� �������� ���������"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "�������� ���������"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "������ ��� ����������� �����"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr "��������"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr "�������� ��� user ID ��� ��������"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "������ ������ ��� ����������� �������� ��� �������� ��������"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "t"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr "���������� ����������� (�������)"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr "���������� �������� (���������)"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr "������� ����������� ��������"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr "����������� ��������"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "keyserver"
msgstr "������ ���������� ��������"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "set preferred keyserver URL"
msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "������ ��� ������ ������"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "������ ��� ������������ ���������"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "�������� ���������"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revuid"
msgstr "revuid"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revoke a user ID"
msgstr "�������� ���� user ID"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "�������� ���� ������������� ��������"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "������������� ��� ������"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "����������� ��� ������"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr "showphoto"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr "���������� photo ID"
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "������ ���� ��� �������� �������� ����� �������� `%s': %s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "�� ������� ������ ����� ���������.\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "������> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "���������� �� ������� ������ ��� �� ����� ����.\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr "�������� ��������������� ��� ������ \"toggle\" �����.\n"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
msgid "Key is revoked."
msgstr "�� ������ ����������."
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "������� �� ���������� ��� �� user ID; "
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "��������: �������� �� user ID ��� ��������\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "������ �� ��������� �� �������� ��� user ID.\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "��� �������� �� ���������� �� ��������� user ID!\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "������� ������ �� ��������� ���� �� user ID; "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+#, fuzzy
+msgid "Really move the primary key? "
+msgstr "������� ������ �� ��������� ���� �� user ID; "
+
+#: g10/keyedit.c:1598
+#, fuzzy
+msgid "You must select exactly one key.\n"
+msgstr "������ �� ��������� ����������� ��� ������.\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "������ �� ��������� ����������� ��� ������.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "������� ������ �� ���������� �� ���������� �������; "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "������� ������ �� ��������� ���� �� ������; "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
msgid "Really revoke all selected user IDs? "
msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
msgid "Really revoke this user ID? "
msgstr "������� ������ �� ��������� ���� �� user ID; "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "������� ������ �� ���������� �� ���������� �������; "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "������� ������ �� ��������� ���� �� ������; "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
#, fuzzy
msgid "Set preference list to:\n"
msgstr "������� ����������� ��������"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr ""
"������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr "������� �� ���������� �� �����������;"
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "���������� ��� �������; "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "����������� ����� ����������; "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "� ��������� �������: %s\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "� ��������� �������� �������: %s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "�� ������ ��� ������ ����� ��� ���������� ���������.\n"
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "�� ������ ������ (��������� \"help\")\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr "��������: "
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr "����������: "
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keyedit.c:2219
#, c-format
msgid "This key may be revoked by %s key "
msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr " (���������)"
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "�������� ����������� ��� %s: %s\n"
-#: g10/keyedit.c:2084
-#, fuzzy, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
msgstr "[����������]"
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
-msgstr " [�����: %s]"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
+msgstr "expire"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2246
#, fuzzy, c-format
-msgid "expires: %s"
-msgstr " [�����: %s]"
+msgid "usage: %s"
+msgstr " �����������: %c/%c"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, fuzzy, c-format
msgid "trust: %s"
msgstr " �����������: %c/%c"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "���� �� ������ ���� ���������������"
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! �� ������ ����������: %s\n"
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
-msgstr "rev- ������� ������������ ��������\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? �������� ���� ������ ���������: %s\n"
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-#, fuzzy
-msgid "revoked"
-msgstr "[����������]"
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-#, fuzzy
-msgid "expired"
-msgstr "expire"
+#: g10/keyedit.c:2300
+msgid "card-no: "
+msgstr ""
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "��� �������� ����������� �� ��� user ID ����� PGP 2.x.\n"
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3378,15 +3468,7 @@ msgstr ""
"� ���������� ��� ��������������� �������� ��� ����� ���������� �����\n"
"����� ��� ��� �������������� �� ���������.\n"
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-msgid "[revoked] "
-msgstr "[����������]"
-
-#: g10/keyedit.c:2274
-msgid "[expired] "
-msgstr "[�������]"
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@ -3394,7 +3476,7 @@ msgstr ""
"�������������: ��� ���� ��������� ID ������ ��� ��������. ���� � ������\n"
" ������ �� ����� ��� ���� ID ������ �� ����� �� ��������.\n"
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3403,45 +3485,45 @@ msgstr ""
"�������������: ���� ����� ��� ������ ����� PGP2. � �������� ���� photo ID\n"
" ������ �� ����� ������� �������� PGP �� �� ����������.\n"
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
msgid "Are you sure you still want to add it? (y/N) "
msgstr "������� ����� ������ �� �� ����������; (y/N) "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "��� �������� �� ���������� ��� photo ID �� ��� ������ ����� PGP2.\n"
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "�������� ����� ��� ����� ���������; (y/N/q)"
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "�������� ����� ��� �� ������� ���������; (y/N/q)"
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "�������� ����� ��� �������� ���������; (y/N/q)"
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "������� �� ��������� ���� � ����-��������; (y/N)"
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "����������� %d ��������.\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "����������� %d ���������.\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "������ ��� �����������.\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3451,96 +3533,106 @@ msgstr ""
" ������������ �������� ������ �� ����� ������� �������� PGP\n"
" �� �� ����������.\n"
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"��� �������� �� ���������� ��� ����������� �������� �� ������ ����� PGP2.x.\n"
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
msgid "Enter the user ID of the designated revoker: "
msgstr "�������������� �� user ID ��� ����������� ��������: "
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
"�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr ""
"�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"�������������: ��� ������� ��� ������ ��� ���������� �������� ��� ������ �� "
"���������!\n"
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr ""
"����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
"N): "
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "�������� ��������� ��� �������� ��� �� ������� �������.\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "�������� �������� �� ���� ��� ���������� ������.\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "������ ����������� ����� ��� ��� ���������� ������.\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "������ ����������� ����� ��� ��� �������� ������.\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
msgid "Please select exactly one user ID.\n"
msgstr "������ �� ��������� ������� ��� user ID.\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
-#, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "������������ � v3 ����-�������� ��� user id \"%s\"\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+#, fuzzy
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "������� ������ ����� �� �� ���������������; (y/N) "
+
+#: g10/keyedit.c:3480
+#, fuzzy
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "������� ������ ����� �� �� ���������������; (y/N) "
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "��� ������� user ID �� ������ %d\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "��� ������� ���������� ������ �� ������ %d\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "user ID: \""
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3549,7 +3641,7 @@ msgstr ""
"\"\n"
"����������� �� �� ������ ��� %08lX ���� %s\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3558,143 +3650,127 @@ msgstr ""
"\"\n"
"����������� ������ �� �� ������ ��� %08lX ���� %s\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, c-format
msgid "This signature expired on %s.\n"
msgstr "���� � �������� ����� ���� %s.\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "������� ������ �� ��������� ���� �� ������; "
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "����� ��������� ���� �� user ID:\n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid " signed by %s on %s%s%s\n"
msgstr " ����������� ��� %08lX ���� %s%s%s\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid " revoked by %s on %s\n"
msgstr " ���������� ��� %08lX ���� %s\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "��������� �� ����������� ����� ��� ���������:\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, fuzzy, c-format
msgid " signed by %s on %s%s\n"
msgstr " ����������� ��� %08lX ���� %s%s\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr " (��-���������)"
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
msgid "Really create the revocation certificates? (y/N) "
msgstr "������� �� ������������� �� ������������� ���������; (y/N)"
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "������ ������� ������\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "�� user ID \"%s\" ���� ��� ���������\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"�������������: ��� �������� user ID ���� ���������� %d ������� ��� ������\n"
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "���������� %s photo ID �������� %ld ��� �� ������ 0x%08lX (uid %d)\n"
-#: g10/keylist.c:179
+#: g10/keylist.c:180
msgid "Critical signature policy: "
msgstr "�������� �������� ���������: "
-#: g10/keylist.c:181
+#: g10/keylist.c:182
msgid "Signature policy: "
msgstr "�������� ���������: "
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "�������������: �������� �� ������ �������� ���������\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
msgid "Critical signature notation: "
msgstr "�������� �������� ���������: "
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr "�������� ���������: "
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr "�� ����������"
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr "����������"
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr " [�����: %s]"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr " [�����: %s]"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, fuzzy, c-format
-msgid " [revoked: %s]"
-msgstr "[����������]"
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
msgid "Primary key fingerprint:"
msgstr "��������� �������� ��������:"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
msgid " Subkey fingerprint:"
msgstr " ��������� �����������:"
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
msgid " Primary key fingerprint:"
msgstr " ��������� �������� ��������:"
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
msgid " Subkey fingerprint:"
msgstr " ��������� �����������:"
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr " ��������� �������� ="
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3902,81 +3978,81 @@ msgstr "�������� ������ ���� (PGP 2.x)\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "�� ������ ������(root) ������ ����������� ��� proc_tree()\n"
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "�������� ��������������� ��� core dump: %s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "������������ ���������� ��� ������ �� ����������������!\n"
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"� ����� ����� ��� ���������� �������������� ��� ����������. �������������� "
"��� ��� �����������!\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr "�� ����� ��� ��������������� IDEA ��� �������\n"
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr ""
"����� �� http://www.gnupg.org/why-not-idea.html ��� ������������ "
"�����������\n"
-#: g10/misc.c:491
+#: g10/misc.c:517
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: �� ������������ ������� \"%s\"\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "�������� �������������� �� \"%s%s\" ��������\n"
-#: g10/misc.c:508
+#: g10/misc.c:534
msgid "Uncompressed"
msgstr "����������"
-#: g10/misc.c:533
+#: g10/misc.c:559
#, fuzzy
msgid "uncompressed|none"
msgstr "����������"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "���� �� ������ ���� ��� ������ �� �������������� ��� %s\n"
-#: g10/misc.c:777
+#: g10/misc.c:826
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "�������� �������� ��� `%s'\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "�������� ��������������� ���������� `%s'\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "�������������: ������� �� ������� ��������������� ���������� ������\n"
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "��������� ����� %d ���� �������� �� ������� bit\n"
@@ -4015,7 +4091,7 @@ msgstr "�������� �������� ��� `%s': %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "�������� ������������ �� �� gpg-agent\n"
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr "�������� �� ��� agent - �������������� ��� ������ ��� agent\n"
@@ -4052,24 +4128,24 @@ msgstr "� ����� ������ ����� ���� ������\n"
msgid "invalid response from agent\n"
msgstr "�� ������ �������� ��� ��� agent\n"
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "��������� ��� �� ������\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "�������� �������� ��� ����� ������ �� ��������� ������\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "�������������� �� ����� ������: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4079,22 +4155,22 @@ msgstr ""
"���������� ��� ����� ������ ��� �� ������������ �� ������� ������\n"
"��� �� ������: \""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bit %s ������, ID %08lX, ���������� %s"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (����� ������, ID %08lX)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "����������� �� ����� ������: "
@@ -4324,28 +4400,39 @@ msgstr ""
"�������� �� ����������-���������� �� ������� ����� PGP 2.x ���� ��\n"
"--pgp2 ���������\n"
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
-msgstr "�������� ����������� ��� %s: %s\n"
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
+msgstr "�������� ����������� ��� `%s': %s\n"
-#: g10/sign.c:794
-#, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+#: g10/sign.c:771 g10/sign.c:1008
+#, fuzzy, c-format
+msgid "writing to file `%s'\n"
+msgstr "������� ��� `%s'\n"
+
+#: g10/sign.c:795
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
"����������� ��� ���������\n"
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr "��������:"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "�������� ��������� ��� �������: %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
"�������� �� ���������� ������ �� ������� ����� PGP 2.x �� ��������� --pgp2\n"
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s ������������� �� ��������������\n"
@@ -4748,7 +4835,7 @@ msgstr ""
"�������� �������� �������� �������� ��� ���������� ��������������, ������ "
"��� %d �����!\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "� DSA ������� �� ����� ���� 160 bit ���������� hash\n"
@@ -5121,17 +5208,17 @@ msgstr "��� ������� ��������� �������"
msgid "No help available for `%s'"
msgstr "��� ������� ��������� ������� ��� `%s'"
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "�������� ����������� ��� ����������� `%s': %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr "���������� `%s' �������������\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "�������� ������������ ��� cache �����������: %s\n"
@@ -5174,8 +5261,7 @@ msgstr "%lu ������� ����� �������� (%lu ���������)\n"
msgid "%s: keyring created\n"
msgstr "%s: ���������� �������������\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5189,29 +5275,34 @@ msgstr ""
"�������������� ��� ������ ������ �� ������ ��� ���������� �� ����� ������!\n"
"������� ������� ��� ��� ������ ����� ���� ����� ��� 240x288.\n"
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr "�������������� ��� ����� ������� ��� �� photo ID: "
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "�������� ��������� ��� ����������� \"%s\": %s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
msgid "Are you sure you want to use it (y/N)? "
msgstr "������� ������ ����� �� �� ���������������; (y/N) "
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr "\"%s\" ��� ����� JPEG ������\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Is this photo correct (y/N/q)? "
msgstr "����� ���� � ���������� ����� (y/N/q); "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
msgid "unable to display photo ID!\n"
msgstr "�������� ����������� ��� photo ID!\n"
@@ -5232,44 +5323,50 @@ msgstr ""
"�������\n"
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
+#, fuzzy
+msgid "this platform requires temporary files when calling external programs\n"
msgstr ""
"���� � ��������� ������� ������. ������ ���� ����� ���������� ������������\n"
-#: g10/exec.c:432
-#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
msgstr "�������� ��������� ��� %s \"%s\": %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:436
+#, fuzzy, c-format
+msgid "unable to execute shell `%s': %s\n"
+msgstr "�������� ��������� ��� %s \"%s\": %s\n"
+
+#: g10/exec.c:515
#, c-format
msgid "system error while calling external program: %s\n"
msgstr "������ ���������� ���� ��� ����� ���������� ������������: %s\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr "������� ������ ��� ���������� ������������\n"
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr "�������� ��������� ��� ���������� ������������\n"
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr "�������� ��������� ��� ��������� ��� ���������� ������������: %s\n"
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "�������������: �������� ��������� ���������� ������� `%s': %s\n"
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr "���� "
@@ -5425,6 +5522,47 @@ msgstr "������ ���� ������ ��� �������� ������������: %s\n"
msgid "read error: %s\n"
msgstr "������ ���������: %s\n"
+#, fuzzy
+#~ msgid "revoked: %s"
+#~ msgstr "[����������]"
+
+#, fuzzy
+#~ msgid "expired: %s"
+#~ msgstr " [�����: %s]"
+
+#, fuzzy
+#~ msgid "expires: %s"
+#~ msgstr " [�����: %s]"
+
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "rev! �� ������ ����������: %s\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "rev- ������� ������������ ��������\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "rev? �������� ���� ������ ���������: %s\n"
+
+#~ msgid "[revoked] "
+#~ msgstr "[����������]"
+
+#~ msgid "[expired] "
+#~ msgstr "[�������]"
+
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr " [�����: %s]"
+
+#~ msgid " [expires: %s]"
+#~ msgstr " [�����: %s]"
+
+#, fuzzy
+#~ msgid " [revoked: %s]"
+#~ msgstr "[����������]"
+
+#~ msgid "can't create %s: %s\n"
+#~ msgstr "�������� ����������� ��� %s: %s\n"
+
#~ msgid ""
#~ "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n"
#~ msgstr ""
diff --git a/po/[email protected] b/po/[email protected]
index 0daf7f995..bac2d0348 100644
--- a/po/[email protected]
+++ b/po/[email protected]
Binary files differ
diff --git a/po/[email protected] b/po/[email protected]
index dc569d482..d6086aef5 100644
--- a/po/[email protected]
+++ b/po/[email protected]
@@ -30,10 +30,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: gnupg 1.3.90-cvs\n"
+"Project-Id-Version: gnupg 1.3.90\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
-"PO-Revision-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
+"PO-Revision-Date: 2004-10-01 10:36+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -73,7 +73,7 @@ msgstr "no"
msgid "nN"
msgstr "nN"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "quit"
@@ -305,6 +305,14 @@ msgstr "unusable secret key"
msgid "keyserver error"
msgstr "keyserver error"
+#: util/errors.c:108
+msgid "canceled"
+msgstr "canceled"
+
+#: util/errors.c:109
+msgid "no card"
+msgstr "no card"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr "ERROR: "
@@ -327,7 +335,7 @@ msgstr "you found a bug ... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "no entropy gathering module detected\n"
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "can't open ‘%s’: %s\n"
@@ -359,7 +367,7 @@ msgstr "can't read ‘%s’: %s\n"
msgid "note: random_seed file not updated\n"
msgstr "note: random_seed file not updated\n"
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr "can't create ‘%s’: %s\n"
@@ -428,7 +436,7 @@ msgstr "can't gen prime with pbits=%u qbits=%u\n"
msgid "can't generate a prime with less than %d bits\n"
msgstr "can't generate a prime with less than %d bits\n"
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -436,127 +444,127 @@ msgstr ""
"@Commands:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[file]|make a signature"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[file]|make a clear text signature"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "make a detached signature"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "encrypt data"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "encryption only with symmetric cipher"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "decrypt data (default)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "verify a signature"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "list keys"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "list keys and signatures"
-#: g10/g10.c:370
+#: g10/g10.c:374
msgid "list and check key signatures"
msgstr "list and check key signatures"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "list keys and fingerprints"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "list secret keys"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "generate a new key pair"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "remove keys from the public keyring"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "remove keys from the secret keyring"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "sign a key"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "sign a key locally"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "sign or edit a key"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "generate a revocation certificate"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "export keys"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "export keys to a key server"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "import keys from a key server"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "search for keys on a key server"
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "update all keys from a keyserver"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "import/merge keys"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr "print the card status"
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr "change data on a card"
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr "change a card's PIN"
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "update the trust database"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|algo [files]|print message digests"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -566,55 +574,51 @@ msgstr ""
"Options:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "create ascii armored output"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|NAME|encrypt for NAME"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr "use this user-id to sign or decrypt"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr "|N|set compress level N (0 disables)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "use canonical text mode"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "use as output file"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "verbose"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "do not make any changes"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "prompt before overwriting"
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr "use strict OpenPGP behavior"
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr "generate PGP 2.x compatible messages"
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr "allow the use of admin card commands"
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -622,7 +626,7 @@ msgstr ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -642,15 +646,15 @@ msgstr ""
" --list-keys [names] show keys\n"
" --fingerprint [names] show fingerprints\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Please report bugs to <[email protected]>.\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Usage: gpg [options] [files] (-h for help)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -660,7 +664,7 @@ msgstr ""
"sign, check, encrypt or decrypt\n"
"default operation depends on the input data\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -668,466 +672,460 @@ msgstr ""
"\n"
"Supported algorithms:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr "Pubkey: "
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr "Cipher: "
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr "Hash: "
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
msgid "Compression: "
msgstr "Compression: "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "usage: gpg [options] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "conflicting commands\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "no = sign found in group definition “%s”\n"
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
-msgstr "WARNING: unsafe ownership on homedir “%s”\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
+msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
-msgstr "WARNING: unsafe ownership on configuration file “%s”\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
+msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
-msgstr "WARNING: unsafe ownership on extension “%s”\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
+msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
-msgstr "WARNING: unsafe permissions on homedir “%s”\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
+msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
-msgstr "WARNING: unsafe permissions on configuration file “%s”\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
+msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
-msgstr "WARNING: unsafe permissions on extension “%s”\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
+msgstr "WARNING: unsafe permissions on extension ‘%s’\n"
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
-msgstr "WARNING: unsafe enclosing directory ownership on homedir “%s”\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
+msgstr "WARNING: unsafe enclosing directory ownership on homedir ‘%s’\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr ""
-"WARNING: unsafe enclosing directory ownership on configuration file “%s"
-"[0m”\n"
+"WARNING: unsafe enclosing directory ownership on configuration file ‘%s"
+"[0m’\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
-"WARNING: unsafe enclosing directory ownership on extension “%s”\n"
+"WARNING: unsafe enclosing directory ownership on extension ‘%s’\n"
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
-"WARNING: unsafe enclosing directory permissions on homedir “%s”\n"
+"WARNING: unsafe enclosing directory permissions on homedir ‘%s’\n"
-#: g10/g10.c:1205
+#: g10/g10.c:1210
#, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr ""
-"WARNING: unsafe enclosing directory permissions on configuration file “%s"
-"[0m”\n"
+"WARNING: unsafe enclosing directory permissions on configuration file ‘%s"
+"[0m’\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
-"WARNING: unsafe enclosing directory permissions on extension “%s”\n"
+"WARNING: unsafe enclosing directory permissions on extension ‘%s’\n"
-#: g10/g10.c:1334
+#: g10/g10.c:1354
#, c-format
-msgid "unknown configuration item \"%s\"\n"
-msgstr "unknown configuration item “%s”\n"
+msgid "unknown configuration item `%s'\n"
+msgstr "unknown configuration item ‘%s’\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTE: old default options file ‘%s’ ignored\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTE: no default option file ‘%s’\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "option file ‘%s’: %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "reading options from ‘%s’\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTE: %s is not for normal use!\n"
-#: g10/g10.c:1887
+#: g10/g10.c:2021
#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
-msgstr "cipher extension “%s” not loaded due to unsafe permissions\n"
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
+msgstr "cipher extension ‘%s’ not loaded due to unsafe permissions\n"
-#: g10/g10.c:2099
+#: g10/g10.c:2233
#, c-format
-msgid "%s is not a valid character set\n"
-msgstr "%s is not a valid character set\n"
+msgid "`%s' is not a valid character set\n"
+msgstr "‘%s’ is not a valid character set\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
msgid "could not parse keyserver URL\n"
msgstr "could not parse keyserver URL\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: invalid keyserver options\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
msgid "invalid keyserver options\n"
msgstr "invalid keyserver options\n"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: invalid import options\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
msgid "invalid import options\n"
msgstr "invalid import options\n"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: invalid export options\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
msgid "invalid export options\n"
msgstr "invalid export options\n"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: invalid list options\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
msgid "invalid list options\n"
msgstr "invalid list options\n"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: invalid verify options\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
msgid "invalid verify options\n"
msgstr "invalid verify options\n"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "unable to set exec-path to %s\n"
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "WARNING: program may create a core file!\n"
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "WARNING: %s overrides %s\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s not allowed with %s!\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s makes no sense with %s!\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "you can only make detached or clear signatures while in --pgp2 mode\n"
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "you can't sign and encrypt at the same time while in --pgp2 mode\n"
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"you must use files (and not a pipe) when working with --pgp2 enabled.\n"
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "selected cipher algorithm is invalid\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "selected digest algorithm is invalid\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
msgid "selected compression algorithm is invalid\n"
msgstr "selected compression algorithm is invalid\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
msgid "selected certification digest algorithm is invalid\n"
msgstr "selected certification digest algorithm is invalid\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed must be greater than 0\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed must be greater than 1\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth must be in the range from 1 to 255\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "invalid default-cert-level; must be 0, 1, 2, or 3\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "invalid min-cert-level; must be 1, 2, or 3\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTE: simple S2K mode (0) is strongly discouraged\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "invalid S2K mode; must be 0, 1 or 3\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
msgid "invalid default preferences\n"
msgstr "invalid default preferences\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
msgid "invalid personal cipher preferences\n"
msgstr "invalid personal cipher preferences\n"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
msgid "invalid personal digest preferences\n"
msgstr "invalid personal digest preferences\n"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
msgid "invalid personal compress preferences\n"
msgstr "invalid personal compress preferences\n"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s does not yet work with %s\n"
-#: g10/g10.c:2680
+#: g10/g10.c:2797
#, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
-msgstr "you may not use cipher algorithm “%s” while in %s mode\n"
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
+msgstr "you may not use cipher algorithm ‘%s’ while in %s mode\n"
-#: g10/g10.c:2685
+#: g10/g10.c:2802
#, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
-msgstr "you may not use digest algorithm “%s” while in %s mode\n"
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
+msgstr "you may not use digest algorithm ‘%s’ while in %s mode\n"
-#: g10/g10.c:2690
+#: g10/g10.c:2807
#, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
-msgstr "you may not use compression algorithm “%s” while in %s mode\n"
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
+msgstr "you may not use compression algorithm ‘%s’ while in %s mode\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "failed to initialize the TrustDB: %s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "WARNING: recipients (-r) given without using public key encryption\n"
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [filename]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [filename]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [filename]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [filename]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "you cannot use --symmetric --encrypt while in %s mode\n"
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [filename]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filename]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [filename]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "you cannot use --symmetric --sign --encrypt while in %s mode\n"
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filename]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [filename]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [filename]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrsign-key user-id"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key user-id"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [commands]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "can't open %s: %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [user-id] [keyring]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "keyserver send failed: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "keyserver receive failed: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, c-format
msgid "key export failed: %s\n"
msgstr "key export failed: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "keyserver search failed: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "keyserver refresh failed: %s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dearmoring failed: %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "enarmoring failed: %s\n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "invalid hash algorithm ‘%s’\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[filename]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "Go ahead and type your message ...\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "can't open ‘%s’\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@ -1135,47 +1133,47 @@ msgstr ""
"a notation name must have only printable characters or spaces, and end with "
"an ‘=’\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
msgid "a user notation name must contain the '@' character\n"
msgstr "a user notation name must contain the ‘@’ character\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "a notation value must not use any control characters\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr "the given certification policy URL is invalid\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr "the given signature policy URL is invalid\n"
-#: g10/g10.c:3747
-msgid "the given signature preferred keyserver URL is invalid\n"
-msgstr "the given signature preferred keyserver URL is invalid\n"
+#: g10/g10.c:3863
+msgid "the given preferred keyserver URL is invalid\n"
+msgstr "the given preferred keyserver URL is invalid\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "be somewhat more quiet"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
msgid "take the keys from this keyring"
msgstr "take the keys from this keyring"
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
msgid "make timestamp conflicts only a warning"
msgstr "make timestamp conflicts only a warning"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr "|FD|write status info to this FD"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Usage: gpgv [options] [files] (-h for help)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1209,13 +1207,13 @@ msgid "invalid dash escaped line: "
msgstr "invalid dash escaped line: "
#: g10/armor.c:565
-msgid "unexpected armor:"
-msgstr "unexpected armor:"
+msgid "unexpected armor: "
+msgstr "unexpected armor: "
-#: g10/armor.c:695 g10/armor.c:1276
+#: g10/armor.c:695 g10/armor.c:1280
#, c-format
-msgid "invalid radix64 character %02x skipped\n"
-msgstr "invalid radix64 character %02x skipped\n"
+msgid "invalid radix64 character %02X skipped\n"
+msgstr "invalid radix64 character %02X skipped\n"
#: g10/armor.c:738
msgid "premature eof (no CRC)\n"
@@ -1225,33 +1223,33 @@ msgstr "premature eof (no CRC)\n"
msgid "premature eof (in CRC)\n"
msgstr "premature eof (in CRC)\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "malformed CRC\n"
-#: g10/armor.c:780 g10/armor.c:1313
+#: g10/armor.c:784 g10/armor.c:1317
#, c-format
-msgid "CRC error; %06lx - %06lx\n"
-msgstr "CRC error; %06lx - %06lx\n"
-
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
-msgstr "premature eof (in Trailer)\n"
+msgid "CRC error; %06lX - %06lX\n"
+msgstr "CRC error; %06lX - %06lX\n"
#: g10/armor.c:804
+msgid "premature eof (in trailer)\n"
+msgstr "premature eof (in trailer)\n"
+
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "error in trailer line\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "no valid OpenPGP data found.\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "invalid armor: line longer than %d characters\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1301,7 +1299,7 @@ msgstr " \""
msgid " aka \""
msgstr " aka \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1550,93 +1548,113 @@ msgstr "%s: skipped: public key is disabled\n"
msgid "no valid addressees\n"
msgstr "no valid addressees\n"
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, c-format
msgid "preference `%s' duplicated\n"
msgstr "preference ‘%s’ duplicated\n"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
msgid "too many cipher preferences\n"
msgstr "too many cipher preferences\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
msgid "too many digest preferences\n"
msgstr "too many digest preferences\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
msgid "too many compression preferences\n"
msgstr "too many compression preferences\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "invalid item ‘%s’ in preference string\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
msgid "writing direct signature\n"
msgstr "writing direct signature\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "writing self signature\n"
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "writing key binding signature\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "keysize invalid; using %u bits\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "keysize rounded up to %u bits\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "Please select what kind of key you want:\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA and Elgamal (default)\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (sign only)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (encrypt only)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (sign only)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (encrypt only)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (sign and encrypt)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) RSA (auth only)\n"
+
+#: g10/keygen.c:1224
+#, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) RSA (sign and auth)\n"
+
+#: g10/keygen.c:1226
+#, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) RSA (encrypt and auth)\n"
+
+#: g10/keygen.c:1228
+#, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) RSA (sign, encrypt and auth)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "Your selection? "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "Invalid selection.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1649,28 +1667,28 @@ msgstr ""
" default keysize is 1024 bits\n"
" highest suggested keysize is 2048 bits\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "What keysize do you want? (1024) "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA only allows keysizes from 512 to 1024\n"
-#: g10/keygen.c:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "keysize too small; 1024 is smallest value allowed for RSA.\n"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "keysize too small; 768 is smallest value allowed.\n"
-#: g10/keygen.c:1255
+#: g10/keygen.c:1328
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "keysize too large; %d is largest value allowed.\n"
-#: g10/keygen.c:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1678,11 +1696,11 @@ msgstr ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "Are you sure that you want this keysize? "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1690,17 +1708,17 @@ msgstr ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
-#: g10/keygen.c:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Requested keysize is %u bits\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "rounded up to %u bits\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1716,7 +1734,7 @@ msgstr ""
" <n>m = key expires in n months\n"
" <n>y = key expires in n years\n"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1732,29 +1750,29 @@ msgstr ""
" <n>m = signature expires in n months\n"
" <n>y = signature expires in n years\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "Key is valid for? (0) "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr "Signature is valid for? (0) "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "invalid value\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s does not expire at all\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr "%s expires at %s\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1762,64 +1780,64 @@ msgstr ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
-#: g10/keygen.c:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "Is this correct (y/n)? "
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" “Heinrich Heine (Der Dichter) <[email protected]>”\n"
"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "Real name: "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "Invalid character in name\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr "Name may not start with a digit\n"
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr "Name must be at least 5 characters long\n"
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "Email address: "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "Not a valid email address\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "Comment: "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "Invalid character in comment\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "You are using the ‘%s’ character set.\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1830,27 +1848,27 @@ msgstr ""
" “%s”\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Please don't put the email address into the real name or the comment\n"
-#: g10/keygen.c:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
-#: g10/keygen.c:1542
+#: g10/keygen.c:1615
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:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr "Please correct the error first\n"
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1858,16 +1876,16 @@ msgstr ""
"You need a Passphrase to protect your secret key.\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr "passphrase not correctly repeated; try again"
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1879,7 +1897,7 @@ msgstr ""
"using this program with the option “--edit-key”.\n"
"\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1891,58 +1909,58 @@ msgstr ""
"disks) during the prime generation; this gives the random number\n"
"generator a better chance to gain enough entropy.\n"
-#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr "sorry, can't do this in batch mode\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA keypair will have 1024 bits.\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "Key generation canceled.\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr "writing public key to ‘%s’\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "writing secret key stub to ‘%s’\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "writing secret key to ‘%s’\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "no writable public keyring found: %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "no writable secret keyring found: %s\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "error writing public keyring ‘%s’: %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "error writing secret keyring ‘%s’: %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "public and secret key created and signed.\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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"
@@ -1951,33 +1969,62 @@ msgstr ""
"the command “--edit-key” to generate a secondary key for this "
"purpose.\n"
-#: g10/keygen.c:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Key generation failed: %s\n"
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"key has been created %lu second in future (time warp or clock problem)\n"
-#: g10/keygen.c:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "Really create? "
+#: g10/keygen.c:3184
+#, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "storing key onto card failed: %s\n"
+
+#: g10/keygen.c:3225
+#, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "can't create backup file ‘%s’: %s\n"
+
+#: g10/keygen.c:3248
+#, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "NOTE: backup of card key saved to ‘%s’\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr "length of RSA modulus is not %d\n"
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr "public exponent too large (more than 32 bits)\n"
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr "length of an RSA prime is not %d\n"
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "--output doesn't work for this command\n"
@@ -1988,7 +2035,7 @@ msgstr "--output doesn't work for this command\n"
msgid "%s: can't open: %s\n"
msgstr "%s: can't open: %s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "error creating passphrase: %s\n"
@@ -2016,6 +2063,11 @@ msgstr "%s: WARNING: empty file\n"
msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
msgstr "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "can't open %s: %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -2027,22 +2079,33 @@ msgid ""
msgstr ""
"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
-#: g10/encode.c:526 g10/encode.c:721
+#: g10/encode.c:526
#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-#: g10/encode.c:634 g10/sign.c:863
+#: g10/encode.c:634 g10/sign.c:864
#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
-msgstr "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
+msgstr ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
+
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n"
#: g10/encode.c:818
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s encrypted for: “%s”\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "key ‘%s’ not found: %s\n"
@@ -2075,9 +2138,9 @@ msgstr "WARNING: nothing exported\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "too many entries in pk cache - disabled\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
-msgstr "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+msgid "[User ID not found]"
+msgstr "[User ID not found]"
#: g10/getkey.c:1614
#, c-format
@@ -2229,8 +2292,8 @@ msgstr "key %s: PKS subkey corruption repaired\n"
#: g10/import.c:722
#, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
-msgstr "key %s: accepted non self-signed user ID ‘%s’\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
+msgstr "key %s: accepted non self-signed user ID “%s”\n"
#: g10/import.c:728
#, c-format
@@ -2256,7 +2319,7 @@ msgstr "key %s: new key - skipped\n"
msgid "no writable keyring found: %s\n"
msgstr "no writable keyring found: %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "writing to ‘%s’\n"
@@ -2368,13 +2431,13 @@ msgstr "key %s: no user ID for signature\n"
#: g10/import.c:1299
#, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
-msgstr "key %s: unsupported public key algorithm on user id “%s”\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
+msgstr "key %s: unsupported public key algorithm on user ID “%s”\n"
#: g10/import.c:1301
#, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
-msgstr "key %s: invalid self-signature on user id “%s”\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
+msgstr "key %s: invalid self-signature on user ID “%s”\n"
#: g10/import.c:1319
#, c-format
@@ -2413,8 +2476,8 @@ msgstr "key %s: removed multiple subkey revocation\n"
#: g10/import.c:1439
#, c-format
-msgid "key %s: skipped user ID '%s'\n"
-msgstr "key %s: skipped user ID ‘%s’\n"
+msgid "key %s: skipped user ID \"%s\"\n"
+msgstr "key %s: skipped user ID “%s”\n"
#: g10/import.c:1460
#, c-format
@@ -2423,8 +2486,8 @@ msgstr "key %s: skipped subkey\n"
#: g10/import.c:1487
#, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
-msgstr "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
+msgstr "key %s: non exportable signature (class 0x%02X) - skipped\n"
#: g10/import.c:1497
#, c-format
@@ -2456,76 +2519,76 @@ msgstr "key %s: duplicated user ID detected - merged\n"
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "WARNING: key %s may be revoked: fetching revocation key %s\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "WARNING: key %s may be revoked: revocation key %s not present.\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "key %s: “%s” revocation certificate added\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "key %s: direct key signature added\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[revocation]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[self-signature]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "1 bad signature\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d bad signatures\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "1 signature not checked due to a missing key\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d signatures not checked due to missing keys\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "1 signature not checked due to an error\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d signatures not checked due to errors\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "1 user ID without valid self-signature detected\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "%d user IDs without valid self-signatures detected\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, c-format
msgid " (%d) I trust marginally\n"
msgstr " (%d) I trust marginally\n"
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, c-format
msgid " (%d) I trust fully\n"
msgstr " (%d) I trust fully\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@ -2535,36 +2598,36 @@ msgstr ""
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr "Please enter a domain to restrict this signature, or enter for none.\n"
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "User ID “%s” is revoked."
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Are you sure you still want to sign it? (y/N) "
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr " Unable to sign.\n"
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "User ID “%s” is expired."
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "User ID “%s” is not self-signed."
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2573,11 +2636,11 @@ msgstr ""
"The self-signature on “%s”\n"
"is a PGP 2.x-style signature.\n"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Do you want to promote it to an OpenPGP self-signature? (y/N) "
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2586,12 +2649,12 @@ msgstr ""
"Your current signature on “%s”\n"
"has expired.\n"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Do you want to issue a new signature to replace the expired one? (y/N) "
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2600,43 +2663,43 @@ msgstr ""
"Your current signature on “%s”\n"
"is a local signature.\n"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Do you want to promote it to a full exportable signature? (y/N) "
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "“%s” was already locally signed by key %s\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "“%s” was already signed by key %s\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Do you want to sign it again anyway? (y/N) "
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nothing to sign with key %s\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "This key has expired!"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "This key is due to expire on %s.\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Do you want your signature to expire at the same time? (Y/n) "
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
@@ -2644,11 +2707,11 @@ msgstr ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "This would make the key unusable in PGP 2.x.\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2659,31 +2722,31 @@ msgstr ""
"to the person named above? If you don't know what to answer, enter “0"
"[0m”.\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) I will not answer.%s\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) I have not checked at all.%s\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) I have done casual checking.%s\n"
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) I have done very careful checking.%s\n"
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr "Your selection? (enter ‘?’ for more information): "
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2691,7 +2754,7 @@ msgstr ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2699,7 +2762,7 @@ msgstr ""
"\n"
"This will be a self-signature.\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2707,7 +2770,7 @@ msgstr ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2715,7 +2778,7 @@ msgstr ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2723,7 +2786,7 @@ msgstr ""
"\n"
"The signature will be marked as non-exportable.\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2731,7 +2794,7 @@ msgstr ""
"\n"
"The signature will be marked as non-revocable.\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2739,7 +2802,7 @@ msgstr ""
"\n"
"I have not checked this key at all.\n"
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2747,7 +2810,7 @@ msgstr ""
"\n"
"I have checked this key casually.\n"
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2755,34 +2818,34 @@ msgstr ""
"\n"
"I have checked this key very carefully.\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "Really sign? "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "signing failed: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "This key is not protected.\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr "Secret parts of primary key are not available.\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "Key is protected.\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Can't edit this key: %s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2790,7 +2853,7 @@ msgstr ""
"Enter the new passphrase for this secret key.\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2798,538 +2861,556 @@ msgstr ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "Do you really want to do this? "
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "moving a key signature to the correct place\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "quit this menu"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "q"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "save"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "save and quit"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "help"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "show this help"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "show fingerprint"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "list"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "list key and user IDs"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "select user ID N"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "key"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "select secondary key N"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "check"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "list signatures"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "c"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "sign the key"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "s"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
msgid "tsign"
msgstr "tsign"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
msgid "make a trust signature"
msgstr "make a trust signature"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "sign the key locally"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr "sign the key non-revocably"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "sign the key locally and non-revocably"
msgstr "sign the key locally and non-revocably"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "add a user ID"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr "addphoto"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr "add a photo ID"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "delete user ID"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr "delphoto"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "add a secondary key"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+msgid "addcardkey"
+msgstr "addcardkey"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr "add a key to a smartcard"
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr "keytocard"
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr "move a key to a smartcard"
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "delete a secondary key"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "addrevoker"
msgstr "addrevoker"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "add a revocation key"
msgstr "add a revocation key"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "delete signatures"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "change the expire date"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr "primary"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr "flag user ID as primary"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "toggle between secret and public key listing"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "t"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr "list preferences (expert)"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr "list preferences (verbose)"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr "set preference list"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr "updated preferences"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
msgid "keyserver"
msgstr "keyserver"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
msgid "set preferred keyserver URL"
msgstr "set preferred keyserver URL"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "change the passphrase"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "change the ownertrust"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "revoke signatures"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revuid"
msgstr "revuid"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revoke a user ID"
msgstr "revoke a user ID"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "revoke a secondary key"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "disable a key"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "enable a key"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr "showphoto"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr "show photo ID"
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "can't do that in batchmode\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "error reading secret keyblock ‘%s’: %s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "Secret key is available.\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "Command> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "Need the secret key to do this.\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr "Please use the command “toggle” first.\n"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
msgid "Key is revoked."
msgstr "Key is revoked."
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "Really sign all user IDs? "
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "Hint: Select the user IDs to sign\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "This command is not allowed while in %s mode.\n"
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "You must select at least one user ID.\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "You can't delete the last user ID!\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "Really remove all selected user IDs? "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "Really remove this user ID? "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+msgid "Really move the primary key? "
+msgstr "Really move the primary key? "
+
+#: g10/keyedit.c:1598
+msgid "You must select exactly one key.\n"
+msgstr "You must select exactly one key.\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "You must select at least one key.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "Do you really want to delete the selected keys? "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "Do you really want to delete this key? "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
msgid "Really revoke all selected user IDs? "
msgstr "Really revoke all selected user IDs? "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
msgid "Really revoke this user ID? "
msgstr "Really revoke this user ID? "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "Do you really want to revoke the selected keys? "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "Do you really want to revoke this key? "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
"Owner trust may not be set while using an user provided trust database\n"
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
msgid "Set preference list to:\n"
msgstr "Set preference list to:\n"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr "Really update the preferences for the selected user IDs? "
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr "Really update the preferences? "
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "Save changes? "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "Quit without saving? "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "update failed: %s\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "update secret failed: %s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "Key not changed so no update needed.\n"
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "Invalid command (try “help”)\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr "Digest: "
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr "Features: "
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr "Keyserver no-modify"
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr "Preferred keyserver: "
+
+#: g10/keyedit.c:2219
#, c-format
msgid "This key may be revoked by %s key "
msgstr "This key may be revoked by %s key "
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr " (sensitive)"
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, c-format
msgid "created: %s"
msgstr "created: %s"
-#: g10/keyedit.c:2084
-#, c-format
-msgid "revoked: %s"
-msgstr "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+msgid "revoked"
+msgstr "revoked"
-#: g10/keyedit.c:2086
-#, c-format
-msgid "expired: %s"
-msgstr "expired: %s"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+msgid "expired"
+msgstr "expired"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+msgid "expires"
+msgstr "expires"
+
+#: g10/keyedit.c:2246
#, c-format
-msgid "expires: %s"
-msgstr "expires: %s"
+msgid "usage: %s"
+msgstr "usage: %s"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, c-format
msgid "trust: %s"
msgstr "trust: %s"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr "validity: %s"
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "This key has been disabled"
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! subkey has been revoked: %s\n"
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
-msgstr "rev- faked revocation found\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? problem checking revocation: %s\n"
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-msgid "revoked"
-msgstr "revoked"
+#: g10/keyedit.c:2300
+msgid "card-no: "
+msgstr "card-no: "
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-msgid "expired"
-msgstr "expired"
-
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "There are no preferences on a PGP 2.x-style user ID.\n"
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3337,15 +3418,7 @@ msgstr ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-msgid "[revoked] "
-msgstr "[revoked] "
-
-#: g10/keyedit.c:2274
-msgid "[expired] "
-msgstr "[expired] "
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@ -3353,7 +3426,7 @@ msgstr ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3363,45 +3436,45 @@ msgstr ""
"versions\n"
" of PGP to reject this key.\n"
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Are you sure you still want to add it? (y/N) "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "You may not add a photo ID to a PGP2-style key.\n"
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "Delete this good signature? (y/N/q)"
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Delete this invalid signature? (y/N/q)"
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Delete this unknown signature? (y/N/q)"
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "Really delete this self-signature? (y/N)"
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Deleted %d signature.\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Deleted %d signatures.\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "Nothing deleted.\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3411,88 +3484,96 @@ msgstr ""
"cause\n"
" some versions of PGP to reject this key.\n"
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "You may not add a designated revoker to a PGP 2.x-style key.\n"
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
msgid "Enter the user ID of the designated revoker: "
msgstr "Enter the user ID of the designated revoker: "
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "cannot appoint a PGP 2.x style key as a designated revoker\n"
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "you cannot appoint a key as its own designated revoker\n"
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
msgid "this key has already been designated as a revoker\n"
msgstr "this key has already been designated as a revoker\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "WARNING: appointing a key as a designated revoker cannot be undone!\n"
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "Please remove selections from the secret keys.\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "Please select at most one secondary key.\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "Changing expiration time for a secondary key.\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "Changing expiration time for the primary key.\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "You can't change the expiration date of a v3 key\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "No corresponding signature in secret ring\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
msgid "Please select exactly one user ID.\n"
msgstr "Please select exactly one user ID.\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
#, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
-msgstr "skipping v3 self-signature on user id “%s”\n"
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
+msgstr "skipping v3 self-signature on user ID “%s”\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr "Enter your preferred keyserver URL: "
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "Are you sure you want to replace it? (y/N) "
+
+#: g10/keyedit.c:3480
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "Are you sure you want to delete it? (y/N) "
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "No user ID with index %d\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "No secondary key with index %d\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "user ID: \""
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, c-format
msgid ""
"\"\n"
@@ -3501,7 +3582,7 @@ msgstr ""
"\"\n"
"signed with your key %s at %s\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, c-format
msgid ""
"\"\n"
@@ -3510,141 +3591,125 @@ msgstr ""
"\"\n"
"locally signed with your key %s at %s\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, c-format
msgid "This signature expired on %s.\n"
msgstr "This signature expired on %s.\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Are you sure you still want to revoke it? (y/N) "
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Create a revocation certificate for this signature? (y/N) "
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "You have signed these user IDs:\n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, c-format
msgid " signed by %s on %s%s%s\n"
msgstr " signed by %s on %s%s%s\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, c-format
msgid " revoked by %s on %s\n"
msgstr " revoked by %s on %s\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "You are about to revoke these signatures:\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, c-format
msgid " signed by %s on %s%s\n"
msgstr " signed by %s on %s%s\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr " (non-exportable)"
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
msgid "Really create the revocation certificates? (y/N) "
msgstr "Really create the revocation certificates? (y/N) "
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "no secret key\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "user ID “%s” is already revoked\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "WARNING: a user ID signature is dated %d seconds in the future\n"
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
-#: g10/keylist.c:179
+#: g10/keylist.c:180
msgid "Critical signature policy: "
msgstr "Critical signature policy: "
-#: g10/keylist.c:181
+#: g10/keylist.c:182
msgid "Signature policy: "
msgstr "Signature policy: "
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr "Critical preferred keyserver: "
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr "Preferred keyserver: "
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "WARNING: invalid notation data found\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
msgid "Critical signature notation: "
msgstr "Critical signature notation: "
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr "Signature notation: "
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr "not human readable"
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr "Keyring"
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, c-format
-msgid " [expired: %s]"
-msgstr " [expired: %s]"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr " [expires: %s]"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, c-format
-msgid " [revoked: %s]"
-msgstr " [revoked: %s]"
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
msgid "Primary key fingerprint:"
msgstr "Primary key fingerprint:"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
msgid " Subkey fingerprint:"
msgstr " Subkey fingerprint:"
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
msgid " Primary key fingerprint:"
msgstr " Primary key fingerprint:"
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
msgid " Subkey fingerprint:"
msgstr " Subkey fingerprint:"
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
msgid " Key fingerprint ="
msgstr " Key fingerprint ="
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr " Card serial no. ="
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3850,77 +3915,77 @@ msgstr "old style (PGP 2.x) signature\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "invalid root packet detected in proc_tree()\n"
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "can't disable core dumps: %s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "Experimental algorithms should not be used!\n"
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr "this cipher algorithm is deprecated; please use a more standard one!\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr "the IDEA cipher plugin is not present\n"
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
-#: g10/misc.c:491
+#: g10/misc.c:517
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: deprecated option “%s”\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "WARNING: “%s” is a deprecated option\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "please use “%s%s” instead\n"
-#: g10/misc.c:508
+#: g10/misc.c:534
msgid "Uncompressed"
msgstr "Uncompressed"
-#: g10/misc.c:533
+#: g10/misc.c:559
msgid "uncompressed|none"
msgstr "uncompressed|none"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "this message may not be usable by %s\n"
-#: g10/misc.c:777
+#: g10/misc.c:826
#, c-format
msgid "ambiguous option `%s'\n"
msgstr "ambiguous option ‘%s’\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, c-format
msgid "unknown option `%s'\n"
msgstr "unknown option ‘%s’\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "can't handle public key algorithm %d\n"
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "WARNING: potentially insecure symmetrically encrypted session key\n"
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpacket of type %d has critical bit set\n"
@@ -3959,7 +4024,7 @@ msgstr "can't connect to ‘%s’: %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "communication problem with gpg-agent\n"
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr "problem with the agent - disabling agent use\n"
@@ -3995,24 +4060,24 @@ msgstr "passphrase too long\n"
msgid "invalid response from agent\n"
msgstr "invalid response from agent\n"
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "cancelled by user\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "problem with the agent: agent returns 0x%lx\n"
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "can't query password in batchmode\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "Enter passphrase: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4022,22 +4087,22 @@ msgstr ""
"You need a passphrase to unlock the secret key for\n"
"user: \""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bit %s key, ID %s, created %s"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (subkey on main key ID %s)"
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, c-format
msgid " (main key ID %s)"
msgstr " (main key ID %s)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "Repeat passphrase: "
@@ -4250,25 +4315,37 @@ msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
"you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
-#: g10/sign.c:765 g10/sign.c:1001
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
#, c-format
-msgid "can't create %s: %s\n"
-msgstr "can't create %s: %s\n"
+msgid "can't create file `%s': %s\n"
+msgstr "can't create file ‘%s’: %s\n"
-#: g10/sign.c:794
+#: g10/sign.c:771 g10/sign.c:1008
#, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgid "writing to file `%s'\n"
+msgstr "writing to file ‘%s’\n"
-#: g10/sign.c:886
+#: g10/sign.c:795
+#, c-format
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
+
+#: g10/sign.c:887
msgid "signing:"
msgstr "signing:"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "can't open file ‘%s’: %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s encryption will be used\n"
@@ -4662,7 +4739,7 @@ msgstr "weak key created - retrying\n"
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr "cannot avoid weak key for symmetric cipher; tried %d times!\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA requires the use of a 160 bit hash algorithm\n"
@@ -5042,17 +5119,17 @@ msgstr "No help available"
msgid "No help available for `%s'"
msgstr "No help available for ‘%s’"
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "error creating keyring ‘%s’: %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr "keyring ‘%s’ created\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "failed to rebuild keyring cache: %s\n"
@@ -5095,8 +5172,7 @@ msgstr "%lu keys cached (%lu signatures)\n"
msgid "%s: keyring created\n"
msgstr "%s: keyring created\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5110,29 +5186,34 @@ msgstr ""
"very large picture, your key will become very large as well!\n"
"Keeping the image close to 240x288 is a good size to use.\n"
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr "Enter JPEG filename for photo ID: "
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "Unable to open photo “%s”: %s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr "This JPEG is really large (%d bytes) !\n"
+
+#: g10/photoid.c:98
msgid "Are you sure you want to use it (y/N)? "
msgstr "Are you sure you want to use it (y/N)? "
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr "“%s” is not a JPEG file\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Is this photo correct (y/N/q)? "
msgstr "Is this photo correct (y/N/q)? "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
msgid "unable to display photo ID!\n"
msgstr "unable to display photo ID!\n"
@@ -5152,43 +5233,49 @@ msgstr ""
"external program calls are disabled due to unsafe options file permissions\n"
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
-msgstr "this platform requires temp files when calling external programs\n"
+msgid "this platform requires temporary files when calling external programs\n"
+msgstr ""
+"this platform requires temporary files when calling external programs\n"
+
+#: g10/exec.c:433
+#, c-format
+msgid "unable to execute program `%s': %s\n"
+msgstr "unable to execute program ‘%s’: %s\n"
-#: g10/exec.c:432
+#: g10/exec.c:436
#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
-msgstr "unable to execute %s “%s”: %s\n"
+msgid "unable to execute shell `%s': %s\n"
+msgstr "unable to execute shell ‘%s’: %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:515
#, c-format
msgid "system error while calling external program: %s\n"
msgstr "system error while calling external program: %s\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr "unnatural exit of external program\n"
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr "unable to execute external program\n"
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr "unable to read external program response: %s\n"
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr "WARNING: unable to remove tempfile (%s) ‘%s’: %s\n"
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "WARNING: unable to remove temp directory ‘%s’: %s\n"
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr "never "
diff --git a/po/[email protected] b/po/[email protected]
index 93099a22f..6c408b653 100644
--- a/po/[email protected]
+++ b/po/[email protected]
Binary files differ
diff --git a/po/[email protected] b/po/[email protected]
index 30c498abb..e726bf36d 100644
--- a/po/[email protected]
+++ b/po/[email protected]
@@ -27,10 +27,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: gnupg 1.3.90-cvs\n"
+"Project-Id-Version: gnupg 1.3.90\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
-"PO-Revision-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
+"PO-Revision-Date: 2004-10-01 10:36+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -70,7 +70,7 @@ msgstr "no"
msgid "nN"
msgstr "nN"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "quit"
@@ -302,6 +302,14 @@ msgstr "unusable secret key"
msgid "keyserver error"
msgstr "keyserver error"
+#: util/errors.c:108
+msgid "canceled"
+msgstr "canceled"
+
+#: util/errors.c:109
+msgid "no card"
+msgstr "no card"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr "ERROR: "
@@ -324,7 +332,7 @@ msgstr "you found a bug ... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "no entropy gathering module detected\n"
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "can't open ‘%s’: %s\n"
@@ -356,7 +364,7 @@ msgstr "can't read ‘%s’: %s\n"
msgid "note: random_seed file not updated\n"
msgstr "note: random_seed file not updated\n"
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr "can't create ‘%s’: %s\n"
@@ -425,7 +433,7 @@ msgstr "can't gen prime with pbits=%u qbits=%u\n"
msgid "can't generate a prime with less than %d bits\n"
msgstr "can't generate a prime with less than %d bits\n"
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -433,127 +441,127 @@ msgstr ""
"@Commands:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[file]|make a signature"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[file]|make a clear text signature"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "make a detached signature"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "encrypt data"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "encryption only with symmetric cipher"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "decrypt data (default)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "verify a signature"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "list keys"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "list keys and signatures"
-#: g10/g10.c:370
+#: g10/g10.c:374
msgid "list and check key signatures"
msgstr "list and check key signatures"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "list keys and fingerprints"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "list secret keys"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "generate a new key pair"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "remove keys from the public keyring"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "remove keys from the secret keyring"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "sign a key"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "sign a key locally"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "sign or edit a key"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "generate a revocation certificate"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "export keys"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "export keys to a key server"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "import keys from a key server"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "search for keys on a key server"
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "update all keys from a keyserver"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "import/merge keys"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr "print the card status"
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr "change data on a card"
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr "change a card's PIN"
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "update the trust database"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|algo [files]|print message digests"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -563,55 +571,51 @@ msgstr ""
"Options:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "create ascii armored output"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|NAME|encrypt for NAME"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr "use this user-id to sign or decrypt"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr "|N|set compress level N (0 disables)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "use canonical text mode"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "use as output file"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "verbose"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "do not make any changes"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "prompt before overwriting"
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr "use strict OpenPGP behavior"
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr "generate PGP 2.x compatible messages"
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr "allow the use of admin card commands"
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -619,7 +623,7 @@ msgstr ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -639,15 +643,15 @@ msgstr ""
" --list-keys [names] show keys\n"
" --fingerprint [names] show fingerprints\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Please report bugs to <[email protected]>.\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Usage: gpg [options] [files] (-h for help)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -657,7 +661,7 @@ msgstr ""
"sign, check, encrypt or decrypt\n"
"default operation depends on the input data\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -665,461 +669,455 @@ msgstr ""
"\n"
"Supported algorithms:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr "Pubkey: "
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr "Cipher: "
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr "Hash: "
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
msgid "Compression: "
msgstr "Compression: "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "usage: gpg [options] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "conflicting commands\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "no = sign found in group definition “%s”\n"
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
-msgstr "WARNING: unsafe ownership on homedir “%s”\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
+msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
-msgstr "WARNING: unsafe ownership on configuration file “%s”\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
+msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
-msgstr "WARNING: unsafe ownership on extension “%s”\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
+msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
-msgstr "WARNING: unsafe permissions on homedir “%s”\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
+msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
-msgstr "WARNING: unsafe permissions on configuration file “%s”\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
+msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
-msgstr "WARNING: unsafe permissions on extension “%s”\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
+msgstr "WARNING: unsafe permissions on extension ‘%s’\n"
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
-msgstr "WARNING: unsafe enclosing directory ownership on homedir “%s”\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
+msgstr "WARNING: unsafe enclosing directory ownership on homedir ‘%s’\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr ""
-"WARNING: unsafe enclosing directory ownership on configuration file “%s”\n"
+"WARNING: unsafe enclosing directory ownership on configuration file ‘%s’\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
-msgstr "WARNING: unsafe enclosing directory ownership on extension “%s”\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
+msgstr "WARNING: unsafe enclosing directory ownership on extension ‘%s’\n"
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
-msgstr "WARNING: unsafe enclosing directory permissions on homedir “%s”\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
+msgstr "WARNING: unsafe enclosing directory permissions on homedir ‘%s’\n"
-#: g10/g10.c:1205
+#: g10/g10.c:1210
#, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr ""
-"WARNING: unsafe enclosing directory permissions on configuration file “%s”\n"
+"WARNING: unsafe enclosing directory permissions on configuration file ‘%s’\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
-msgstr "WARNING: unsafe enclosing directory permissions on extension “%s”\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
+msgstr "WARNING: unsafe enclosing directory permissions on extension ‘%s’\n"
-#: g10/g10.c:1334
+#: g10/g10.c:1354
#, c-format
-msgid "unknown configuration item \"%s\"\n"
-msgstr "unknown configuration item “%s”\n"
+msgid "unknown configuration item `%s'\n"
+msgstr "unknown configuration item ‘%s’\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTE: old default options file ‘%s’ ignored\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTE: no default option file ‘%s’\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "option file ‘%s’: %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "reading options from ‘%s’\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTE: %s is not for normal use!\n"
-#: g10/g10.c:1887
+#: g10/g10.c:2021
#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
-msgstr "cipher extension “%s” not loaded due to unsafe permissions\n"
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
+msgstr "cipher extension ‘%s’ not loaded due to unsafe permissions\n"
-#: g10/g10.c:2099
+#: g10/g10.c:2233
#, c-format
-msgid "%s is not a valid character set\n"
-msgstr "%s is not a valid character set\n"
+msgid "`%s' is not a valid character set\n"
+msgstr "‘%s’ is not a valid character set\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
msgid "could not parse keyserver URL\n"
msgstr "could not parse keyserver URL\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: invalid keyserver options\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
msgid "invalid keyserver options\n"
msgstr "invalid keyserver options\n"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: invalid import options\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
msgid "invalid import options\n"
msgstr "invalid import options\n"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: invalid export options\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
msgid "invalid export options\n"
msgstr "invalid export options\n"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: invalid list options\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
msgid "invalid list options\n"
msgstr "invalid list options\n"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: invalid verify options\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
msgid "invalid verify options\n"
msgstr "invalid verify options\n"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "unable to set exec-path to %s\n"
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "WARNING: program may create a core file!\n"
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "WARNING: %s overrides %s\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s not allowed with %s!\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s makes no sense with %s!\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "you can only make detached or clear signatures while in --pgp2 mode\n"
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "you can't sign and encrypt at the same time while in --pgp2 mode\n"
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"you must use files (and not a pipe) when working with --pgp2 enabled.\n"
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "selected cipher algorithm is invalid\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "selected digest algorithm is invalid\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
msgid "selected compression algorithm is invalid\n"
msgstr "selected compression algorithm is invalid\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
msgid "selected certification digest algorithm is invalid\n"
msgstr "selected certification digest algorithm is invalid\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed must be greater than 0\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed must be greater than 1\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth must be in the range from 1 to 255\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "invalid default-cert-level; must be 0, 1, 2, or 3\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "invalid min-cert-level; must be 1, 2, or 3\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTE: simple S2K mode (0) is strongly discouraged\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "invalid S2K mode; must be 0, 1 or 3\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
msgid "invalid default preferences\n"
msgstr "invalid default preferences\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
msgid "invalid personal cipher preferences\n"
msgstr "invalid personal cipher preferences\n"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
msgid "invalid personal digest preferences\n"
msgstr "invalid personal digest preferences\n"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
msgid "invalid personal compress preferences\n"
msgstr "invalid personal compress preferences\n"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s does not yet work with %s\n"
-#: g10/g10.c:2680
+#: g10/g10.c:2797
#, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
-msgstr "you may not use cipher algorithm “%s” while in %s mode\n"
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
+msgstr "you may not use cipher algorithm ‘%s’ while in %s mode\n"
-#: g10/g10.c:2685
+#: g10/g10.c:2802
#, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
-msgstr "you may not use digest algorithm “%s” while in %s mode\n"
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
+msgstr "you may not use digest algorithm ‘%s’ while in %s mode\n"
-#: g10/g10.c:2690
+#: g10/g10.c:2807
#, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
-msgstr "you may not use compression algorithm “%s” while in %s mode\n"
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
+msgstr "you may not use compression algorithm ‘%s’ while in %s mode\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "failed to initialize the TrustDB: %s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "WARNING: recipients (-r) given without using public key encryption\n"
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [filename]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [filename]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [filename]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [filename]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "you cannot use --symmetric --encrypt while in %s mode\n"
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [filename]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filename]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [filename]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "you cannot use --symmetric --sign --encrypt while in %s mode\n"
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filename]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [filename]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [filename]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrsign-key user-id"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key user-id"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [commands]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "can't open %s: %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [user-id] [keyring]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "keyserver send failed: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "keyserver receive failed: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, c-format
msgid "key export failed: %s\n"
msgstr "key export failed: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "keyserver search failed: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "keyserver refresh failed: %s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dearmoring failed: %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "enarmoring failed: %s\n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "invalid hash algorithm ‘%s’\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[filename]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "Go ahead and type your message ...\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "can't open ‘%s’\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@ -1127,47 +1125,47 @@ msgstr ""
"a notation name must have only printable characters or spaces, and end with "
"an ‘=’\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
msgid "a user notation name must contain the '@' character\n"
msgstr "a user notation name must contain the ‘@’ character\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "a notation value must not use any control characters\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr "the given certification policy URL is invalid\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr "the given signature policy URL is invalid\n"
-#: g10/g10.c:3747
-msgid "the given signature preferred keyserver URL is invalid\n"
-msgstr "the given signature preferred keyserver URL is invalid\n"
+#: g10/g10.c:3863
+msgid "the given preferred keyserver URL is invalid\n"
+msgstr "the given preferred keyserver URL is invalid\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "be somewhat more quiet"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
msgid "take the keys from this keyring"
msgstr "take the keys from this keyring"
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
msgid "make timestamp conflicts only a warning"
msgstr "make timestamp conflicts only a warning"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr "|FD|write status info to this FD"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Usage: gpgv [options] [files] (-h for help)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1201,13 +1199,13 @@ msgid "invalid dash escaped line: "
msgstr "invalid dash escaped line: "
#: g10/armor.c:565
-msgid "unexpected armor:"
-msgstr "unexpected armor:"
+msgid "unexpected armor: "
+msgstr "unexpected armor: "
-#: g10/armor.c:695 g10/armor.c:1276
+#: g10/armor.c:695 g10/armor.c:1280
#, c-format
-msgid "invalid radix64 character %02x skipped\n"
-msgstr "invalid radix64 character %02x skipped\n"
+msgid "invalid radix64 character %02X skipped\n"
+msgstr "invalid radix64 character %02X skipped\n"
#: g10/armor.c:738
msgid "premature eof (no CRC)\n"
@@ -1217,33 +1215,33 @@ msgstr "premature eof (no CRC)\n"
msgid "premature eof (in CRC)\n"
msgstr "premature eof (in CRC)\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "malformed CRC\n"
-#: g10/armor.c:780 g10/armor.c:1313
+#: g10/armor.c:784 g10/armor.c:1317
#, c-format
-msgid "CRC error; %06lx - %06lx\n"
-msgstr "CRC error; %06lx - %06lx\n"
-
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
-msgstr "premature eof (in Trailer)\n"
+msgid "CRC error; %06lX - %06lX\n"
+msgstr "CRC error; %06lX - %06lX\n"
#: g10/armor.c:804
+msgid "premature eof (in trailer)\n"
+msgstr "premature eof (in trailer)\n"
+
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "error in trailer line\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "no valid OpenPGP data found.\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "invalid armor: line longer than %d characters\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1293,7 +1291,7 @@ msgstr " \""
msgid " aka \""
msgstr " aka \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1542,93 +1540,113 @@ msgstr "%s: skipped: public key is disabled\n"
msgid "no valid addressees\n"
msgstr "no valid addressees\n"
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, c-format
msgid "preference `%s' duplicated\n"
msgstr "preference ‘%s’ duplicated\n"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
msgid "too many cipher preferences\n"
msgstr "too many cipher preferences\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
msgid "too many digest preferences\n"
msgstr "too many digest preferences\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
msgid "too many compression preferences\n"
msgstr "too many compression preferences\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "invalid item ‘%s’ in preference string\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
msgid "writing direct signature\n"
msgstr "writing direct signature\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "writing self signature\n"
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "writing key binding signature\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "keysize invalid; using %u bits\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "keysize rounded up to %u bits\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "Please select what kind of key you want:\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA and Elgamal (default)\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (sign only)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (encrypt only)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (sign only)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (encrypt only)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (sign and encrypt)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) RSA (auth only)\n"
+
+#: g10/keygen.c:1224
+#, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) RSA (sign and auth)\n"
+
+#: g10/keygen.c:1226
+#, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) RSA (encrypt and auth)\n"
+
+#: g10/keygen.c:1228
+#, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) RSA (sign, encrypt and auth)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "Your selection? "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "Invalid selection.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1641,28 +1659,28 @@ msgstr ""
" default keysize is 1024 bits\n"
" highest suggested keysize is 2048 bits\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "What keysize do you want? (1024) "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA only allows keysizes from 512 to 1024\n"
-#: g10/keygen.c:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "keysize too small; 1024 is smallest value allowed for RSA.\n"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "keysize too small; 768 is smallest value allowed.\n"
-#: g10/keygen.c:1255
+#: g10/keygen.c:1328
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "keysize too large; %d is largest value allowed.\n"
-#: g10/keygen.c:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1670,11 +1688,11 @@ msgstr ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "Are you sure that you want this keysize? "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1682,17 +1700,17 @@ msgstr ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
-#: g10/keygen.c:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Requested keysize is %u bits\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "rounded up to %u bits\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1708,7 +1726,7 @@ msgstr ""
" <n>m = key expires in n months\n"
" <n>y = key expires in n years\n"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1724,29 +1742,29 @@ msgstr ""
" <n>m = signature expires in n months\n"
" <n>y = signature expires in n years\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "Key is valid for? (0) "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr "Signature is valid for? (0) "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "invalid value\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s does not expire at all\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr "%s expires at %s\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1754,64 +1772,64 @@ msgstr ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
-#: g10/keygen.c:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "Is this correct (y/n)? "
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" “Heinrich Heine (Der Dichter) <[email protected]>”\n"
"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "Real name: "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "Invalid character in name\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr "Name may not start with a digit\n"
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr "Name must be at least 5 characters long\n"
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "Email address: "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "Not a valid email address\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "Comment: "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "Invalid character in comment\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "You are using the ‘%s’ character set.\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1822,27 +1840,27 @@ msgstr ""
" “%s”\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Please don't put the email address into the real name or the comment\n"
-#: g10/keygen.c:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
-#: g10/keygen.c:1542
+#: g10/keygen.c:1615
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:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr "Please correct the error first\n"
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1850,16 +1868,16 @@ msgstr ""
"You need a Passphrase to protect your secret key.\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr "passphrase not correctly repeated; try again"
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1871,7 +1889,7 @@ msgstr ""
"using this program with the option “--edit-key”.\n"
"\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1883,58 +1901,58 @@ msgstr ""
"disks) during the prime generation; this gives the random number\n"
"generator a better chance to gain enough entropy.\n"
-#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr "sorry, can't do this in batch mode\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA keypair will have 1024 bits.\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "Key generation canceled.\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr "writing public key to ‘%s’\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "writing secret key stub to ‘%s’\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "writing secret key to ‘%s’\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "no writable public keyring found: %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "no writable secret keyring found: %s\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "error writing public keyring ‘%s’: %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "error writing secret keyring ‘%s’: %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "public and secret key created and signed.\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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"
@@ -1942,33 +1960,62 @@ msgstr ""
"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"
-#: g10/keygen.c:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Key generation failed: %s\n"
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"key has been created %lu second in future (time warp or clock problem)\n"
-#: g10/keygen.c:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "Really create? "
+#: g10/keygen.c:3184
+#, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "storing key onto card failed: %s\n"
+
+#: g10/keygen.c:3225
+#, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "can't create backup file ‘%s’: %s\n"
+
+#: g10/keygen.c:3248
+#, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "NOTE: backup of card key saved to ‘%s’\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr "length of RSA modulus is not %d\n"
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr "public exponent too large (more than 32 bits)\n"
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr "length of an RSA prime is not %d\n"
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "--output doesn't work for this command\n"
@@ -1979,7 +2026,7 @@ msgstr "--output doesn't work for this command\n"
msgid "%s: can't open: %s\n"
msgstr "%s: can't open: %s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "error creating passphrase: %s\n"
@@ -2007,6 +2054,11 @@ msgstr "%s: WARNING: empty file\n"
msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
msgstr "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "can't open %s: %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -2018,22 +2070,33 @@ msgid ""
msgstr ""
"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
-#: g10/encode.c:526 g10/encode.c:721
+#: g10/encode.c:526
#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-#: g10/encode.c:634 g10/sign.c:863
+#: g10/encode.c:634 g10/sign.c:864
#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
-msgstr "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
+msgstr ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
+
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n"
#: g10/encode.c:818
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s encrypted for: “%s”\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "key ‘%s’ not found: %s\n"
@@ -2066,9 +2129,9 @@ msgstr "WARNING: nothing exported\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "too many entries in pk cache - disabled\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
-msgstr "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+msgid "[User ID not found]"
+msgstr "[User ID not found]"
#: g10/getkey.c:1614
#, c-format
@@ -2220,8 +2283,8 @@ msgstr "key %s: PKS subkey corruption repaired\n"
#: g10/import.c:722
#, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
-msgstr "key %s: accepted non self-signed user ID ‘%s’\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
+msgstr "key %s: accepted non self-signed user ID “%s”\n"
#: g10/import.c:728
#, c-format
@@ -2247,7 +2310,7 @@ msgstr "key %s: new key - skipped\n"
msgid "no writable keyring found: %s\n"
msgstr "no writable keyring found: %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "writing to ‘%s’\n"
@@ -2359,13 +2422,13 @@ msgstr "key %s: no user ID for signature\n"
#: g10/import.c:1299
#, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
-msgstr "key %s: unsupported public key algorithm on user id “%s”\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
+msgstr "key %s: unsupported public key algorithm on user ID “%s”\n"
#: g10/import.c:1301
#, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
-msgstr "key %s: invalid self-signature on user id “%s”\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
+msgstr "key %s: invalid self-signature on user ID “%s”\n"
#: g10/import.c:1319
#, c-format
@@ -2404,8 +2467,8 @@ msgstr "key %s: removed multiple subkey revocation\n"
#: g10/import.c:1439
#, c-format
-msgid "key %s: skipped user ID '%s'\n"
-msgstr "key %s: skipped user ID ‘%s’\n"
+msgid "key %s: skipped user ID \"%s\"\n"
+msgstr "key %s: skipped user ID “%s”\n"
#: g10/import.c:1460
#, c-format
@@ -2414,8 +2477,8 @@ msgstr "key %s: skipped subkey\n"
#: g10/import.c:1487
#, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
-msgstr "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
+msgstr "key %s: non exportable signature (class 0x%02X) - skipped\n"
#: g10/import.c:1497
#, c-format
@@ -2447,76 +2510,76 @@ msgstr "key %s: duplicated user ID detected - merged\n"
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "WARNING: key %s may be revoked: fetching revocation key %s\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "WARNING: key %s may be revoked: revocation key %s not present.\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "key %s: “%s” revocation certificate added\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "key %s: direct key signature added\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[revocation]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[self-signature]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "1 bad signature\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d bad signatures\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "1 signature not checked due to a missing key\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d signatures not checked due to missing keys\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "1 signature not checked due to an error\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d signatures not checked due to errors\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "1 user ID without valid self-signature detected\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "%d user IDs without valid self-signatures detected\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, c-format
msgid " (%d) I trust marginally\n"
msgstr " (%d) I trust marginally\n"
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, c-format
msgid " (%d) I trust fully\n"
msgstr " (%d) I trust fully\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@ -2526,36 +2589,36 @@ msgstr ""
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr "Please enter a domain to restrict this signature, or enter for none.\n"
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "User ID “%s” is revoked."
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Are you sure you still want to sign it? (y/N) "
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr " Unable to sign.\n"
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "User ID “%s” is expired."
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "User ID “%s” is not self-signed."
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2564,11 +2627,11 @@ msgstr ""
"The self-signature on “%s”\n"
"is a PGP 2.x-style signature.\n"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Do you want to promote it to an OpenPGP self-signature? (y/N) "
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2577,12 +2640,12 @@ msgstr ""
"Your current signature on “%s”\n"
"has expired.\n"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Do you want to issue a new signature to replace the expired one? (y/N) "
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2591,43 +2654,43 @@ msgstr ""
"Your current signature on “%s”\n"
"is a local signature.\n"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Do you want to promote it to a full exportable signature? (y/N) "
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "“%s” was already locally signed by key %s\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "“%s” was already signed by key %s\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Do you want to sign it again anyway? (y/N) "
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nothing to sign with key %s\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "This key has expired!"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "This key is due to expire on %s.\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Do you want your signature to expire at the same time? (Y/n) "
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
@@ -2635,11 +2698,11 @@ msgstr ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "This would make the key unusable in PGP 2.x.\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2649,31 +2712,31 @@ msgstr ""
"belongs\n"
"to the person named above? If you don't know what to answer, enter “0”.\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) I will not answer.%s\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) I have not checked at all.%s\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) I have done casual checking.%s\n"
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) I have done very careful checking.%s\n"
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr "Your selection? (enter ‘?’ for more information): "
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2681,7 +2744,7 @@ msgstr ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2689,7 +2752,7 @@ msgstr ""
"\n"
"This will be a self-signature.\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2697,7 +2760,7 @@ msgstr ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2705,7 +2768,7 @@ msgstr ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2713,7 +2776,7 @@ msgstr ""
"\n"
"The signature will be marked as non-exportable.\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2721,7 +2784,7 @@ msgstr ""
"\n"
"The signature will be marked as non-revocable.\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2729,7 +2792,7 @@ msgstr ""
"\n"
"I have not checked this key at all.\n"
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2737,7 +2800,7 @@ msgstr ""
"\n"
"I have checked this key casually.\n"
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2745,34 +2808,34 @@ msgstr ""
"\n"
"I have checked this key very carefully.\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "Really sign? "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "signing failed: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "This key is not protected.\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr "Secret parts of primary key are not available.\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "Key is protected.\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Can't edit this key: %s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2780,7 +2843,7 @@ msgstr ""
"Enter the new passphrase for this secret key.\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2788,538 +2851,556 @@ msgstr ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "Do you really want to do this? "
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "moving a key signature to the correct place\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "quit this menu"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "q"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "save"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "save and quit"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "help"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "show this help"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "show fingerprint"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "list"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "list key and user IDs"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "select user ID N"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "key"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "select secondary key N"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "check"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "list signatures"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "c"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "sign the key"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "s"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
msgid "tsign"
msgstr "tsign"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
msgid "make a trust signature"
msgstr "make a trust signature"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "sign the key locally"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr "sign the key non-revocably"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "sign the key locally and non-revocably"
msgstr "sign the key locally and non-revocably"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "add a user ID"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr "addphoto"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr "add a photo ID"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "delete user ID"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr "delphoto"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "add a secondary key"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+msgid "addcardkey"
+msgstr "addcardkey"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr "add a key to a smartcard"
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr "keytocard"
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr "move a key to a smartcard"
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "delete a secondary key"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "addrevoker"
msgstr "addrevoker"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "add a revocation key"
msgstr "add a revocation key"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "delete signatures"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "change the expire date"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr "primary"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr "flag user ID as primary"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "toggle between secret and public key listing"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "t"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr "list preferences (expert)"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr "list preferences (verbose)"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr "set preference list"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr "updated preferences"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
msgid "keyserver"
msgstr "keyserver"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
msgid "set preferred keyserver URL"
msgstr "set preferred keyserver URL"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "change the passphrase"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "change the ownertrust"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "revoke signatures"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revuid"
msgstr "revuid"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revoke a user ID"
msgstr "revoke a user ID"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "revoke a secondary key"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "disable a key"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "enable a key"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr "showphoto"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr "show photo ID"
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "can't do that in batchmode\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "error reading secret keyblock ‘%s’: %s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "Secret key is available.\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "Command> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "Need the secret key to do this.\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr "Please use the command “toggle” first.\n"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
msgid "Key is revoked."
msgstr "Key is revoked."
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "Really sign all user IDs? "
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "Hint: Select the user IDs to sign\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "This command is not allowed while in %s mode.\n"
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "You must select at least one user ID.\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "You can't delete the last user ID!\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "Really remove all selected user IDs? "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "Really remove this user ID? "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+msgid "Really move the primary key? "
+msgstr "Really move the primary key? "
+
+#: g10/keyedit.c:1598
+msgid "You must select exactly one key.\n"
+msgstr "You must select exactly one key.\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "You must select at least one key.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "Do you really want to delete the selected keys? "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "Do you really want to delete this key? "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
msgid "Really revoke all selected user IDs? "
msgstr "Really revoke all selected user IDs? "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
msgid "Really revoke this user ID? "
msgstr "Really revoke this user ID? "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "Do you really want to revoke the selected keys? "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "Do you really want to revoke this key? "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
"Owner trust may not be set while using an user provided trust database\n"
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
msgid "Set preference list to:\n"
msgstr "Set preference list to:\n"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr "Really update the preferences for the selected user IDs? "
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr "Really update the preferences? "
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "Save changes? "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "Quit without saving? "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "update failed: %s\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "update secret failed: %s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "Key not changed so no update needed.\n"
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "Invalid command (try “help”)\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr "Digest: "
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr "Features: "
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr "Keyserver no-modify"
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr "Preferred keyserver: "
+
+#: g10/keyedit.c:2219
#, c-format
msgid "This key may be revoked by %s key "
msgstr "This key may be revoked by %s key "
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr " (sensitive)"
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, c-format
msgid "created: %s"
msgstr "created: %s"
-#: g10/keyedit.c:2084
-#, c-format
-msgid "revoked: %s"
-msgstr "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+msgid "revoked"
+msgstr "revoked"
-#: g10/keyedit.c:2086
-#, c-format
-msgid "expired: %s"
-msgstr "expired: %s"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+msgid "expired"
+msgstr "expired"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+msgid "expires"
+msgstr "expires"
+
+#: g10/keyedit.c:2246
#, c-format
-msgid "expires: %s"
-msgstr "expires: %s"
+msgid "usage: %s"
+msgstr "usage: %s"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, c-format
msgid "trust: %s"
msgstr "trust: %s"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr "validity: %s"
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "This key has been disabled"
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! subkey has been revoked: %s\n"
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
-msgstr "rev- faked revocation found\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? problem checking revocation: %s\n"
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-msgid "revoked"
-msgstr "revoked"
+#: g10/keyedit.c:2300
+msgid "card-no: "
+msgstr "card-no: "
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-msgid "expired"
-msgstr "expired"
-
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "There are no preferences on a PGP 2.x-style user ID.\n"
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3327,15 +3408,7 @@ msgstr ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-msgid "[revoked] "
-msgstr "[revoked] "
-
-#: g10/keyedit.c:2274
-msgid "[expired] "
-msgstr "[expired] "
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@ -3343,7 +3416,7 @@ msgstr ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3353,45 +3426,45 @@ msgstr ""
"versions\n"
" of PGP to reject this key.\n"
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Are you sure you still want to add it? (y/N) "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "You may not add a photo ID to a PGP2-style key.\n"
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "Delete this good signature? (y/N/q)"
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Delete this invalid signature? (y/N/q)"
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Delete this unknown signature? (y/N/q)"
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "Really delete this self-signature? (y/N)"
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Deleted %d signature.\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Deleted %d signatures.\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "Nothing deleted.\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3401,88 +3474,96 @@ msgstr ""
"cause\n"
" some versions of PGP to reject this key.\n"
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "You may not add a designated revoker to a PGP 2.x-style key.\n"
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
msgid "Enter the user ID of the designated revoker: "
msgstr "Enter the user ID of the designated revoker: "
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "cannot appoint a PGP 2.x style key as a designated revoker\n"
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "you cannot appoint a key as its own designated revoker\n"
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
msgid "this key has already been designated as a revoker\n"
msgstr "this key has already been designated as a revoker\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "WARNING: appointing a key as a designated revoker cannot be undone!\n"
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "Please remove selections from the secret keys.\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "Please select at most one secondary key.\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "Changing expiration time for a secondary key.\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "Changing expiration time for the primary key.\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "You can't change the expiration date of a v3 key\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "No corresponding signature in secret ring\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
msgid "Please select exactly one user ID.\n"
msgstr "Please select exactly one user ID.\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
#, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
-msgstr "skipping v3 self-signature on user id “%s”\n"
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
+msgstr "skipping v3 self-signature on user ID “%s”\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr "Enter your preferred keyserver URL: "
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "Are you sure you want to replace it? (y/N) "
+
+#: g10/keyedit.c:3480
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "Are you sure you want to delete it? (y/N) "
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "No user ID with index %d\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "No secondary key with index %d\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "user ID: \""
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, c-format
msgid ""
"\"\n"
@@ -3491,7 +3572,7 @@ msgstr ""
"\"\n"
"signed with your key %s at %s\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, c-format
msgid ""
"\"\n"
@@ -3500,141 +3581,125 @@ msgstr ""
"\"\n"
"locally signed with your key %s at %s\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, c-format
msgid "This signature expired on %s.\n"
msgstr "This signature expired on %s.\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Are you sure you still want to revoke it? (y/N) "
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Create a revocation certificate for this signature? (y/N) "
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "You have signed these user IDs:\n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, c-format
msgid " signed by %s on %s%s%s\n"
msgstr " signed by %s on %s%s%s\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, c-format
msgid " revoked by %s on %s\n"
msgstr " revoked by %s on %s\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "You are about to revoke these signatures:\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, c-format
msgid " signed by %s on %s%s\n"
msgstr " signed by %s on %s%s\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr " (non-exportable)"
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
msgid "Really create the revocation certificates? (y/N) "
msgstr "Really create the revocation certificates? (y/N) "
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "no secret key\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "user ID “%s” is already revoked\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "WARNING: a user ID signature is dated %d seconds in the future\n"
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
-#: g10/keylist.c:179
+#: g10/keylist.c:180
msgid "Critical signature policy: "
msgstr "Critical signature policy: "
-#: g10/keylist.c:181
+#: g10/keylist.c:182
msgid "Signature policy: "
msgstr "Signature policy: "
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr "Critical preferred keyserver: "
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr "Preferred keyserver: "
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "WARNING: invalid notation data found\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
msgid "Critical signature notation: "
msgstr "Critical signature notation: "
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr "Signature notation: "
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr "not human readable"
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr "Keyring"
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, c-format
-msgid " [expired: %s]"
-msgstr " [expired: %s]"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr " [expires: %s]"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, c-format
-msgid " [revoked: %s]"
-msgstr " [revoked: %s]"
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
msgid "Primary key fingerprint:"
msgstr "Primary key fingerprint:"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
msgid " Subkey fingerprint:"
msgstr " Subkey fingerprint:"
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
msgid " Primary key fingerprint:"
msgstr " Primary key fingerprint:"
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
msgid " Subkey fingerprint:"
msgstr " Subkey fingerprint:"
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
msgid " Key fingerprint ="
msgstr " Key fingerprint ="
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr " Card serial no. ="
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3840,77 +3905,77 @@ msgstr "old style (PGP 2.x) signature\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "invalid root packet detected in proc_tree()\n"
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "can't disable core dumps: %s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "Experimental algorithms should not be used!\n"
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr "this cipher algorithm is deprecated; please use a more standard one!\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr "the IDEA cipher plugin is not present\n"
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
-#: g10/misc.c:491
+#: g10/misc.c:517
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: deprecated option “%s”\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "WARNING: “%s” is a deprecated option\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "please use “%s%s” instead\n"
-#: g10/misc.c:508
+#: g10/misc.c:534
msgid "Uncompressed"
msgstr "Uncompressed"
-#: g10/misc.c:533
+#: g10/misc.c:559
msgid "uncompressed|none"
msgstr "uncompressed|none"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "this message may not be usable by %s\n"
-#: g10/misc.c:777
+#: g10/misc.c:826
#, c-format
msgid "ambiguous option `%s'\n"
msgstr "ambiguous option ‘%s’\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, c-format
msgid "unknown option `%s'\n"
msgstr "unknown option ‘%s’\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "can't handle public key algorithm %d\n"
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "WARNING: potentially insecure symmetrically encrypted session key\n"
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpacket of type %d has critical bit set\n"
@@ -3949,7 +4014,7 @@ msgstr "can't connect to ‘%s’: %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "communication problem with gpg-agent\n"
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr "problem with the agent - disabling agent use\n"
@@ -3985,24 +4050,24 @@ msgstr "passphrase too long\n"
msgid "invalid response from agent\n"
msgstr "invalid response from agent\n"
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "cancelled by user\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "problem with the agent: agent returns 0x%lx\n"
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "can't query password in batchmode\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "Enter passphrase: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4012,22 +4077,22 @@ msgstr ""
"You need a passphrase to unlock the secret key for\n"
"user: \""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bit %s key, ID %s, created %s"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (subkey on main key ID %s)"
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, c-format
msgid " (main key ID %s)"
msgstr " (main key ID %s)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "Repeat passphrase: "
@@ -4240,25 +4305,37 @@ msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
"you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
-#: g10/sign.c:765 g10/sign.c:1001
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
#, c-format
-msgid "can't create %s: %s\n"
-msgstr "can't create %s: %s\n"
+msgid "can't create file `%s': %s\n"
+msgstr "can't create file ‘%s’: %s\n"
-#: g10/sign.c:794
+#: g10/sign.c:771 g10/sign.c:1008
#, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgid "writing to file `%s'\n"
+msgstr "writing to file ‘%s’\n"
-#: g10/sign.c:886
+#: g10/sign.c:795
+#, c-format
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
+
+#: g10/sign.c:887
msgid "signing:"
msgstr "signing:"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "can't open file ‘%s’: %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s encryption will be used\n"
@@ -4652,7 +4729,7 @@ msgstr "weak key created - retrying\n"
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr "cannot avoid weak key for symmetric cipher; tried %d times!\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA requires the use of a 160 bit hash algorithm\n"
@@ -5027,17 +5104,17 @@ msgstr "No help available"
msgid "No help available for `%s'"
msgstr "No help available for ‘%s’"
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "error creating keyring ‘%s’: %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr "keyring ‘%s’ created\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "failed to rebuild keyring cache: %s\n"
@@ -5080,8 +5157,7 @@ msgstr "%lu keys cached (%lu signatures)\n"
msgid "%s: keyring created\n"
msgstr "%s: keyring created\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5095,29 +5171,34 @@ msgstr ""
"very large picture, your key will become very large as well!\n"
"Keeping the image close to 240x288 is a good size to use.\n"
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr "Enter JPEG filename for photo ID: "
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "Unable to open photo “%s”: %s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr "This JPEG is really large (%d bytes) !\n"
+
+#: g10/photoid.c:98
msgid "Are you sure you want to use it (y/N)? "
msgstr "Are you sure you want to use it (y/N)? "
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr "“%s” is not a JPEG file\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Is this photo correct (y/N/q)? "
msgstr "Is this photo correct (y/N/q)? "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
msgid "unable to display photo ID!\n"
msgstr "unable to display photo ID!\n"
@@ -5137,43 +5218,49 @@ msgstr ""
"external program calls are disabled due to unsafe options file permissions\n"
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
-msgstr "this platform requires temp files when calling external programs\n"
+msgid "this platform requires temporary files when calling external programs\n"
+msgstr ""
+"this platform requires temporary files when calling external programs\n"
+
+#: g10/exec.c:433
+#, c-format
+msgid "unable to execute program `%s': %s\n"
+msgstr "unable to execute program ‘%s’: %s\n"
-#: g10/exec.c:432
+#: g10/exec.c:436
#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
-msgstr "unable to execute %s “%s”: %s\n"
+msgid "unable to execute shell `%s': %s\n"
+msgstr "unable to execute shell ‘%s’: %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:515
#, c-format
msgid "system error while calling external program: %s\n"
msgstr "system error while calling external program: %s\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr "unnatural exit of external program\n"
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr "unable to execute external program\n"
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr "unable to read external program response: %s\n"
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr "WARNING: unable to remove tempfile (%s) ‘%s’: %s\n"
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "WARNING: unable to remove temp directory ‘%s’: %s\n"
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr "never "
diff --git a/po/eo.po b/po/eo.po
index 750738f1d..4c27e33ac 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.6d\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
"PO-Revision-Date: 2002-04-14 14:33+0100\n"
"Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
"Language-Team: Esperanto <[email protected]>\n"
@@ -48,7 +48,7 @@ msgstr "ne"
msgid "nN"
msgstr "nN"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "fini"
@@ -281,6 +281,16 @@ msgstr "neuzebla sekreta �losilo"
msgid "keyserver error"
msgstr "�losilservila eraro"
+#: util/errors.c:108
+#, fuzzy
+msgid "canceled"
+msgstr "nuligita de uzanto\n"
+
+#: util/errors.c:109
+#, fuzzy
+msgid "no card"
+msgstr "ne �ifrita"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr ""
@@ -303,7 +313,7 @@ msgstr "vi trovis cimon ... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr ""
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "ne povas malfermi '%s': %s\n"
@@ -336,7 +346,7 @@ msgstr "ne povas legi '%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "noto: dosiero random_seed ne aktualigita\n"
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr "ne povas krei '%s': %s\n"
@@ -402,7 +412,7 @@ msgstr ""
msgid "can't generate a prime with less than %d bits\n"
msgstr ""
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -410,128 +420,128 @@ msgstr ""
"@Komandoj:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[dosiero]|fari subskribon"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[dosiero]|fari klartekstan subskribon"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "fari apartan subskribon"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "�ifri datenojn"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "�ifri nur kun simetria �ifro"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "mal�ifri datenojn (implicita elekto)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "kontroli subskribon"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "listigi �losilojn"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "listigi �losilojn kaj subskribojn"
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "kontroli �losilsubskribojn"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "listigi �losilojn kaj fingro�purojn"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "listigi sekretajn �losilojn"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "krei novan �losilparon"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "forigi �losilojn de la publika �losilaro"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "forigi �losilojn de la sekreta �losilaro"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "subskribi �losilon"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "subskribi �losilon loke"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "subskribi a� redakti �losilon"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "krei revokatestilon"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "eksporti �losilojn"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "eksporti �losilojn al �losilservilo"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "importi �losilojn de �losilservilo"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "ser�i �losilojn �e �losilservilo"
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "aktualigi �iujn �losilojn de �losilservilo"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "importi/kunfandi �losilojn"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "aktualigi la fido-datenaron"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -541,55 +551,51 @@ msgstr ""
"Opcioj:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "krei eligon en askia kiraso"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|NOMO|�ifri por NOMO"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr "|N|difini densig-nivelon N (0=nenia)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "uzi tekstan re�imon"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "uzi dosieron por eligo"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "detala eligo"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "fari neniajn �an�ojn"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr ""
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -597,7 +603,7 @@ msgstr ""
"@\n"
"(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -617,15 +623,15 @@ msgstr ""
" --list-keys [nomoj] montri �losilojn\n"
" --fingerprint [nomoj] montri fingro�purojn\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -635,7 +641,7 @@ msgstr ""
"subskribi, kontroli, �ifri a� mal�ifri\n"
"implicita operacio dependas de la enigataj datenoj\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -643,476 +649,470 @@ msgstr ""
"\n"
"Realigitaj metodoj:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr ""
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr ""
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr ""
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
#, fuzzy
msgid "Compression: "
msgstr "Komento: "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "uzado: gpg [opcioj] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "malkongruaj komandoj\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr ""
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
-#: g10/g10.c:1205
+#: g10/g10.c:1210
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
-#: g10/g10.c:1334
+#: g10/g10.c:1354
#, fuzzy, c-format
-msgid "unknown configuration item \"%s\"\n"
+msgid "unknown configuration item `%s'\n"
msgstr "%s: nova opcio-dosiero kreita\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, fuzzy, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "opcio-dosiero '%s': %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "legas opciojn el '%s'\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTO: %s ne estas por normala uzado!\n"
-#: g10/g10.c:1887
+#: g10/g10.c:2021
#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr ""
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "%s ne estas valida signaro\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "ne povis analizi URI de �losilservilo\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "nevalida �losilaro"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, fuzzy, c-format
msgid "%s:%d: invalid import options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
#, fuzzy
msgid "invalid import options\n"
msgstr "nevalida kiraso"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, fuzzy, c-format
msgid "%s:%d: invalid export options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
#, fuzzy
msgid "invalid export options\n"
msgstr "nevalida �losilaro"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "nevalida kiraso"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "nevalida �losilaro"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr ""
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTO: programo povas krei core-dosieron!\n"
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVERTO: %s nuligas %s\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ne eblas kun %s!\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ne havas sencon kun %s!\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "eblas fari nur apartajn kaj klartekstajn subskribojn kun --pgp2\n"
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "ne eblas samtempe subskribi kaj �ifri kun --pgp2\n"
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n"
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "�ifri mesa�on kun --pgp2 postulas la �ifron IDEA\n"
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "elektita �ifrad-metodo ne validas\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "elektita kompendi-metodo ne validas\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "elektita �ifrad-metodo ne validas\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
#, fuzzy
msgid "selected certification digest algorithm is invalid\n"
msgstr "elektita kompendi-metodo ne validas\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed devas esti pli granda ol 0\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed devas esti pli granda ol 1\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
#, fuzzy
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
#, fuzzy
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
#, fuzzy
msgid "invalid default preferences\n"
msgstr "nevalidaj preferoj\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
#, fuzzy
msgid "invalid personal cipher preferences\n"
msgstr "nevalidaj preferoj\n"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
#, fuzzy
msgid "invalid personal digest preferences\n"
msgstr "nevalidaj preferoj\n"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
#, fuzzy
msgid "invalid personal compress preferences\n"
msgstr "nevalidaj preferoj\n"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ne havas sencon kun %s!\n"
-#: g10/g10.c:2680
+#: g10/g10.c:2797
#, fuzzy, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "Tiu komando ne eblas en la re�imo %s.\n"
-#: g10/g10.c:2685
+#: g10/g10.c:2802
#, fuzzy, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "Tiu komando ne eblas en la re�imo %s.\n"
-#: g10/g10.c:2690
+#: g10/g10.c:2807
#, fuzzy, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "Tiu komando ne eblas en la re�imo %s.\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [dosiero]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [dosiero]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [dosiero]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "Tiu komando ne eblas en la re�imo %s.\n"
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [dosiero]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "Tiu komando ne eblas en la re�imo %s.\n"
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [dosiero]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [dosiero]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [dosiero]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key uzantidentigilo"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key uzantidentigilo"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrsign-key uzantidentigilo"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key uzantidentigilo"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key uzantidentigilo [komandoj]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "ne povas malfermi %s: %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "get_dir_record: search_record malsukcesis: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "elkirasigo malsukcesis: %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "nevalida kompendi-metodo '%s'\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[dosiero]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "Ektajpu vian mesa�on ...\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "ne povas malfermi '%s'\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
#, fuzzy
msgid ""
"a notation name must have only printable characters or spaces, and end with "
@@ -1121,52 +1121,52 @@ msgstr ""
"notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
"kaj fini per '='\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
#, fuzzy
msgid "a user notation name must contain the '@' character\n"
msgstr "notacia valoro ne povas enhavi stirsignojn\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "notacia valoro ne povas enhavi stirsignojn\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr "la donita gvidlinia URL por atestado ne validas\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
-#: g10/g10.c:3747
+#: g10/g10.c:3863
#, fuzzy
-msgid "the given signature preferred keyserver URL is invalid\n"
+msgid "the given preferred keyserver URL is invalid\n"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "iom malpli da informoj"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
#, fuzzy
msgid "take the keys from this keyring"
msgstr "�u forvi�i �i tiun �losilon de la �losilaro? "
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
#, fuzzy
msgid "make timestamp conflicts only a warning"
msgstr "malkongruo de tempostampoj"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
#, fuzzy
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1198,12 +1198,13 @@ msgid "invalid dash escaped line: "
msgstr "nevalida strek-eskapita linio: "
#: g10/armor.c:565
-msgid "unexpected armor:"
+#, fuzzy
+msgid "unexpected armor: "
msgstr "neatendita kiraso:"
-#: g10/armor.c:695 g10/armor.c:1276
-#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+#: g10/armor.c:695 g10/armor.c:1280
+#, fuzzy, c-format
+msgid "invalid radix64 character %02X skipped\n"
msgstr "nevalida signo %02x en bazo 64 ignorita\n"
#: g10/armor.c:738
@@ -1214,33 +1215,34 @@ msgstr "tro frua dosierfino (nenia CRC)\n"
msgid "premature eof (in CRC)\n"
msgstr "tro frua dosierfino (en CRC)\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "misformita CRC\n"
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC-eraro; %06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+#, fuzzy
+msgid "premature eof (in trailer)\n"
msgstr "tro frua dosierfino (en vosto)\n"
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "eraro en vostolinio\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "nevalida kiraso: linio pli longa ol %d signojn\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1298,7 +1300,7 @@ msgstr " alinome \""
msgid " aka \""
msgstr " alinome \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1551,97 +1553,117 @@ msgstr "%s: ignorita: publika �losilo estas mal�altita\n"
msgid "no valid addressees\n"
msgstr "mankas validaj adresitoj\n"
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "prefero %c%lu ripetita\n"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "tro da '%c'-preferoj\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
#, fuzzy
msgid "too many digest preferences\n"
msgstr "tro da '%c'-preferoj\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
#, fuzzy
msgid "too many compression preferences\n"
msgstr "tro da '%c'-preferoj\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "nevalida signo en signo�eno\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
#, fuzzy
msgid "writing direct signature\n"
msgstr "skribas mem-subskribon\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "skribas mem-subskribon\n"
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "skribas �losilbindan subskribon\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "�losilgrando nevalida; uzas %u bitojn\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "�losilgrando rondigita �is %u bitoj\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA kaj ElGamal (implicita elekto)\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (nur subskribi)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (nur �ifri)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (nur subskribi)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (nur �ifri)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (subskribi kaj �ifri)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, fuzzy, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) RSA (nur subskribi)\n"
+
+#: g10/keygen.c:1224
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) RSA (subskribi kaj �ifri)\n"
+
+#: g10/keygen.c:1226
+#, fuzzy, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) RSA (nur �ifri)\n"
+
+#: g10/keygen.c:1228
+#, fuzzy, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) RSA (subskribi kaj �ifri)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "Via elekto? "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "Nevalida elekto.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1654,28 +1676,28 @@ msgstr ""
" implicita �losilgrando estas 1024 bitoj\n"
" plej granda rekomendata �losilgrando estas 2048 bitoj\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "Kiun �losilgrandon vi deziras? (1024) "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA permesas �losilgrandon nur inter 512 kaj 1024\n"
-#: g10/keygen.c:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "�losilgrando tro malgranda; 1024 estas plej eta valoro por RSA.\n"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "�losilgrando tro malgranda; 768 estas plej eta permesata valoro.\n"
-#: g10/keygen.c:1255
+#: g10/keygen.c:1328
#, 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:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1683,11 +1705,11 @@ msgstr ""
"�losilgrandoj pli grandaj ol 2048 ne estas rekomendataj,\n"
"�ar la komputado da�ras TRE longe!\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "�u vi estas certa, ke vi deziras �i tiun �losilgrandon? "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1695,17 +1717,17 @@ msgstr ""
"Bone, sed pripensu, ke la elradiado de viaj ekrano kaj klavaro estas tre "
"facile kaptebla!\n"
-#: g10/keygen.c:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Petita �losilgrando estas %u bitoj\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "rondigita �is %u bitoj\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1721,7 +1743,7 @@ msgstr ""
" <n>m = �losilo eksvalidi�os post n monatoj\n"
" <n>y = �losilo eksvalidi�os post n jaroj\n"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1737,29 +1759,29 @@ msgstr ""
" <n>m = �losilo eksvalidi�os post n monatoj\n"
" <n>y = �losilo eksvalidi�os post n jaroj\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "�losilo validu ...? (0) "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr "�losilo validu por ...? (0) "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "nevalida valoro\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s neniam eksvalidi�os\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr "%s eksvalidi�os je %s\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1767,16 +1789,17 @@ msgstr ""
"Via sistemo ne povas montri datojn post 2038.\n"
"Tamen, �i estos �uste traktata �is 2106.\n"
-#: g10/keygen.c:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "�u tio estas �usta (j/n)? "
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
+#, fuzzy
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
@@ -1786,44 +1809,44 @@ msgstr ""
" \"Heinrich Heine (la poeto) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "Vera nomo: "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "Nevalida signo en nomo\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr "Nomo ne povas komenci�i per cifero\n"
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr "Nomo devas havi almena� 5 signojn\n"
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "Retadreso: "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "Nevalida retadreso\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "Komento: "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "Nevalida signo en komento\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Vi uzas la signaron '%s'.\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1834,27 +1857,27 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
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:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "NnKkAaBbFf"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
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:1542
+#: g10/keygen.c:1615
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:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr "Bonvolu korekti la eraron unue\n"
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1862,16 +1885,16 @@ msgstr ""
"Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1883,7 +1906,7 @@ msgstr ""
"uzante �i tiun programon kun la opcio \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1895,59 +1918,59 @@ msgstr ""
"kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
"akiri sufi�e da entropio.\n"
-#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
#, fuzzy
msgid "sorry, can't do this in batch mode\n"
msgstr "ne povas fari tion en neinteraga re�imo\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA-�losilparo havos 1024 bitojn.\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "Kreado de �losiloj nuligita.\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr "skribas publikan �losilon al '%s'\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "skribas sekretan �losilon al '%s'\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "skribas sekretan �losilon al '%s'\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "neniu skribebla publika �losilaro trovita: %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "neniu skribebla sekreta �losilaro trovita: %s\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "eraro dum skribado de publika �losilaro '%s': %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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"
@@ -1955,12 +1978,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:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1968,7 +1991,7 @@ msgstr ""
"�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
"horlo�eraro)\n"
-#: g10/keygen.c:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1976,14 +1999,43 @@ msgstr ""
"�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
"horlo�eraro)\n"
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTO: krei sub�losilojn por v3-�losiloj ne estas OpenPGP-kongrue\n"
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "�u vere krei? "
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "ne povas krei '%s': %s\n"
+
+#: g10/keygen.c:3248
+#, fuzzy, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "--output ne funkcias por �i tiu komando\n"
@@ -1994,7 +2046,7 @@ msgstr "--output ne funkcias por �i tiu komando\n"
msgid "%s: can't open: %s\n"
msgstr "%s: ne povas malfermi: %s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
@@ -2022,6 +2074,11 @@ msgstr "%s: AVERTO: malplena dosiero\n"
msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
msgstr "eblas �ifri nur per RSA-�losiloj de maksimume 2048 bitoj kun --pgp2\n"
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "ne povas malfermi %s: %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -2032,22 +2089,30 @@ msgid ""
"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
msgstr "ne povas uzi la �ifron IDEA por �iuj �losiloj, al kiuj vi �ifras.\n"
-#: g10/encode.c:526 g10/encode.c:721
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
+#: g10/encode.c:526
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
-#: g10/encode.c:634 g10/sign.c:863
+#: g10/encode.c:634 g10/sign.c:864
#, fuzzy, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
#: g10/encode.c:818
#, fuzzy, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s-�ifrita por: %s\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "�losilo '%s' ne trovita: %s\n"
@@ -2080,8 +2145,9 @@ msgstr "AVERTO: nenio estis eksportita\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "tro da registroj en pk-staplo - mal�altas\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+#, fuzzy
+msgid "[User ID not found]"
msgstr "[Uzantidentigilo ne trovita]"
#: g10/getkey.c:1614
@@ -2234,7 +2300,7 @@ msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
#: g10/import.c:722
#, fuzzy, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "�losilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
#: g10/import.c:728
@@ -2261,7 +2327,7 @@ msgstr "�losilo %08lX: nova �losilo - ignorita\n"
msgid "no writable keyring found: %s\n"
msgstr "neniu skribebla �losilaro trovita: %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "skribas al '%s'\n"
@@ -2374,12 +2440,12 @@ msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
#: g10/import.c:1299
#, fuzzy, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
#: g10/import.c:1301
#, fuzzy, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "�losilo %08lX: nevalida mem-subskribo\n"
#: g10/import.c:1319
@@ -2419,7 +2485,7 @@ msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
#: g10/import.c:1439
#, fuzzy, c-format
-msgid "key %s: skipped user ID '%s'\n"
+msgid "key %s: skipped user ID \"%s\"\n"
msgstr "�losilo %08lX: ignoris uzantidentigilon '"
#: g10/import.c:1460
@@ -2429,7 +2495,7 @@ msgstr "�losilo %08lX: ignoris sub�losilon\n"
#: g10/import.c:1487
#, fuzzy, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
#: g10/import.c:1497
@@ -2462,113 +2528,113 @@ msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "�losilo %08lX: revokatestilo aldonita\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[revoko]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[mem-subskribo]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "1 malbona subskribo\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d malbonaj subskriboj\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "1 subskribo ne kontrolita pro manko de �losilo\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d subskriboj ne kontrolitaj pro manko de �losiloj\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "1 subskribo ne kontrolita pro eraro\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d subskriboj ne kontrolitaj pro eraroj\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "1 uzantidentigilo sen valida mem-subskribo estis trovita\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "%d uzantidentigiloj sen valida mem-subskribo estis trovitaj\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, fuzzy, c-format
msgid " (%d) I trust marginally\n"
msgstr " %d = Mi fidas iomete\n"
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, fuzzy, c-format
msgid " (%d) I trust fully\n"
msgstr " %d = Mi plene fidas\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, fuzzy, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
#, fuzzy
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr ""
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, fuzzy, c-format
msgid "User ID \"%s\" is expired."
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, fuzzy, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "AVERTO: '%s' estas malplena dosiero\n"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, fuzzy, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2579,7 +2645,7 @@ msgstr ""
"\n"
"�u vi volas igi �in plena eksportebla subskribo?\n"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
#, fuzzy
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr ""
@@ -2588,7 +2654,7 @@ msgstr ""
"\n"
"�u vi volas igi �in plena eksportebla subskribo?\n"
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, fuzzy, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2599,12 +2665,12 @@ msgstr ""
"\n"
"�u vi volas igi �in plena eksportebla subskribo?\n"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
#, fuzzy
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "�u vi volas, ke via subskribo eksvalidi�u je la sama tempo? (j/n) "
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, fuzzy, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2615,7 +2681,7 @@ msgstr ""
"\n"
"�u vi volas igi �in plena eksportebla subskribo?\n"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
#, fuzzy
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
@@ -2624,53 +2690,53 @@ msgstr ""
"\n"
"�u vi volas igi �in plena eksportebla subskribo?\n"
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
#, fuzzy
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nenio por subskribi per �losilo %08lX\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "�i tiu �losilo eksvalidi�is!"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
#, fuzzy
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "�u vi volas, ke via subskribo eksvalidi�u je la sama tempo? (j/n) "
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
#, fuzzy
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
msgstr "eblas subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
#, fuzzy
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2679,31 +2745,31 @@ msgstr ""
"Kiom zorge vi kontrolis, ke la �losilo, kiun vi subskribos, vere apartenas\n"
"al la supre nomita persono? Se vi ne scias la respondon, donu \"0\".\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Mi ne respondas.%s\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Mi tute ne kontrolis.%s\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Mi malzorge kontrolis.%s\n"
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Mi tre zorge kontrolis.%s\n"
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr ""
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2711,14 +2777,14 @@ msgstr ""
"�u vi estas tute certa, ke vi volas subskribi �i tiun �losilon\n"
"per via �losilo: \""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
#, fuzzy
msgid ""
"\n"
"This will be a self-signature.\n"
msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
#, fuzzy
msgid ""
"\n"
@@ -2727,7 +2793,7 @@ msgstr ""
"\n"
"La subskribo estos markita kiel neeksportebla.\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
#, fuzzy
msgid ""
"\n"
@@ -2736,7 +2802,7 @@ msgstr ""
"\n"
"La subskribo estos markita kiel nerevokebla.\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2744,7 +2810,7 @@ msgstr ""
"\n"
"La subskribo estos markita kiel neeksportebla.\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2752,7 +2818,7 @@ msgstr ""
"\n"
"La subskribo estos markita kiel nerevokebla.\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2760,7 +2826,7 @@ msgstr ""
"\n"
"Mi tute ne kontrolis �i tiun �losilon.\n"
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2768,7 +2834,7 @@ msgstr ""
"\n"
"Mi malzorge kontrolis �i tiun �losilon.\n"
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2776,34 +2842,34 @@ msgstr ""
"\n"
"Mi tre zorge kontrolis �i tiun �losilon.\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "�u vere subskribi? "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "subskribado malsukcesis: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "�i tiu �losilo ne estas protektita.\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "�losilo estas protektita.\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Ne povas redakti �i tiun �losilon: %s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2811,7 +2877,7 @@ msgstr ""
"Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2819,573 +2885,585 @@ msgstr ""
"Vi ne deziras pasfrazon - tio ver�ajne estas *malbona* ideo!\n"
"\n"
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "�u vi vere volas fari tion? "
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "movas �losilsubskribon al la �usta loko\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "forlasi �i tiun menuon"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "f"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "skribi"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "skribi kaj fini"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "helpo"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "montri �i tiun helpon"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "fsp"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "montri fingrospuron"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "listo"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "listigi �losilojn kaj uzantidentigilojn"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "elekti uzantidentigilon N"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "�losilo"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "elekti flankan �losilon N"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "kontroli"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "listigi subskribojn"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "k"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "subskribi"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "subskribi la �losilon"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "s"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "tsign"
msgstr "subskribi"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "make a trust signature"
msgstr "fari apartan subskribon"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "lsub"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "subskribi la �losilon loke"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr "nrsub"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr "subskribi la �losilon nerevokeble"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr "nrlsub"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "sign the key locally and non-revocably"
msgstr "subskribi la �losilon loke kaj nerevokeble"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "spuri"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "aluid"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "aldoni uzantidentigilon"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr "alfoto"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr "aldoni foto-identigilon"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "foruid"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "forvi�i uzantidentigilon"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr "forfoto"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "al"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "aldoni flankan �losilon"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+#, fuzzy
+msgid "addcardkey"
+msgstr "al"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "for"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "forvi�i flankan �losilon"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
#, fuzzy
msgid "addrevoker"
msgstr "revokita"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
#, fuzzy
msgid "add a revocation key"
msgstr "aldoni flankan �losilon"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "forsig"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "forvi�i subskribojn"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "eksval"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "�an�i la daton de eksvalidi�o"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr "�efa"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr "marku uzantidentigilon kiel �efan"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "alia"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "de sekreta a� publika listo iri al la alia"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "a"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr "listigi preferojn (spertula)"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr "monpref"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr "listigi preferojn (detale)"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr "agpref"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr "agordi liston de preferoj"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr "aktpref"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr "aktualigitaj preferoj"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "keyserver"
msgstr "�losilservila eraro"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "set preferred keyserver URL"
msgstr "ne povis analizi URI de �losilservilo\n"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "pasf"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "�an�i la pasfrazon"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "fido"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "�an�i la posedantofidon"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "revoki subskribojn"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
#, fuzzy
msgid "revuid"
msgstr "revsig"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
#, fuzzy
msgid "revoke a user ID"
msgstr "aldoni uzantidentigilon"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "rev"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "revoki flankan �losilon"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "el"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "mal�alti �losilon"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "en"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "�alti �losilon"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr "monfoto"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr "montri foto-identigilon"
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "ne povas fari tion en neinteraga re�imo\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "eraro dum legado de sekreta �losilbloko '%s': %s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "Sekreta �losilo estas havebla.\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "Komando> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "Bezonas la sekretan �losilon por fari tion.\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
#, fuzzy
msgid "Key is revoked."
msgstr "�losilo estas revokita.\n"
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "�u vere subskribi �iujn uzantidentigilojn? "
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Tiu komando ne eblas en la re�imo %s.\n"
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "�u vere forigi �i tiun uzantidentigilon? "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+#, fuzzy
+msgid "Really move the primary key? "
+msgstr "�u vere forigi �i tiun uzantidentigilon? "
+
+#: g10/keyedit.c:1598
+#, fuzzy
+msgid "You must select exactly one key.\n"
+msgstr "Vi devas elekti almena� unu �losilon.\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "Vi devas elekti almena� unu �losilon.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "�u vi vere volas forvi�i �i tiun �losilon? "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
#, fuzzy
msgid "Really revoke all selected user IDs? "
msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
#, fuzzy
msgid "Really revoke this user ID? "
msgstr "�u vere forigi �i tiun uzantidentigilon? "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "�u vi vere volas revoki la elektitajn �losilojn? "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "�u vi vere volas revoki �i tiun �losilon? "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
#, fuzzy
msgid "Set preference list to:\n"
msgstr "agordi liston de preferoj"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr "�u vere aktualigi la preferojn? "
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "�u skribi �an�ojn? "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "�u fini sen skribi �an�ojn? "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "aktualigo de sekreto malsukcesis: %s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "Nevalida komando (provu per \"helpo\")\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr ""
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr ""
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keyedit.c:2219
#, fuzzy, c-format
msgid "This key may be revoked by %s key "
msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr " (sentema)"
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "ne povas krei %s: %s\n"
-#: g10/keyedit.c:2084
-#, fuzzy, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
msgstr "rev"
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
-msgstr " [eksvalidi�os: %s]"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "eksval"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
+msgstr "eksval"
+
+#: g10/keyedit.c:2246
#, fuzzy, c-format
-msgid "expires: %s"
-msgstr " [eksvalidi�os: %s]"
+msgid "usage: %s"
+msgstr " fido: %c/%c"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, fuzzy, c-format
msgid "trust: %s"
msgstr " fido: %c/%c"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "�i tiu �losilo estas mal�altita"
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! sub�losilo estas revokita: %s\n"
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
-msgstr "rev- falsita revoko trovita\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? problemo en kontrolo de revoko: %s\n"
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-#, fuzzy
-msgid "revoked"
-msgstr "rev"
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-#, fuzzy
-msgid "expired"
-msgstr "eksval"
+#: g10/keyedit.c:2300
+msgid "card-no: "
+msgstr ""
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr ""
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
msgstr ""
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-#, fuzzy
-msgid "[revoked] "
-msgstr "rev"
-
-#: g10/keyedit.c:2274
-#, fuzzy
-msgid "[expired] "
-msgstr "eksval"
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
msgstr ""
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3394,46 +3472,46 @@ msgstr ""
"AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
" ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
#, fuzzy
msgid "Are you sure you still want to add it? (y/N) "
msgstr "�u vi estas certa, ke vi ankora� volas aldoni �in? (j/n) "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila �losilo.\n"
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Forvi�is %d subskribon.\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Forvi�is %d subskribojn.\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "Nenio estis forvi�ita.\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
#, fuzzy
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
@@ -3443,91 +3521,101 @@ msgstr ""
"AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
" ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
#, fuzzy
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila �losilo.\n"
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
#, fuzzy
msgid "Enter the user ID of the designated revoker: "
msgstr "Donu la �losilgrandon"
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "�an�as la daton de eksvalidi�o de la �efa �losilo.\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "Mankas responda subskribo en sekreta �losilaro\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
msgid "Please select exactly one user ID.\n"
msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
#, fuzzy, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "�losilo %08lX: nevalida mem-subskribo\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+#, fuzzy
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
+
+#: g10/keyedit.c:3480
+#, fuzzy
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "Mankas uzantidentigilo kun indekso %d\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Mankas flanka �losilo kun indekso %d\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "uzantidentigilo: \""
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3536,7 +3624,7 @@ msgstr ""
"\"\n"
"subskribita per via �losilo %08lX je %s\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3545,151 +3633,135 @@ msgstr ""
"\"\n"
"subskribita per via �losilo %08lX je %s\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, fuzzy, c-format
msgid "This signature expired on %s.\n"
msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
#, fuzzy
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "�u vi estas certa, ke vi ankora� volas aldoni �in? (j/n) "
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
#, fuzzy
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid " signed by %s on %s%s%s\n"
msgstr " subskribita per %08lX je %s%s\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid " revoked by %s on %s\n"
msgstr " revokita de %08lX je %s\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "Vi revokos la sekvajn subskribojn:\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, fuzzy, c-format
msgid " signed by %s on %s%s\n"
msgstr " subskribita per %08lX je %s%s\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr ""
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
#, fuzzy
msgid "Really create the revocation certificates? (y/N) "
msgstr "�u vere krei la revokatestilojn? (j/N)"
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "mankas sekreta �losilo\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, fuzzy, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
-#: g10/keylist.c:179
+#: g10/keylist.c:180
#, fuzzy
msgid "Critical signature policy: "
msgstr "Subskribo-gvidlinioj: "
-#: g10/keylist.c:181
+#: g10/keylist.c:182
msgid "Signature policy: "
msgstr "Subskribo-gvidlinioj: "
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "AVERTO: nevalida notacia dateno trovita\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
#, fuzzy
msgid "Critical signature notation: "
msgstr "Subskribo-notacio: "
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr "Subskribo-notacio: "
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr "ne homlegebla"
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr "�losilaro"
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr " [eksvalidi�os: %s]"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr " [eksvalidi�os: %s]"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, fuzzy, c-format
-msgid " [revoked: %s]"
-msgstr "rev"
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
#, fuzzy
msgid "Primary key fingerprint:"
msgstr "listigi �losilojn kaj fingro�purojn"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
#, fuzzy
msgid " Subkey fingerprint:"
msgstr " �losilo-fingrospuro ="
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
#, fuzzy
msgid " Primary key fingerprint:"
msgstr " �losilo-fingrospuro ="
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
#, fuzzy
msgid " Subkey fingerprint:"
msgstr " �losilo-fingrospuro ="
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr " �losilo-fingrospuro ="
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3899,79 +3971,79 @@ msgstr "malnovstila subskribo (PGP 2.x)\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "nevalida radikpaketo trovita en proc_tree()\n"
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "ne povas mal�alti kreadon de core-dosieroj: %s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "Eksperimentaj metodoj ne estu uzataj!\n"
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr "�i tiu �ifrad-metodo estas malrekomendata; bonvolu uzi pli normalan!\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr "la aldona�o por la �ifro IDEA en �eestas\n"
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr ""
"bonvolu vidi http://www.gnupg.org/why-not-idea.html por pliaj informoj\n"
-#: g10/misc.c:491
+#: g10/misc.c:517
#, fuzzy, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr ""
-#: g10/misc.c:508
+#: g10/misc.c:534
#, fuzzy
msgid "Uncompressed"
msgstr "ne traktita"
-#: g10/misc.c:533
+#: g10/misc.c:559
#, fuzzy
msgid "uncompressed|none"
msgstr "ne traktita"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, fuzzy, c-format
msgid "this message may not be usable by %s\n"
msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
-#: g10/misc.c:777
+#: g10/misc.c:826
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "legas opciojn el '%s'\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "nekonata implicita ricevonto '%s'\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "ne povas trakti publik�losilan metodon %d\n"
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
@@ -4010,7 +4082,7 @@ msgstr "ne povas konekti�i al '%s': %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "komunikproblemo kun gpg-agent\n"
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr "problemo kun agento - mal�altas uzadon de agento\n"
@@ -4046,24 +4118,24 @@ msgstr "pasfrazo estas tro longa\n"
msgid "invalid response from agent\n"
msgstr "nevalida respondo de agento\n"
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "nuligita de uzanto\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "problemo kun agento: agento redonas 0x%lx\n"
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "ne povas kontroli pasvorton en neinteraga re�imo\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "Donu pasfrazon: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4073,22 +4145,22 @@ msgstr ""
"Vi bezonas pasfrazon por mal�losi la sekretan �losilon\n"
"por la uzanto: \""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bita %s-�losilo, %08lX, kreita je %s"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (�ef�losilo %08lX)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "Ripetu pasfrazon: "
@@ -4307,26 +4379,37 @@ msgstr "AVERTO: '%s' estas malplena dosiero\n"
msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "eblas subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
-msgstr "ne povas krei %s: %s\n"
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
+msgstr "ne povas krei '%s': %s\n"
+
+#: g10/sign.c:771 g10/sign.c:1008
+#, fuzzy, c-format
+msgid "writing to file `%s'\n"
+msgstr "skribas al '%s'\n"
-#: g10/sign.c:794
+#: g10/sign.c:795
#, fuzzy, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr "subskribas:"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "ne povas malfermi %s: %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
"eblas klartekste subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s �ifrado estos aplikata\n"
@@ -4723,7 +4806,7 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"ne povas eviti malfortajn �losilojn por simetria �ifro; provis %d fojojn!\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr ""
@@ -5084,17 +5167,17 @@ msgstr "Nenia helpo disponata"
msgid "No help available for `%s'"
msgstr "Nenia helpo disponata por '%s'"
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "eraro dum kreado de �losilaro '%s': %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr "�losilaro '%s' kreita\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
@@ -5137,8 +5220,7 @@ msgstr "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
msgid "%s: keyring created\n"
msgstr "%s: �losilaro kreita\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5147,31 +5229,36 @@ msgid ""
"Keeping the image close to 240x288 is a good size to use.\n"
msgstr ""
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr ""
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, fuzzy, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "ne povas malfermi %s: %s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
#, fuzzy
msgid "Are you sure you want to use it (y/N)? "
msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, fuzzy, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr "%s: ne estas fido-datenaro\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
#, fuzzy
msgid "Is this photo correct (y/N/q)? "
msgstr "�u tio estas �usta (j/n)? "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
#, fuzzy
msgid "unable to display photo ID!\n"
msgstr "ne povas malfermi %s: %s\n"
@@ -5191,43 +5278,49 @@ msgid ""
msgstr ""
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
-msgstr ""
+#, fuzzy
+msgid "this platform requires temporary files when calling external programs\n"
+msgstr "%s: eraro dum legado de versiregistro: %s\n"
-#: g10/exec.c:432
-#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
-msgstr ""
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
+msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
+
+#: g10/exec.c:436
+#, fuzzy, c-format
+msgid "unable to execute shell `%s': %s\n"
+msgstr "ne povas malfermi %s: %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:515
#, fuzzy, c-format
msgid "system error while calling external program: %s\n"
msgstr "%s: eraro dum legado de versiregistro: %s\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr ""
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr ""
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr ""
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr ""
-#: g10/exec.c:606
+#: g10/exec.c:608
#, fuzzy, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr ""
@@ -5385,6 +5478,49 @@ msgstr "eraro dum legado de dosieruja registro: %s\n"
msgid "read error: %s\n"
msgstr "kiraso: %s\n"
+#, fuzzy
+#~ msgid "revoked: %s"
+#~ msgstr "rev"
+
+#, fuzzy
+#~ msgid "expired: %s"
+#~ msgstr " [eksvalidi�os: %s]"
+
+#, fuzzy
+#~ msgid "expires: %s"
+#~ msgstr " [eksvalidi�os: %s]"
+
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "rev! sub�losilo estas revokita: %s\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "rev- falsita revoko trovita\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "rev? problemo en kontrolo de revoko: %s\n"
+
+#, fuzzy
+#~ msgid "[revoked] "
+#~ msgstr "rev"
+
+#, fuzzy
+#~ msgid "[expired] "
+#~ msgstr "eksval"
+
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr " [eksvalidi�os: %s]"
+
+#~ msgid " [expires: %s]"
+#~ msgstr " [eksvalidi�os: %s]"
+
+#, fuzzy
+#~ msgid " [revoked: %s]"
+#~ msgstr "rev"
+
+#~ msgid "can't create %s: %s\n"
+#~ msgstr "ne povas krei %s: %s\n"
+
#~ msgid "|[files]|encrypt files"
#~ msgstr "|[dosieroj]|�ifri dosierojn"
diff --git a/po/es.po b/po/es.po
index e89d19ba3..46279d411 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
"PO-Revision-Date: 2004-06-18 22:40+0100\n"
"Last-Translator: Jaime Su�rez <[email protected]>\n"
"Language-Team: Spanish <[email protected]>\n"
@@ -50,7 +50,7 @@ msgstr "no"
msgid "nN"
msgstr "nN"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "salir|fin|acabar"
@@ -306,6 +306,16 @@ msgstr "clave secreta inutilizable"
msgid "keyserver error"
msgstr "error del servidor de claves"
+#: util/errors.c:108
+#, fuzzy
+msgid "canceled"
+msgstr "Cancelar"
+
+#: util/errors.c:109
+#, fuzzy
+msgid "no card"
+msgstr "no cifrado"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr ""
@@ -331,7 +341,7 @@ msgstr "ha encontrado un error... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "no se ha detectado m�dulo acumulador de entrop�a\n"
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "no se puede abrir `%s': %s\n"
@@ -369,7 +379,7 @@ msgstr "no se puede leer `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "nota: el fichero de semillas aleatorias no se ha actualizado\n"
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr "no se puede crear %s: %s\n"
@@ -443,7 +453,7 @@ msgstr "no se puede generar un primo con menos de %d bits\n"
# S�, este no he podido ser yo :-) Por cierto, �por qu� la O no se
# puede acentuar? �demasiado alta?
# �Qui�n dice que no se puede? :-)
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -451,128 +461,128 @@ msgstr ""
"@�rdenes:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[file]|crea una firma"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[file]|crea una firma en texto claro"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "crea una firma separada"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "cifra datos"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "cifra s�lo con un cifrado sim�trico"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "descifra datos (predefinido)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "verifica una firma"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "lista claves"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "lista claves y firmas"
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "comprueba las firmas de las claves"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "lista claves y huellas dactilares"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "lista claves secretas"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "genera un nuevo par de claves"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "elimina claves del anillo p�blico"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "elimina claves del anillo privado"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "firma la clave"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "firma la clave localmente"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "firma o modifica una clave"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "genera un certificado de revocaci�n"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "exporta claves"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "exporta claves a un servidor de claves"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "importa claves desde un servidor de claves"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "busca claves en un servidor de claves"
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "actualiza todas las claves desde un servidor de claves"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "importa/fusiona claves"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "actualiza la base de datos de confianza"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|algo [ficheros]|imprime res�menes de mensaje"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -582,59 +592,55 @@ msgstr ""
"Opciones:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "crea una salida ascii con armadura"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|NOMBRE|cifra para NOMBRE"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr "usa este usuario para firmar o descifrar"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr "|N|nivel de compresi�n N (0 no comprime)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "usa modo de texto can�nico"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "usa como fichero de salida"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "prolijo"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "no hace ning�n cambio"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "preguntar antes de sobreescribir"
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
# ordenes -> �rdenes
# p�gina man -> p�gina de manual
# Vale. �del manual mejor?
# Hmm, no s�, en man-db se usa "de". La verdad es que no lo he pensado.
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -642,7 +648,7 @@ msgstr ""
"@\n"
"(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -662,15 +668,15 @@ msgstr ""
" --list-keys [nombres] muestra las claves\n"
" --fingerprint [nombres] muestra las huellas dactilares\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -680,7 +686,7 @@ msgstr ""
"firma, comprueba, cifra o descifra\n"
"la operaci�n por defecto depende de los datos de entrada\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -688,452 +694,446 @@ msgstr ""
"\n"
"Algoritmos disponibles:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr "Clave p�blica: "
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr "Cifrado: "
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr "Resumen: "
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
msgid "Compression: "
msgstr "Compresi�n: "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "uso: gpg [opciones] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "�rdenes incompatibles\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "no se encontr� el signo = en la definici�n de grupo \"%s\"\n"
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "AVISO: propiedad insegura de %s \"%s\"\n"
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "AVISO: propiedad insegura de %s \"%s\"\n"
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "AVISO: propiedad insegura de %s \"%s\"\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "AVISO: permisos inseguros de %s \"%s\"\n"
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "AVISO: permisos inseguros de %s \"%s\"\n"
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "AVISO: permisos inseguros de %s \"%s\"\n"
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "AVISO: propiedad insegura del directorio contenedor %s \"%s\"\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "AVISO: propiedad insegura del directorio contenedor %s \"%s\"\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "AVISO: propiedad insegura del directorio contenedor %s \"%s\"\n"
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "AVISO: permisos inseguros del directorio contenedor %s \"%s\"\n"
-#: g10/g10.c:1205
+#: g10/g10.c:1210
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "AVISO: permisos inseguros del directorio contenedor %s \"%s\"\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "AVISO: permisos inseguros del directorio contenedor %s \"%s\"\n"
-#: g10/g10.c:1334
-#, c-format
-msgid "unknown configuration item \"%s\"\n"
+#: g10/g10.c:1354
+#, fuzzy, c-format
+msgid "unknown configuration item `%s'\n"
msgstr "art�culo de configuraci�n desconocido \"%s\"\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "fichero de opciones `%s': %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "leyendo opciones desde `%s'\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: �%s no es para uso normal!\n"
-#: g10/g10.c:1887
-#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+#: g10/g10.c:2021
+#, fuzzy, c-format
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr "no se carga el cifrado de ampliaci�n \"%s\" por permisos inseguros\n"
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "%s no es un juego de caracteres v�lido\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "no se puede interpretar la URI del servidor de claves\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opciones de exportaci�n inv�lidas\n"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
msgid "invalid import options\n"
msgstr "opciones de importaci�n inv�lidas\n"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
msgid "invalid export options\n"
msgstr "opciones de exportaci�n inv�lidas\n"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "opciones de importaci�n inv�lidas\n"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "opciones de exportaci�n inv�lidas\n"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "imposible establecer camino de ejecutables %s\n"
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s sustituye a %s\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "�%s no permitido con %s!\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "�%s no tiene sentido con %s!\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "s�lo puede hacer firmas separadas o en claro en modo --pgp2\n"
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "no puede firmar y cifrar a la vez en modo --pgp2\n"
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "debe usar ficheros (no tuber�as) si trabaja con --pgp2 activo.\n"
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "cifrar un mensaje en modo --pgp2 requiere el algoritmo IDEA\n"
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
msgid "selected certification digest algorithm is invalid\n"
msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed debe ser mayor que 0\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed debe ser mayor que 1\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth debe estar en el rango 1-255\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "default-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "min-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
msgid "invalid default preferences\n"
msgstr "preferencias por defecto inv�lidas\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
msgid "invalid personal cipher preferences\n"
msgstr "preferencias personales de cifrado inv�lidas\n"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
msgid "invalid personal digest preferences\n"
msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
msgid "invalid personal compress preferences\n"
msgstr "preferencias personales de compresi�n inv�lidas\n"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s a�n no funciona con %s\n"
-#: g10/g10.c:2680
-#, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2797
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "no puede usar el cifrado \"%s\" en modo %s\n"
-#: g10/g10.c:2685
-#, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2802
+#, fuzzy, c-format
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "no puede usar el resumen \"%s\" en modo %s\n"
-#: g10/g10.c:2690
-#, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2807
+#, fuzzy, c-format
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "no puede usar la compresi�n \"%s\" en modo %s\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "AVISO: se indicaron receptores (-r) sin clave p�blica de cifrado\n"
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [nombre_fichero]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [nombre_fichero]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [nombre_fichero]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nombre_fichero]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "no puede usar %s en modo %s\n"
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [nombre_fichero]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nombre_fichero]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nombre_fichero]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "no puede usar %s en modo %s\n"
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nombre_fichero]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [nombre_fichero]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [nombre_fichero]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key id-usuario"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key id-usuario"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrsign-key id-usuario"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key id-usuario"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-usuario [�rdenes]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "no se puede abrir `%s': %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "env�o al servidor de claves fallido: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "recepci�n del servidor de claves fallida: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, c-format
msgid "key export failed: %s\n"
msgstr "exportaci�n de clave fallida: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "b�squeda del servidor de claves fallida: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "renovaci�n al servidor de claves fallida: %s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "eliminaci�n de armadura fallida: %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creaci�n de armadura fallida: %s\n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[nombre_fichero]"
@@ -1141,17 +1141,17 @@ msgstr "[nombre_fichero]"
# En espa�ol no se deja espacio antes de los puntos suspensivos
# (Real Academia dixit) :)
# Tomo nota :-). Este comentario d�jalo siempre.
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "Adelante, teclee su mensaje...\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "no se puede abrir `%s'\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@ -1159,32 +1159,32 @@ msgstr ""
"un nombre de notaci�n debe tener s�lo caracteres imprimibles o espacios, y "
"acabar con un '='\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
msgid "a user notation name must contain the '@' character\n"
msgstr "un nombre de notaci�n de usuario debe contener el caracter '@'\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "un valor de notaci�n no debe usar ning�n caracter de control\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr "URL de pol�tica de certificado inv�lida\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr "URL de pol�tica inv�lida\n"
-#: g10/g10.c:3747
+#: g10/g10.c:3863
#, fuzzy
-msgid "the given signature preferred keyserver URL is invalid\n"
+msgid "the given preferred keyserver URL is invalid\n"
msgstr "URL de pol�tica inv�lida\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "algo m�s discreto"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
msgid "take the keys from this keyring"
msgstr "tomar las claves de este anillo"
@@ -1192,19 +1192,19 @@ msgstr "tomar las claves de este anillo"
# Creo que es mejor "con el sello de fecha", no es un conflicto
# del sello en si mismo sino en relaci�n con el mensaje.
# Ok.
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
msgid "make timestamp conflicts only a warning"
msgstr "hacer que los conflictos de fecha-hora sean s�lo un aviso"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr "|DF|escribe informaci�n de estado en este descriptor de fichero"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Uso: gpgv [opciones] [ficheros] (-h para ayuda)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1238,12 +1238,13 @@ msgid "invalid dash escaped line: "
msgstr "L�nea con guiones inv�lida: "
#: g10/armor.c:565
-msgid "unexpected armor:"
+#, fuzzy
+msgid "unexpected armor: "
msgstr "armadura inesperada"
-#: g10/armor.c:695 g10/armor.c:1276
-#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+#: g10/armor.c:695 g10/armor.c:1280
+#, fuzzy, c-format
+msgid "invalid radix64 character %02X skipped\n"
msgstr "caracteres inv�lidos radix64 %02x omitidos\n"
#: g10/armor.c:738
@@ -1254,33 +1255,34 @@ msgstr "Fin de fichero prematuro (falta suma de comprobaci�n)\n"
msgid "premature eof (in CRC)\n"
msgstr "Fin de suma de comprobaci�n prematuro\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "Suma de comprobaci�n mal creada\n"
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "Error en suma de comprobaci�n: %06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+#, fuzzy
+msgid "premature eof (in trailer)\n"
msgstr "fin de fichero prematuro (en el cierre)\n"
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "error en la l�nea de cierre\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "no se han encontrados datos OpenPGP v�lidos\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "armadura incorrecta: l�nea m�s larga de %d caracteres\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1336,7 +1338,7 @@ msgstr " alias \""
msgid " aka \""
msgstr " alias \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1589,96 +1591,116 @@ msgstr "%s: omitida: clave p�blica deshabilitada\n"
msgid "no valid addressees\n"
msgstr "no hay direcciones v�lidas\n"
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "preferencia %c%lu duplicada\n"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "demasiadas `%c' preferencias\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
#, fuzzy
msgid "too many digest preferences\n"
msgstr "demasiadas `%c' preferencias\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
#, fuzzy
msgid "too many compression preferences\n"
msgstr "demasiadas `%c' preferencias\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "caracter inv�lido en cadena de preferencias\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
msgid "writing direct signature\n"
msgstr "escribiendo firma directa\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "escribiendo autofirma\n"
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "escribiendo la firma de comprobaci�n de clave\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "tama�o de clave incorrecto; se usar�n %u bits\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "tama�o de clave redondeado a %u bits\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "Por favor seleccione tipo de clave deseado:\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA y ElGamal (por defecto)\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (s�lo firmar)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (s�lo cifrar)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (s�lo firmar)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (s�lo cifrar)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (firmar y cifrar)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, fuzzy, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) RSA (s�lo firmar)\n"
+
+#: g10/keygen.c:1224
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) RSA (firmar y cifrar)\n"
+
+#: g10/keygen.c:1226
+#, fuzzy, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) RSA (s�lo cifrar)\n"
+
+#: g10/keygen.c:1228
+#, fuzzy, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) RSA (firmar y cifrar)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "Su elecci�n: "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "Elecci�n inv�lida.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1691,28 +1713,28 @@ msgstr ""
" el tama�o por defecto es 1024 bits\n"
" el tama�o m�ximo recomendado es 2048 bits\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "�De qu� tama�o quiere la clave (1024)? "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
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:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "tama�o de clave insuficiente; 1024 es el m�nimo permitido para RSA.\n"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
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:1255
+#: g10/keygen.c:1328
#, 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:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1720,11 +1742,11 @@ msgstr ""
"No se recomiendan claves de m�s de 2048 bits porque\n"
"�el tiempo de c�lculo es REALMENTE largo!\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "�Seguro que quiere una clave de este tama�o? "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1732,17 +1754,17 @@ msgstr ""
"De acuerdo, �pero tenga en cuenta que las radiaciones de su monitor y\n"
"teclado tambi�n son vulnerables a un ataque!\n"
-#: g10/keygen.c:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "El tama�o requerido es de %u bits\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "redondeados a %u bits\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1758,7 +1780,7 @@ msgstr ""
" <n>m = la clave caduca en n meses\n"
" <n>y = la clave caduca en n a�os\n"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1774,29 +1796,29 @@ msgstr ""
" <n>m = la clave caduca en n meses\n"
" <n>y = la clave caduca en n a�os\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "�Validez de la clave (0)? "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr "Clave v�lida �durante (0)? "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "valor inv�lido\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s nunca caduca\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr "%s caduca el %s\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1804,16 +1826,17 @@ msgstr ""
"Su sistema no puede mostrar fechas m�s all� del 2038.\n"
"Sin embargo funcionar� correctamente hasta el 2106.\n"
-#: g10/keygen.c:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "�Es correcto (s/n)? "
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
+#, fuzzy
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
@@ -1824,44 +1847,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "Nombre y apellidos: "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "Caracter inv�lido en el nombre\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr "El nombre no puede empezar con un n�mero\n"
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr "El nombre debe tener al menos 5 caracteres\n"
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "Direcci�n de correo electr�nico: "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "Direcci�n inv�lida\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "Comentario: "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "Caracter inv�lido en el comentario\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Est� usando el juego de caracteres `%s'.\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1872,29 +1895,29 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Por favor no ponga la direcci�n de correo-e en el nombre real o en el "
"comentario\n"
-#: g10/keygen.c:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "NnCcDdVvSs"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (S)alir? "
-#: g10/keygen.c:1542
+#: g10/keygen.c:1615
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:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr "Por favor corrija primero el error.\n"
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1902,16 +1925,16 @@ msgstr ""
"Necesita una frase contrase�a para proteger su clave secreta.\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr "frase contrase�a repetida incorrectamente; int�ntelo de nuevo"
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1923,7 +1946,7 @@ msgstr ""
"la opci�n \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1936,58 +1959,58 @@ msgstr ""
"generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
"entrop�a.\n"
-#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr "lo siento, no puede hacerse en modo de proceso por lotes\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "El par de claves DSA tendr� 1024 bits.\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "Creaci�n de claves cancelada.\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr "escribiendo clave p�blica en `%s'\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "escribiendo clave privada en `%s'\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "escribiendo clave privada en `%s'\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "anillo p�blico de claves no escribible encontrado: %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "anillo privado de claves no escribible encontrado: %s\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "error escribiendo anillo p�blico `%s': %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "error escribiendo anillo privado `%s': %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "claves p�blica y secreta creadas y firmadas.\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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"
@@ -1995,12 +2018,12 @@ msgstr ""
"Tenga en cuenta que esta clave no puede ser usada para cifrado. Puede usar\n"
"la orden \"--edit-key\" para crear una clave secundaria con este prop�sito.\n"
-#: g10/keygen.c:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Creaci�n de la clave fallida: %s\n"
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -2008,7 +2031,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:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -2016,14 +2039,43 @@ msgstr ""
"clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
"problemas con el reloj)\n"
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTA: crear subclaves para claves V3 no sigue el est�ndar OpenPGP\n"
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "�Crear de verdad? "
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "borrado de bloque de anillo de claves fallido: %s\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "no se puede crear %s: %s\n"
+
+#: g10/keygen.c:3248
+#, fuzzy, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "NOTA: clave secreta %08lX caducada el %s\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "--output no funciona con esta orden\n"
@@ -2034,7 +2086,7 @@ msgstr "--output no funciona con esta orden\n"
msgid "%s: can't open: %s\n"
msgstr "%s: no se puede abrir: %s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "error creando frase contrase�a: %s\n"
@@ -2062,6 +2114,11 @@ msgstr "%s: ATENCI�N: fichero vac�o\n"
msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
msgstr "solo puede cifrar a claves RSA de 2048 bits o menos en modo --pgp2\n"
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "no se puede abrir `%s': %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -2073,26 +2130,36 @@ msgid ""
msgstr ""
"no se puede usar el algoritmo IDEA para todas las claves a las que cifra.\n"
-#: g10/encode.c:526 g10/encode.c:721
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#: g10/encode.c:526
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
"del destinatario\n"
-#: g10/encode.c:634 g10/sign.c:863
-#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+#: g10/encode.c:634 g10/sign.c:864
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
msgstr ""
"forzar el algoritmo de compresi�n %s (%d) va en contra de las preferencias "
"del receptor\n"
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
+"del destinatario\n"
+
#: g10/encode.c:818
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrado para: \"%s\"\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "clave '%s' no encontrada: %s\n"
@@ -2126,8 +2193,9 @@ msgstr "ATENCI�N: no se ha exportado nada\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "demasiados registros en la cache pk - anulada\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+#, fuzzy
+msgid "[User ID not found]"
msgstr "[Identificador de usuario no encontrado]"
#: g10/getkey.c:1614
@@ -2280,7 +2348,7 @@ msgstr "clave %08lX: reparada la subclave HKP corrompida\n"
#: g10/import.c:722
#, fuzzy, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "clave %08lX: aceptado ID de usuario sin autofirma '%s'\n"
#: g10/import.c:728
@@ -2307,7 +2375,7 @@ msgstr "clave %08lX: clave nueva - omitida\n"
msgid "no writable keyring found: %s\n"
msgstr "anillo de claves no escribible encontrado: %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "escribiendo en `%s'\n"
@@ -2421,13 +2489,13 @@ msgstr "clave %08lX: no hay identificador de usuario para la firma\n"
#: g10/import.c:1299
#, fuzzy, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"clave %08lX: algoritmo de clave p�blica no disponible para el id \"%s\"\n"
#: g10/import.c:1301
#, fuzzy, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "clave %08lX: autofirma inv�lida para el id \"%s\"\n"
#: g10/import.c:1319
@@ -2467,7 +2535,7 @@ msgstr "clave %08lX: borrada revocaci�n de subclave m�ltiple\n"
#: g10/import.c:1439
#, fuzzy, c-format
-msgid "key %s: skipped user ID '%s'\n"
+msgid "key %s: skipped user ID \"%s\"\n"
msgstr "clave %08lX: omitido ID de usuario '"
#: g10/import.c:1460
@@ -2477,7 +2545,7 @@ msgstr "clave %08lX: subclave omitida\n"
#: g10/import.c:1487
#, fuzzy, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "clave %08lX: firma no exportable (clase %02x) - omitida\n"
#: g10/import.c:1497
@@ -2512,114 +2580,114 @@ msgstr ""
"AVISO: la clave %08lX puede estar revocada: recuperando clave de revocaci�n %"
"08lX\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"AVISO: la clave %08lX puede estar revocada: falta clave de revocaci�n %"
"08lX.\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "clave %08lX: \"%s\" certificado de revocaci�n a�adido\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "clave %08lX: firma directa de clave a�adida\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[revocaci�n]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[autofirma]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "1 firma incorrecta\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d firmas incorrectas\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "1 firma no comprobada por falta de clave\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d firmas no comprobadas por falta de clave\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "1 firma no comprobada por causa de un error\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d firmas no comprobadas por errores\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "Detectado 1 identificador de usuario sin autofirma v�lida\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "Detectados %d identificadores de usuario sin autofirma v�lida\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, fuzzy, c-format
msgid " (%d) I trust marginally\n"
msgstr " %d = Conf�o poco\n"
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, fuzzy, c-format
msgid " (%d) I trust fully\n"
msgstr " %d = Conf�o totalmente\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "ID de usuario \"%s\" revocado."
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "�Seguro que todav�a quiere firmarlo? (s/N) "
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr " Imposible firmar.\n"
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "ID de usuario \"%s\" expirado."
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "ID de usuario \"%s\" no tiene autofirma."
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2628,11 +2696,11 @@ msgstr ""
"La autofirma en \"%s\"\n"
"es una firma de tipo PGP 2.x.\n"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Quiere convertirla en una autofirma OpenPGP? (s/N) "
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2641,11 +2709,11 @@ msgstr ""
"Su firma actual en \"%s\"\n"
"ha expirado.\n"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "�Quiere producir una nueva firma que reemplace a la expirada? (s/N) "
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2654,43 +2722,43 @@ msgstr ""
"Su firma actual en \"%s\"\n"
"es una firma local.\n"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Quiere convertirla en una clave totalmente exportable? (s/N) "
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" ya estaba firmada localmente por la clave %08lX\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" ya estaba firmada por la clave %08lX\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "�Quiere firmarlo a�n as�? (s/N) "
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nada que firmar con la clave %08lX\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "�Esta clave ha caducado!"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Esta clave expirar� el %s.\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "�Quiere que su firma caduque al mismo tiempo? (S/n) "
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
@@ -2698,11 +2766,11 @@ msgstr ""
"No puede hacer una firma OpenPGP de una clave PGP 2.x estando en modo --"
"pgp2.\n"
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "Esto inutilizar�a la clave en PGP 2.x.\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2712,31 +2780,31 @@ msgstr ""
"firmar pertenece realmente a la persona arriba nombrada? Si no sabe que\n"
"contestar, introduzca \"0\".\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) No contesto.%s\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) No lo he comprobado en absoluto.%s\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) He hecho una comprobaci�n informal.%s\n"
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Lo he comprobado meticulosamente.%s\n"
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr "�Su elecci�n? (escriba '?' si desea m�s informaci�n): "
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2744,7 +2812,7 @@ msgstr ""
"�Est� realmente seguro de querer firmar esta clave\n"
"con su clave: \""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2752,7 +2820,7 @@ msgstr ""
"\n"
"Esto ser� una autofirma.\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2760,7 +2828,7 @@ msgstr ""
"\n"
"ATENCION: la firma no se marcar� como no exportable.\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2768,7 +2836,7 @@ msgstr ""
"\n"
"AVISO: la firma no se marcar� como no revocable.\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2776,7 +2844,7 @@ msgstr ""
"\n"
"La firma se marcar� como no exportable.\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2784,7 +2852,7 @@ msgstr ""
"\n"
"La firma se marcar� como no revocable.\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2792,7 +2860,7 @@ msgstr ""
"\n"
"No he comprobado esta clave en absoluto.\n"
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2800,7 +2868,7 @@ msgstr ""
"\n"
"He comprobado esta clave informalmente.\n"
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2808,34 +2876,34 @@ msgstr ""
"\n"
"He comprobado esta clave meticulosamente.\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "�Firmar de verdad? "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "firma fallida: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "Esta clave no est� protegida.\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr "Las partes secretas de la clave primaria no est�n disponibles.\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "La clave est� protegida.\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "No puede editarse esta clave: %s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2843,7 +2911,7 @@ msgstr ""
"Introduzca la nueva frase contrase�a para esta clave secreta.\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2851,545 +2919,567 @@ msgstr ""
"No ha especificado frase contrase�a. Esto es probablemente una *mala* idea.\n"
"\n"
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "�Realmente quiere hacer esto? "
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "moviendo la firma de la clave al lugar correcto\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "sale de este men�"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "s"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "graba"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "graba y sale"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "ayuda"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "muestra esta ayuda"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "hdac"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "muestra huella dactilar"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "lista"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "lista clave e identificadores de usuario"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "idu"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "selecciona identificador de usuario N"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "clave"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "selecciona clave secundaria N"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "comprueba"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "lista firmas"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "c"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "firma"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "firma la clave"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "s"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "tsign"
msgstr "firma"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "make a trust signature"
msgstr "crea una firma separada"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "firmal"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "firma la clave localmente"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr "firmanr"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr "firma la clave irrevocablemente"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr "firmanrl"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "sign the key locally and non-revocably"
msgstr "firma la clave local e irrevocablemente"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "depura"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "a�aidu"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "a�ade un identificador de usuario"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr "a�adirfoto"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr "a�ade un ID fotogr�fico"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "borridu"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "borra un identificador de usuario"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr "borfoto"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "a�acla"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "a�ade una clave secundaria"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+#, fuzzy
+msgid "addcardkey"
+msgstr "a�acla"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "borrcla"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "borra una clave secundaria"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "addrevoker"
msgstr "a�arevoc"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "add a revocation key"
msgstr "a�ade una clave de revocaci�n"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "borrfir"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "borra firmas"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "expira"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "cambia fecha de caducidad"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr "primaria"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr "marca ID de usuario como primario"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "cambia"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "cambia entre lista de claves secretas y p�blicas"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "t"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr "muestra preferencias (experto)"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr "verpref"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr "muestra preferencias (prolijo)"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr "estpref"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr "establece preferencias"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr "actpref"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr "preferencias actualizadas"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "keyserver"
msgstr "error del servidor de claves"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "set preferred keyserver URL"
msgstr "no se puede interpretar la URI del servidor de claves\n"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "contr"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "cambia la frase contrase�a"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "conf"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "cambia valores de confianza"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "revfir"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "revoca firmas"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revuid"
msgstr "revidu"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revoke a user ID"
msgstr "revocar un identificador de usuario"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "revcla"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "revoca una clave secundaria"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "descla"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "deshabilita una clave"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "habcla"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "habilita una clave"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr "verfoto"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr "mostrar ID fotogr�fico"
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "imposible hacer esto en modo de proceso por lotes\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "error leyendo bloque de clave secreta `%s': %s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "Clave secreta disponible.\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "Orden> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "Se necesita la clave secreta para hacer esto.\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr "Por favor use la orden \"cambia\" primero.\n"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
msgid "Key is revoked."
msgstr "La clave est� revocada."
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "�Firmar realmente todos los identificadores de usuario? "
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugerencia: seleccione los identificadores de usuario que firmar\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Esta orden no se permite en modo %s.\n"
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "�No puede borrar el �ltimo identificador de usuario!\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "�Borrar realmente todos los identificadores seleccionados? "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "�Borrar realmente este identificador de usuario? "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+#, fuzzy
+msgid "Really move the primary key? "
+msgstr "�Borrar realmente este identificador de usuario? "
+
+#: g10/keyedit.c:1598
+#, fuzzy
+msgid "You must select exactly one key.\n"
+msgstr "Debe seleccionar por lo menos una clave.\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "Debe seleccionar por lo menos una clave.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "�De verdad quiere borrar las claves seleccionadas? "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "�De verdad quiere borrar esta clave? "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
msgid "Really revoke all selected user IDs? "
msgstr "�Revocar realmente todos los identificadores seleccionados? "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
msgid "Really revoke this user ID? "
msgstr "�Revocar realmente este identificador de usuario? "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "�De verdad quiere revocar las claves seleccionadas? "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "�De verdad quiere revocar esta clave? "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
#, fuzzy
msgid "Set preference list to:\n"
msgstr "establece preferencias"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr ""
"�Actualizar realmente las preferencias para todos los ID seleccionados? "
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr "�Actualizar realmente las preferencias? "
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "�Grabar cambios? "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "�Salir sin grabar? "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "actualizaci�n fallida: %s\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "actualizaci�n de la clave secreta fallida: %s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "Orden inv�lida (pruebe \"help\")\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr "Resumen: "
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr "Caracter�sticas: "
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keyedit.c:2219
#, c-format
msgid "This key may be revoked by %s key "
msgstr "Esta clave puede ser revocada por la clave %s"
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr " (confidencial)"
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "no se puede crear %s: %s\n"
-#: g10/keyedit.c:2084
-#, fuzzy, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
msgstr "[revocada]"
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
-msgstr " [caduca: %s]"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expira"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
+msgstr "expira"
+
+#: g10/keyedit.c:2246
#, fuzzy, c-format
-msgid "expires: %s"
-msgstr " [caduca: %s]"
+msgid "usage: %s"
+msgstr " confianza: %c/%c"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, fuzzy, c-format
msgid "trust: %s"
msgstr " confianza: %c/%c"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "Esta clave est� deshabilitada"
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! �esta subclave ha sido revocada! %s\n"
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
-msgstr "rev- se encontr� una revocaci�n falsificada\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? problema comprobando la revocaci�n: %s\n"
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-#, fuzzy
-msgid "revoked"
-msgstr "[revocada]"
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-#, fuzzy
-msgid "expired"
-msgstr "expira"
+#: g10/keyedit.c:2300
+msgid "card-no: "
+msgstr ""
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "No hay preferencias en un identificador de usuario estilo PGP 2.x\n"
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3397,15 +3487,7 @@ msgstr ""
"Por favor, advierta que la validez de clave mostrada no es necesariamente\n"
"correcta a menos de que reinicie el programa.\n"
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-msgid "[revoked] "
-msgstr "[revocada]"
-
-#: g10/keyedit.c:2274
-msgid "[expired] "
-msgstr "[caducada]"
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@ -3413,7 +3495,7 @@ msgstr ""
"AVISO: ning�n ID de usuario est� marcado como principal. Esta orden puede\n"
" causar que se tome como principal por defecto otro ID de usuario.\n"
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3422,45 +3504,45 @@ msgstr ""
"AVISO: esta es una clave de tipo PGP2. A�adir un ID fotogr�fico puede\n"
"hacer que algunas versiones de PGP rechacen esta clave.\n"
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
msgid "Are you sure you still want to add it? (y/N) "
msgstr "�Est� seguro de querer a�adirla? (s/N) "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "No puede a�adir un ID fotogr�fico a una clave tipo PGP2.\n"
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "�Borrar esta firma correcta? (s/N/q)"
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "�Borrar esta firma inv�lida? (s/N/q)"
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "�Borrar esta firma desconocida? (s/N/q)"
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "�Borrar realmente esta autofirma? (s/N)"
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d firmas borradas.\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d firmas borradas\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "No se borr� nada\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3469,92 +3551,102 @@ msgstr ""
"AVISO: esta es una clave tipo PGP2. A�adir un revocador designado puede\n"
" hacer que algunas versiones de PGP rechacen esta clave.\n"
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "No puede a�adir un revocador designado a una clave tipo PGP2.\n"
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
msgid "Enter the user ID of the designated revoker: "
msgstr "Introduzca el ID de usuario del revocador designado: "
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "no puede elegir una clave como su propio revocador designado\n"
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr ""
"ATENCI�N: �Esta clave ha sido revocada por la persona designada\n"
"como revocador!\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"�AVISO: no podr� deshacer la elecci�n de clave como revocador designado!\n"
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr ""
"�Est� seguro de querer elegir esta clave como revocador designado? (s/N): "
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "Por favor, quite las selecciones de las claves secretas.\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "Cambiando caducidad de clave secundaria.\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "Cambiando caducidad de clave primaria.\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "No existe la firma correspondiente en el anillo secreto\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
msgid "Please select exactly one user ID.\n"
msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
-#, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+#, fuzzy
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "�Seguro que quiere usarlo? (s/N) "
+
+#: g10/keyedit.c:3480
+#, fuzzy
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "�Seguro que quiere usarlo? (s/N) "
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "No hay ning�n identificador de usuario con el �ndice %d\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "No hay ninguna clave secundaria con el �ndice %d\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "ID de usuario: \""
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3563,7 +3655,7 @@ msgstr ""
"\"\n"
"firmada con su clave %08lX el %s\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3572,143 +3664,127 @@ msgstr ""
"\"\n"
"firmada localmente con su clave %08lX el %s\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Esta firma caduc� el %s.\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "�De verdad quiere revocarla? (s/N) "
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N)"
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "Ha firmado los siguientes IDs de usuario:\n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid " signed by %s on %s%s%s\n"
msgstr " firmada por %08lX el %s%s%s\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid " revoked by %s on %s\n"
msgstr " revocada por %08lX el %s\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "Va a revocar las siguientes firmas:\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, fuzzy, c-format
msgid " signed by %s on %s%s\n"
msgstr " firmada por %08lX el %s%s\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr " (no exportable)"
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
msgid "Really create the revocation certificates? (y/N) "
msgstr "�Crear los certificados de revocaci�n realmente? (s/N) "
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "no hay clave secreta\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "AVISO: un ID de usuario tiene fecha %d segundos en el futuro\n"
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Mostrando ID fotogr�fico %s de tama�o %ld para la clave 0x%08lX (uid %d)\n"
-#: g10/keylist.c:179
+#: g10/keylist.c:180
msgid "Critical signature policy: "
msgstr "Pol�tica de firmas cr�ticas: "
-#: g10/keylist.c:181
+#: g10/keylist.c:182
msgid "Signature policy: "
msgstr "Pol�tica de firmas: "
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "ATENCI�N: encontrados datos de notaci�n inv�lidos\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
msgid "Critical signature notation: "
msgstr "Notaci�n de firmas cr�ticas: "
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr "Notaci�n de firma: "
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr "ilegible"
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr "Anillo de claves"
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr " [caduca: %s]"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr " [caduca: %s]"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, fuzzy, c-format
-msgid " [revoked: %s]"
-msgstr "[revocada]"
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
msgid "Primary key fingerprint:"
msgstr "Huellas dactilares de la clave primaria:"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
msgid " Subkey fingerprint:"
msgstr " Huella de subclave:"
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
msgid " Primary key fingerprint:"
msgstr " Huella de clave primaria:"
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
msgid " Subkey fingerprint:"
msgstr " Huella de subclave:"
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr " Huella de clave ="
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3914,81 +3990,81 @@ msgstr "firma al viejo estilo (PGP 2.x)\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "paquete ra�z inv�lido detectado en proc_tree()\n"
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "no se pueden desactivar los volcados de core: %s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "�No se deber�an usar algoritmos experimentales!\n"
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"ese algoritmo de cifrado est� desacreditado;�por favor use uno m�s "
"est�ndar!\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr "el plugin para el cifrado IDEA no est� presente\n"
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr ""
"por favor vea http://www.gnupg.org/why-not-idea.html para m�s informaci�n\n"
-#: g10/misc.c:491
+#: g10/misc.c:517
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: opci�n desaconsejada \"%s\"\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "ATENCI�N: \"%s\" es una opci�n desaconsejada.\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "por favor use \"%s%s\" en su lugar\n"
-#: g10/misc.c:508
+#: g10/misc.c:534
msgid "Uncompressed"
msgstr "Sin comprimir"
-#: g10/misc.c:533
+#: g10/misc.c:559
#, fuzzy
msgid "uncompressed|none"
msgstr "Sin comprimir"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "este mensaje podr�a no ser utilizable por %s\n"
-#: g10/misc.c:777
+#: g10/misc.c:826
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "leyendo opciones desde `%s'\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "desconocido el destinatario predefinido `%s'\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
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:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"AVISO: clave de sesi�n cifrada sim�tricamente potencialmente insegura\n"
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, 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"
@@ -4027,7 +4103,7 @@ msgstr "no se puede conectar con `%s': %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "problema de comunicaci�n con el agente gpg\n"
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr "problema con el agente - inhabilitando el uso del agente\n"
@@ -4063,24 +4139,24 @@ msgstr "frase contrase�a demasiado larga\n"
msgid "invalid response from agent\n"
msgstr "respuesta del agente inv�lida\n"
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "cancelado por el usuario\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "problema con el agente: el agente devuelve 0x%lx\n"
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "imposible pedir contrase�a en modo de proceso por lotes\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "Introduzca frase contrase�a: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4090,22 +4166,22 @@ msgstr ""
"Necesita una frase contrase�a para desbloquear la clave secreta\n"
"del usuario: \""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr "(ID clave primaria %08lX)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "Repita frase contrase�a: "
@@ -4327,27 +4403,38 @@ msgstr ""
"s�lo puede hacer firmas separadas con claves tipo PGP 2.x estando enmodo --"
"pgp2\n"
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
msgstr "no se puede crear %s: %s\n"
-#: g10/sign.c:794
-#, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+#: g10/sign.c:771 g10/sign.c:1008
+#, fuzzy, c-format
+msgid "writing to file `%s'\n"
+msgstr "escribiendo en `%s'\n"
+
+#: g10/sign.c:795
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"forzar el algoritmo de resumen %s (%d) va en contra de las\n"
"preferencias del destinatario\n"
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr "firmando:"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "no puede abrirse el fichero: %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "s�lo puede firmar en claro con claves PGP 2.x estando en modo --pgp2\n"
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr "se usar� un cifrado %s\n"
@@ -4746,7 +4833,7 @@ msgstr ""
"�imposible evitar clave d�bil para cifrado sim�trico despu�s de %d "
"intentos!\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA necesita un algoritmo de hash de 160 bits.\n"
@@ -5112,17 +5199,17 @@ msgstr "Ayuda no disponible"
msgid "No help available for `%s'"
msgstr "No hay ayuda disponible para `%s'"
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "error escribiendo anillo `%s': %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr "anillo `%s' creado\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "fallo reconstruyendo cach� del anillo de claves: %s\n"
@@ -5165,8 +5252,7 @@ msgstr "%lu claves comprobadas (%lu firmas)\n"
msgid "%s: keyring created\n"
msgstr "%s: anillo creado\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5180,29 +5266,34 @@ msgstr ""
"Si usa una foto muy grande, �su clave ser� tambi�n muy grande!\n"
"Una imagen cercana a 240x288 tiene un tama�o adecuado.\n"
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr "Introduzca nombre del fichero JPEG para ID fotogr�fico: "
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "Imposible abrir fotograf�a \"%s\": %s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
msgid "Are you sure you want to use it (y/N)? "
msgstr "�Seguro que quiere usarlo? (s/N) "
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr "\"%s\" no es un fichero JPEG\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Is this photo correct (y/N/q)? "
msgstr "�Es correcta la foto? (s/n) "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
msgid "unable to display photo ID!\n"
msgstr "�no puedo mostrar ID fotogr�fico!\n"
@@ -5223,45 +5314,51 @@ msgstr ""
"ficheros.\n"
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
+#, fuzzy
+msgid "this platform requires temporary files when calling external programs\n"
msgstr ""
"esta plataforma necesita ficheros temporales para llamar a programas "
"externos.\n"
-#: g10/exec.c:432
-#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
msgstr "no se puede ejecutar %s \"%s\": %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:436
+#, fuzzy, c-format
+msgid "unable to execute shell `%s': %s\n"
+msgstr "no se puede ejecutar %s \"%s\": %s\n"
+
+#: g10/exec.c:515
#, c-format
msgid "system error while calling external program: %s\n"
msgstr "error del sistema llamando al programa externo: %s\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr "el programa externo finaliz� anormalmente\n"
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr "no se puede ejecutar el programa externo\n"
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr "no se puede leer la respuesta del programa externo: %s\n"
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr "AVISO: no se puede borrar fichero temporal (%s) `%s': %s\n"
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "AVISO: no se puede borrar el fichero temporal `%s': %s\n"
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr "nunca "
@@ -5417,6 +5514,47 @@ msgstr "error econtrando registro de confianza: %s\n"
msgid "read error: %s\n"
msgstr "error de lectura: %s\n"
+#, fuzzy
+#~ msgid "revoked: %s"
+#~ msgstr "[revocada]"
+
+#, fuzzy
+#~ msgid "expired: %s"
+#~ msgstr " [caduca: %s]"
+
+#, fuzzy
+#~ msgid "expires: %s"
+#~ msgstr " [caduca: %s]"
+
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "rev! �esta subclave ha sido revocada! %s\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "rev- se encontr� una revocaci�n falsificada\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "rev? problema comprobando la revocaci�n: %s\n"
+
+#~ msgid "[revoked] "
+#~ msgstr "[revocada]"
+
+#~ msgid "[expired] "
+#~ msgstr "[caducada]"
+
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr " [caduca: %s]"
+
+#~ msgid " [expires: %s]"
+#~ msgstr " [caduca: %s]"
+
+#, fuzzy
+#~ msgid " [revoked: %s]"
+#~ msgstr "[revocada]"
+
+#~ msgid "can't create %s: %s\n"
+#~ msgstr "no se puede crear %s: %s\n"
+
#~ msgid ""
#~ "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n"
#~ msgstr ""
diff --git a/po/et.po b/po/et.po
index 2112fcc89..8422e4e9a 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
"PO-Revision-Date: 2004-06-17 11:04+0300\n"
"Last-Translator: Toomas Soome <[email protected]>\n"
"Language-Team: Estonian <[email protected]>\n"
@@ -46,7 +46,7 @@ msgstr "ei"
msgid "nN"
msgstr "eE"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "v�lju"
@@ -279,6 +279,16 @@ msgstr "mittekasutatav salajane v�ti"
msgid "keyserver error"
msgstr "v�tmeserveri viga"
+#: util/errors.c:108
+#, fuzzy
+msgid "canceled"
+msgstr "Katkesta"
+
+#: util/errors.c:109
+#, fuzzy
+msgid "no card"
+msgstr "kr�ptimata"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr ""
@@ -301,7 +311,7 @@ msgstr "te leidsite vea ... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "entroopia kogumise moodul puudub\n"
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "`%s' ei �nnestu avada: %s\n"
@@ -333,7 +343,7 @@ msgstr "`%s' ei �nnestu lugeda: %s\n"
msgid "note: random_seed file not updated\n"
msgstr "m�rkus: random_seed faili ei uuendatud\n"
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr "`%s' ei �nnestu luua: %s\n"
@@ -401,7 +411,7 @@ msgstr "v�hem kui %d bitiga ei saa algarvu genereerida\n"
msgid "can't generate a prime with less than %d bits\n"
msgstr "v�hem kui %d bitiga ei saa algarvu genereerida\n"
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -409,128 +419,128 @@ msgstr ""
"@K�sud:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[fail]|loo allkiri"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[fail]|loo avateksti allkiri"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "loo eraldiseisev allkiri"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "kr�pteeri andmed"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "dekr�pteeri andmed (vaikimisi)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "kontrolli allkirja"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "n�ita v�tmeid"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "n�ita v�tmeid ja allkirju"
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "kontrolli v�tmete allkirju"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "n�ita v�tmeid ja s�rmej�lgi"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "n�ita salajasi v�tmeid"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "genereeri uus v�tmepaar"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "eemalda v�tmed avalike v�tmete hoidlast"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "allkirjasta v�ti"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "allkirjasta v�ti lokaalselt"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "allkirjasta v�i toimeta v�tit"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "genereeri t�histamise sertifikaat"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "ekspordi v�tmed"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "ekspordi v�tmed v�tmeserverisse"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "impordi v�tmed v�tmeserverist"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "otsi v�tmeid v�tmeserverist"
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "uuenda v�tmeid v�tmeserverist"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "impordi/mesti v�tmed"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "uuenda usalduse andmebaasi"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|algo [failid]|tr�ki teatel�hendid"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -540,55 +550,51 @@ msgstr ""
"V�tmed:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "loo ascii pakendis v�ljund"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|NIMI|kr�pti NIMEle"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr "kasuta seda kasutaja IDd"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "kasuta kanoonilist tekstimoodi"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "kasuta v�ljundfailina"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "ole jutukas"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "�ra tee mingeid muutusi"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "k�si enne �lekirjutamist"
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -596,7 +602,7 @@ msgstr ""
"@\n"
"(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -616,15 +622,15 @@ msgstr ""
" --list-keys [nimed] n�ita v�tmeid\n"
" --fingerprint [nimed] n�ita s�rmej�lgi\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -634,7 +640,7 @@ msgstr ""
"allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
"vaikimisi operatsioon s�ltub sisendandmetest\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -642,468 +648,462 @@ msgstr ""
"\n"
"Toetatud algoritmid:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr "Avalik v�ti: "
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr "�iffer: "
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr "R�si: "
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
msgid "Compression: "
msgstr "Pakkimine: "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "kasuta: gpg [v�tmed] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "vastuolulised k�sud\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
-#: g10/g10.c:1205
+#: g10/g10.c:1210
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
-#: g10/g10.c:1334
-#, c-format
-msgid "unknown configuration item \"%s\"\n"
+#: g10/g10.c:1354
+#, fuzzy, c-format
+msgid "unknown configuration item `%s'\n"
msgstr "tundmatu seade \"%s\"\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "M�RKUS: ignoreerin vana vaikimisi v�tmete faili `%s'\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "v�tmete fail `%s': %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "loen v�tmeid failist `%s'\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
-#: g10/g10.c:1887
-#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+#: g10/g10.c:2021
+#, fuzzy, c-format
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr "ebaturvaliste �iguste t�ttu ei laetud �ifri laiendust \"%s\"\n"
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "%s ei ole lubatud kooditabel\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "ei saa parsida v�tmeserveri URI\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "vigased ekspordi v�tmed\n"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: vigased impordi v�tmed\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
msgid "invalid import options\n"
msgstr "vigased impordi v�tmed\n"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
msgid "invalid export options\n"
msgstr "vigased ekspordi v�tmed\n"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: vigased impordi v�tmed\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "vigased impordi v�tmed\n"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "vigased ekspordi v�tmed\n"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "HOIATUS: %s m��rab �le %s\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ja %s ei ole koos lubatud!\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ja %s ei oma koos m�tet!\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"--pgp2 moodis saate luua ainult eraldiseisvaid v�i avateksti allkirju\n"
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "--pgp2 moodis ei saa korraga allkirjastada ja kr�pteerida\n"
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n"
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "teate kr�pteerimine --pgp2 moodis n�uab IDEA �iffrit\n"
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "valitud �ifri algoritm ei ole lubatud\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "valitud l�hendi algoritm ei ole lubatud\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "valitud �ifri algoritm ei ole lubatud\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
msgid "selected certification digest algorithm is invalid\n"
msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed peab olema suurem, kui 0\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed peab olema suurem, kui 1\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 v�i 3\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "vigane min-sert-tase; peab olema 1, 2 v�i 3\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
msgid "invalid default preferences\n"
msgstr "vigased vaikimisi eelistused\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
msgid "invalid personal cipher preferences\n"
msgstr "vigased isikliku �ifri eelistused\n"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
msgid "invalid personal digest preferences\n"
msgstr "vigased isikliku l�hendi eelistused\n"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
msgid "invalid personal compress preferences\n"
msgstr "vigased isikliku pakkimise eelistused\n"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ei t��ta veel koos %s-ga\n"
-#: g10/g10.c:2680
-#, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2797
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "�ifri algoritm \"%s\" ei ole moodis %s lubatud\n"
-#: g10/g10.c:2685
-#, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2802
+#, fuzzy, c-format
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "s�numil�hendi algoritm \"%s\" ei ole moodis %s lubatud\n"
-#: g10/g10.c:2690
-#, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2807
+#, fuzzy, c-format
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"HOIATUS: m��rati saajad (-r) aga ei kasutata avaliku v�tme kr�ptograafiat\n"
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [failinimi]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [failinimi]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [failinimi]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "%s ei ole moodis %s lubatud.\n"
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [failinimi]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "%s ei ole moodis %s lubatud.\n"
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [failinimi]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [failinimi]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [failinimi]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key kasutaja-id"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key kasutaja-id"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrsign-key kasutaja-id"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key kasutaja-id"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key kasutaja-id [k�sud]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "%s ei �nnestu avada: %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [kasutaja-id] [v�tmehoidla]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, c-format
msgid "key export failed: %s\n"
msgstr "v�tme eksport eba�nnestus: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "lahtipakendamine eba�nnestus: %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "pakendamine eba�nnestus: %s\n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "vigane r�sialgoritm `%s'\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[failinimi]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "Kirjutage n��d oma teade ...\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "`%s' ei �nnestu avada\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@ -1111,48 +1111,48 @@ msgstr ""
"noteerimise nimes v�ivad olla ainult tr�kitavad s�mbolid v�i t�hikud\n"
"ning l�pus peab olema '='\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
msgid "a user notation name must contain the '@' character\n"
msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "noteerimise v��rtus ei v�i sisaldada kontroll s�mboleid\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr "antud sertifikaadi poliisi URL on vigane\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr "antud allkirja poliisi URL on vigane\n"
-#: g10/g10.c:3747
+#: g10/g10.c:3863
#, fuzzy
-msgid "the given signature preferred keyserver URL is invalid\n"
+msgid "the given preferred keyserver URL is invalid\n"
msgstr "antud allkirja poliisi URL on vigane\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "ole m�nev�rra vaiksem"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
msgid "take the keys from this keyring"
msgstr "v�ta v�tmed sellest v�tmehoidlast"
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
msgid "make timestamp conflicts only a warning"
msgstr "teata ajatemplite konfliktist ainult hoiatusega"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Kasuta: gpgv [v�tmed] [failid] (-h n�itab abiinfot)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1186,12 +1186,13 @@ msgid "invalid dash escaped line: "
msgstr "vigane kriipsudega m�rgitud rida: "
#: g10/armor.c:565
-msgid "unexpected armor:"
+#, fuzzy
+msgid "unexpected armor: "
msgstr "ootamatu pakend:"
-#: g10/armor.c:695 g10/armor.c:1276
-#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+#: g10/armor.c:695 g10/armor.c:1280
+#, fuzzy, c-format
+msgid "invalid radix64 character %02X skipped\n"
msgstr "vigane radix64 s�mbol %02x vahele j�etud\n"
#: g10/armor.c:738
@@ -1202,33 +1203,34 @@ msgstr "enneaegne failil�pp (puudub CRC)\n"
msgid "premature eof (in CRC)\n"
msgstr "enneaegne failil�pp (poolik CRC)\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "vigane CRC\n"
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC viga; %06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+#, fuzzy
+msgid "premature eof (in trailer)\n"
msgstr "enneaegne failil�pp (l�petaval real)\n"
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "viga l�petaval real\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "ei leia OpenPGP andmeid.\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "vigane pakend: rida on pikem, kui %d s�mbolit\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1283,7 +1285,7 @@ msgstr " ka \""
msgid " aka \""
msgstr " ka \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1531,96 +1533,116 @@ msgstr "%s: j�tsin vahele: avalik v�ti on blokeeritud\n"
msgid "no valid addressees\n"
msgstr "kehtivaid aadresse pole\n"
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "eelistus %c%lu on duplikaat\n"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "liiga palju `%c' eelistusi\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
#, fuzzy
msgid "too many digest preferences\n"
msgstr "liiga palju `%c' eelistusi\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
#, fuzzy
msgid "too many compression preferences\n"
msgstr "liiga palju `%c' eelistusi\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "lubamatu s�mbol eelistuste s�nes\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
msgid "writing direct signature\n"
msgstr "kirjutan otsese allkirja\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "kirjutan iseenda allkirja\n"
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "kirjutan v�tit siduva allkirja\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "vigane v�tme suurus; kasutan %u bitti\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "v�tme suurus �mardatud �les %u bitini\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA ja ElGamal (vaikimisi)\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (ainult allkirjastamiseks)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (ainult kr�ptimiseks)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (ainult allkirjastamiseks)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (ainult kr�pteerimiseks)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (allkirjastamiseks ja kr�ptimiseks)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, fuzzy, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) RSA (ainult allkirjastamiseks)\n"
+
+#: g10/keygen.c:1224
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) RSA (allkirjastamiseks ja kr�ptimiseks)\n"
+
+#: g10/keygen.c:1226
+#, fuzzy, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) RSA (ainult kr�pteerimiseks)\n"
+
+#: g10/keygen.c:1228
+#, fuzzy, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) RSA (allkirjastamiseks ja kr�ptimiseks)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "Teie valik? "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "Vigane valik.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1633,28 +1655,28 @@ msgstr ""
" vaikimisi v�tmepikkus on 1024 bitti\n"
" suurim soovitatav v�tmepikkus on 2048 bitti\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "Millist v�tmepikkust te soovite? (1024) "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA lubab v�tmepikkuseid ainult vahemikus 512 kuni 1024\n"
-#: g10/keygen.c:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "v�tmepikkus on liiga v�ike; RSA korral on v�ikseim v��rtus 1024.\n"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "v�tmepikkus on liiga v�ike; v�ikseim lubatud v��rtus on 768.\n"
-#: g10/keygen.c:1255
+#: g10/keygen.c:1328
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "v�tmepikkus on liiga suur; suurim lubatud v��rtus on %d.\n"
-#: g10/keygen.c:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1662,11 +1684,11 @@ msgstr ""
"Suuremad v�tmepikkused kui 2048 ei ole soovitatavad, kuna\n"
"arvutused v�tavad V�GA palju aega!\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "Olete kindel, et soovite sellist v�tmepikkust? "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1674,17 +1696,17 @@ msgstr ""
"Olgu, kuid pidage meeles, et ka teie monitor ja klaviatuur on samuti\n"
"v�imalikud r�ndeobjektid!\n"
-#: g10/keygen.c:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Soovitud v�tmepikkus on %u bitti\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "�mardatud �les %u bitini\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1700,7 +1722,7 @@ msgstr ""
" <n>m = v�ti aegub n kuuga\n"
" <n>y = v�ti aegub n aastaga\n"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1716,29 +1738,29 @@ msgstr ""
" <n>m = allkiri aegub n kuuga\n"
" <n>y = allkiri aegub n aastaga\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "V�ti on kehtiv kuni? (0) "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr "Allkiri on kehtiv kuni? (0) "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "vigane v��rtus\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s ei aegu kunagi\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr "%s aegub %s\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1746,16 +1768,17 @@ msgstr ""
"Teie s�steem ei saa esitada kuup�evi peale aastat 2038.\n"
"Siiski k�sitletakse neid korrektselt aastani 2106.\n"
-#: g10/keygen.c:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "On see �ige (j/e)? "
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
+#, fuzzy
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
@@ -1765,44 +1788,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "P�risnimi: "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "Lubamatu s�mbol nimes\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr "Nimi ei v�i alata numbriga\n"
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr "Nimes peab olema v�hemalt 5 s�mbolit\n"
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "E-posti aadress: "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "Selline e-posti aadress ei ole lubatud\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "Kommentaar: "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "Lubamatu s�mbol kommentaaris\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Te kasutate kooditabelit `%s'.\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1813,27 +1836,27 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "�rge palun kirjutage e-posti aadressi p�risnimesse ega kommentaari\n"
-#: g10/keygen.c:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoVv"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (V)�lju? "
-#: g10/keygen.c:1542
+#: g10/keygen.c:1615
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (O)k/(V)�lju? "
-#: g10/keygen.c:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr "Palun parandage k�igepealt viga\n"
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1841,16 +1864,16 @@ msgstr ""
"Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr "parooli ei korratud �ieti; proovige uuesti"
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1862,7 +1885,7 @@ msgstr ""
"kasutades seda programmi v�tmega \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1874,58 +1897,58 @@ msgstr ""
"kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
"koguda paremat entroopiat.\n"
-#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr "vabandust, seda ei saa pakettmoodis teha\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA v�tmepaari pikkuseks saab 1024 bitti.\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "V�tme genereerimine katkestati.\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr "kirjutan avaliku v�tme faili `%s'\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kirjutatavat avalike v�tmete hoidlat pole: %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "viga avaliku v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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"
@@ -1934,31 +1957,60 @@ msgstr ""
"Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
"kasutades v�tit \"--edit-key\".\n"
-#: g10/keygen.c:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr "V�tme genereerimine eba�nnestus: %s\n"
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
-#: g10/keygen.c:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "v�ti loodi %lu sekundit tulevikus (ajah�pe v�i kella probleem)\n"
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "M�RKUS: v3 v�tmetele alamv�tmete loomine ei ole OpenPGP �hilduv\n"
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "Loon t�esti? "
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "`%s' ei �nnestu luua: %s\n"
+
+#: g10/keygen.c:3248
+#, fuzzy, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "v�ti --output ei t��ta selle k�suga\n"
@@ -1969,7 +2021,7 @@ msgstr "v�ti --output ei t��ta selle k�suga\n"
msgid "%s: can't open: %s\n"
msgstr "%s: ei �nnestu avada: %s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "viga parooli loomisel: %s\n"
@@ -1998,6 +2050,11 @@ msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
msgstr ""
"RSA v�tmeid pikkusega kuni 2048 bitti saab kr�pteerida ainult --pgp2 moodis\n"
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "%s ei �nnestu avada: %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -2008,24 +2065,33 @@ msgid ""
"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
msgstr "k�ikide kr�pteeritavate v�tmetega ei saa IDEA �iffrit kasutada.\n"
-#: g10/encode.c:526 g10/encode.c:721
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#: g10/encode.c:526
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
-#: g10/encode.c:634 g10/sign.c:863
-#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+#: g10/encode.c:634 g10/sign.c:864
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
msgstr ""
"pakkimise algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
+
#: g10/encode.c:818
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s kr�ptitud kasutajale: \"%s\"\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "v�tit '%s' ei leitud: %s\n"
@@ -2058,8 +2124,9 @@ msgstr "HOIATUS: midagi ei eksporditud\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "avalike v�tmete puhvris on liiga palju v�tmeid - blokeerin\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+#, fuzzy
+msgid "[User ID not found]"
msgstr "[Kasutaja id puudub]"
#: g10/getkey.c:1614
@@ -2214,7 +2281,7 @@ msgstr "v�ti %08lX: HKP alamv�tme rike parandatud\n"
#: g10/import.c:722
#, fuzzy, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr ""
"v�ti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
@@ -2242,7 +2309,7 @@ msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
msgid "no writable keyring found: %s\n"
msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "kirjutan faili `%s'\n"
@@ -2355,12 +2422,12 @@ msgstr "v�ti %08lX: allkirjal puudub kasutaja ID\n"
#: g10/import.c:1299
#, fuzzy, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm kasutajaga \"%s\"\n"
#: g10/import.c:1301
#, fuzzy, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "v�ti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
#: g10/import.c:1319
@@ -2400,7 +2467,7 @@ msgstr "v�ti %08lX: eemaldasin mitme alamv�tme t�histamise\n"
#: g10/import.c:1439
#, fuzzy, c-format
-msgid "key %s: skipped user ID '%s'\n"
+msgid "key %s: skipped user ID \"%s\"\n"
msgstr "v�ti %08lX: j�tsin vahele kasutaja ID '"
#: g10/import.c:1460
@@ -2410,7 +2477,7 @@ msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
#: g10/import.c:1487
#, fuzzy, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "v�ti %08lX: mitte eksporditav allkiri (klass %02x) - j�tan vahele\n"
#: g10/import.c:1497
@@ -2444,113 +2511,113 @@ msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"HOIATUS: v�ti %08lX v�ib olla t�histatud: laen t�histamise v�tit %08lX\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"HOIATUS: v�ti %08lX v�ib olla t�histatud: t�histamise v�tit %08lX pole.\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat lisatud\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[t�histamine]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[iseenda allkiri]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "1 halb allkiri\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d halba allkirja\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "1 allkiri j�i testimata, kuna v�ti puudub\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d allkirja j�i testimata, kuna v�tmed puuduvad\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "1 allkiri j�i vea t�ttu kontrollimata\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d allkirja j�i vigade t�ttu kontrollimata\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "tuvastasin �he kehtiva iseenda allkirjata kasutaja ID\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, fuzzy, c-format
msgid " (%d) I trust marginally\n"
msgstr " %d = Usaldan v�hesel m��ral\n"
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, fuzzy, c-format
msgid " (%d) I trust fully\n"
msgstr " %d = Usaldan t�iesti\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Kasutaja ID \"%s\" on t�histatud."
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/e) "
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr " Ei saa allkirjastada.\n"
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Kasutaja ID \"%s\" on aegunud."
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2559,11 +2626,11 @@ msgstr ""
"Iseenda allkiri \"%s\"\n"
"on PGP 2.x stiilis allkiri.\n"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Kas te soovite seda edutada OpenPGP iseenda allkirjaks? (j/E) "
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2572,11 +2639,11 @@ msgstr ""
"Teie praegune allkiri \"%s\"\n"
"on aegunud.\n"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Kas soovite luua uut allkirja et asendada vana aegunud? (j/E) "
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2585,54 +2652,54 @@ msgstr ""
"Teie praegune allkiri \"%s\"\n"
"on lokaalne allkiri.\n"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
"Kas te soovite seda edutada t�ielikuks eksporditavaks allkirjaks? (j/E) "
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" on juba lokaalselt allkirjastatud v�tmega %08lX\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" on juba allkirjastatud v�tmega %08lX\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/E) "
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "V�tmega %08lX pole midagi allkirjastada\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "See v�ti on aegunud!"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "See v�ti aegub %s.\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Soovite, et teie allkiri aeguks samal ajal? (J/e) "
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
msgstr "--pgp2 moodis ei saa PGP 2.x v�tmele OpenPGP allkirja anda.\n"
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "See muudab v�tme PGP 2.x programmidega mitte-kasutatavaks.\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2642,31 +2709,31 @@ msgstr ""
"kuulub ka tegelikult �lal mainitud isikule? Kui te ei tea, mida vastata,\n"
"sisestage \"0\".\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Ma ei vasta.%s\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Ma ei ole �ldse kontrollinud.%s\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Ma olen kontrollinud v�ga hoolikalt.%s\n"
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr "Teie valik? (lisainfo saamiseks vajutage '?'): "
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2674,7 +2741,7 @@ msgstr ""
"Olete t�esti kindel, et soovite seda v�tit oma\n"
"v�tmega allkirjastada: \""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2682,7 +2749,7 @@ msgstr ""
"\n"
"See saab olema iseenda allkiri.\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2690,7 +2757,7 @@ msgstr ""
"\n"
"HOIATUS: allkirja ei m�rgita mitte-eksporditavaks.\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2698,7 +2765,7 @@ msgstr ""
"\n"
"HOIATUS: allkirja ei m�rgita kehtetuks mitte-tunnistatavaks.\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2706,7 +2773,7 @@ msgstr ""
"\n"
"Allkiri m�rgitakse mitte-eksporditavaks.\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2714,7 +2781,7 @@ msgstr ""
"\n"
"Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2722,7 +2789,7 @@ msgstr ""
"\n"
"Ma ei ole seda v�tit �ldse kontrollinud.\n"
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2730,7 +2797,7 @@ msgstr ""
"\n"
"Ma olen seda v�tit kontrollinud ainult pealiskaudselt.\n"
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2738,34 +2805,34 @@ msgstr ""
"\n"
"Ma olen kontrollinud seda v�tit v�ga hoolikalt.\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "Allkirjastan t�esti? "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "allkirjastamine eba�nnestus: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "See v�ti ei ole kaitstud.\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "V�ti on kaitstud.\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Seda v�tit ei �nnestu toimetada: %s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2773,7 +2840,7 @@ msgstr ""
"Sisestage sellele salajasele v�tmele uus parool.\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2781,544 +2848,566 @@ msgstr ""
"Te ei soovi parooli - see on t�en�oliselt *halb* idee!\n"
"\n"
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "Kas te t�esti soovite seda teha? "
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "t�stan v�tme allkirja �igesse kohta\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "v�lju sellest men��st"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "v"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "save"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "salvesta ja v�lju"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "help"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "n�ita seda abiinfot"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "n�ita s�rmej�lge"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "list"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "n�ita v�tit ja kasutaja IDd"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "vali kasutaja ID N"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "key"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "vali sekundaarne v�ti N"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "check"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "n�ita allkirju"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "c"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "allkirjasta v�ti"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "s"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "tsign"
msgstr "sign"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "make a trust signature"
msgstr "loo eraldiseisev allkiri"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "allkirjasta v�ti lokaalselt"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr "allkirjasta v�ti kehtetuks mitte-tunnistatavana"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "sign the key locally and non-revocably"
msgstr "allkirjasta v�ti lokaalselt ja kehtetuks mitte-tunnistatavana"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "lisa kasutaja ID"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr "lisa foto"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr "lisa foto ID"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "kustuta kasutaja ID"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr "delphoto"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "lisa sekundaarne v�ti"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+#, fuzzy
+msgid "addcardkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "kustuta sekundaarne v�ti"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "addrevoker"
msgstr "addrevoker"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "add a revocation key"
msgstr "lisa t�histamise v�ti"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "kustuta allkirjad"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "muuda aegumise kuup�eva"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr "primaarne"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr "m�rgi kasutaja ID primaarseks"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "l�lita"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "l�lita salajaste v�i avalike v�tmete loendi vahel"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "t"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr "n�ita eelistusi (ekspert)"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr "n�ita eelistusi (detailsena)"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr "sea eelistuste nimekiri"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr "uuendatud eelistused"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "keyserver"
msgstr "v�tmeserveri viga"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "set preferred keyserver URL"
msgstr "ei saa parsida v�tmeserveri URI\n"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "muuda parooli"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "muuda omaniku usaldust"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "t�hista allkirjad"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revuid"
msgstr "revuid"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revoke a user ID"
msgstr "t�hista kasutaja ID"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "t�hista sekundaarne v�ti"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "blokeeri v�ti"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "luba v�ti"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr "showphoto"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr "n�ita foto ID"
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "seda ei saa teha pakettmoodis\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "viga salajase v�tmebloki `%s' lugemisel: %s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "Salajane v�ti on kasutatav.\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "K�sklus> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "Selle tegamiseks on vaja salajast v�tit.\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr "Palun kasutage k�igepealt k�sku \"toggle\".\n"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
msgid "Key is revoked."
msgstr "V�ti on t�histatud."
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "See k�sklus ei ole %s moodis lubatud.\n"
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "Viimast kasutaja ID ei saa kustutada!\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "Kas eemaldan t�esti selle kasutaja ID? "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+#, fuzzy
+msgid "Really move the primary key? "
+msgstr "Kas eemaldan t�esti selle kasutaja ID? "
+
+#: g10/keyedit.c:1598
+#, fuzzy
+msgid "You must select exactly one key.\n"
+msgstr "Te peata valima v�hemalt �he v�tme.\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "Te peata valima v�hemalt �he v�tme.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "Kas te t�esti soovite seda v�tit kustutada? "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
msgid "Really revoke all selected user IDs? "
msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
msgid "Really revoke this user ID? "
msgstr "Kas t�histan t�esti selle kasutaja ID? "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "Kas te t�esti soovite valitud v�tmeid t�histada? "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "Kas te t�esti soovite seda v�tit t�histada? "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
#, fuzzy
msgid "Set preference list to:\n"
msgstr "sea eelistuste nimekiri"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr "Kas t�esti uuendan seaded? "
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "Salvestan muutused? "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "V�ljun salvestamata? "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "uuendamine eba�nnestus: %s\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "Vigane k�sklus (proovige \"help\")\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr "Teatel�hend: "
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr "Omadused: "
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keyedit.c:2219
#, c-format
msgid "This key may be revoked by %s key "
msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr " (tundlik)"
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "%s ei �nnestu luua: %s\n"
-#: g10/keyedit.c:2084
-#, fuzzy, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
msgstr "[t�histatud] "
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
-msgstr " [aegub: %s]"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
+msgstr "expire"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2246
#, fuzzy, c-format
-msgid "expires: %s"
-msgstr " [aegub: %s]"
+msgid "usage: %s"
+msgstr " usaldus: %c/%c"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, fuzzy, c-format
msgid "trust: %s"
msgstr " usaldus: %c/%c"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "See v�ti on blokeeritud"
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! alamv�ti on t�histatud: %s\n"
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
-msgstr "rev- leitud v�ltsitud t�histamine\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? probleem t�histamise kontrollimisel: %s\n"
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-#, fuzzy
-msgid "revoked"
-msgstr "[t�histatud] "
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-#, fuzzy
-msgid "expired"
-msgstr "expire"
+#: g10/keyedit.c:2300
+msgid "card-no: "
+msgstr ""
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x stiilis kasutaja ID ei oma seadeid.\n"
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3326,15 +3415,7 @@ msgstr ""
"Tuleb t�hele panna et kuni te pole programmi uuesti k�ivitanud, ei pruugi\n"
"n�idatud v�tme kehtivus olla tingimata korrektne.\n"
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-msgid "[revoked] "
-msgstr "[t�histatud] "
-
-#: g10/keyedit.c:2274
-msgid "[expired] "
-msgstr "[aegunud] "
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@ -3342,7 +3423,7 @@ msgstr ""
"HOIATUS: �htegi kasutaja ID pole m�rgitud primaarseks. See k�sklus v�ib\n"
" p�hjustada muu kasutaja ID primaarseks m��ramist.\n"
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3351,45 +3432,45 @@ msgstr ""
"HOIATUS: See on PGP2-stiilis v�ti. Foto ID lisamine v�ib sundida m�ningaid\n"
" PGP versioone seda v�tit tagasi l�kkama.\n"
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Olete kindel, et soovite seda ikka lisada? (j/E) "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Foto IDd ei saa PGP2 v�tmele lisada.\n"
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Kustutan selle vigase allkirja? (j/E/v)"
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Kustutatud %d allkiri.\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Kustutatud %d allkirja.\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "Midagi ei kustutatud.\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3398,89 +3479,99 @@ msgstr ""
"HOIATUS: See on PGP2-stiilis v�ti. M��ratud t�histaja lisamine v�ib\n"
" p�hjustada m�ningaid PGP versioone seda v�tit tagasi l�kkama.\n"
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "PGP 2.x-stiili v�tmele ei saa m��ratud t�histajat lisada.\n"
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
msgid "Enter the user ID of the designated revoker: "
msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "PGP 2.x stiilis v�tit ei saa nimetada m��ratud t�histajaks\n"
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "te ei saa nimetada v�tit iseenda m��ratud t�histajaks\n"
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "HOIATUS: See v�ti on m��ratud t�histaja poolt t�histatud!\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "HOIATUS: v�tme seadmist m��ratud t�histajaks ei saa tagasi v�tta!\n"
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr ""
"Olete kindel, et soovite seda v�tit seada m��ratud t�histajaks? (j/E): "
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "Muudan primaarse v�tme aegumise aega.\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
msgid "Please select exactly one user ID.\n"
msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
-#, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "j�tan kasutaja \"%s\" v3 iseenda allkirja vahele\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+#, fuzzy
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
+
+#: g10/keyedit.c:3480
+#, fuzzy
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "Kasutaja ID numbriga %d puudub\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Sekundaarne v�ti numbriga %d puudub\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "kasutaja ID: \""
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3489,7 +3580,7 @@ msgstr ""
"\"\n"
"allkirjastatud teie v�tmega %08lX %s\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3498,142 +3589,126 @@ msgstr ""
"\"\n"
"lokaalselt allkirjastatud teie v�tmega %08lX %s\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, c-format
msgid "This signature expired on %s.\n"
msgstr "See allkiri aegub %s.\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Olete kindel, et soovite seda ikka t�histada? (j/E) "
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid " signed by %s on %s%s%s\n"
msgstr " allkirjastanud %08lX %s%s%s\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid " revoked by %s on %s\n"
msgstr " t�histanud %08lX %s\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "Te asute t�histama j�rgmisi allkirju:\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, fuzzy, c-format
msgid " signed by %s on %s%s\n"
msgstr " allkirjastanud %08lX %s%s\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr " (mitte-eksporditav)"
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
msgid "Really create the revocation certificates? (y/N) "
msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "salajast v�tit pole\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "HOIATUS: kasutaja ID allkirja ajatempel on %d sekundit tulevikus\n"
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "N�itan %s foto IDd suurusega %ld, v�ti 0x%08lX (uid %d)\n"
-#: g10/keylist.c:179
+#: g10/keylist.c:180
msgid "Critical signature policy: "
msgstr "Kriitiline allkirja poliitika: "
-#: g10/keylist.c:181
+#: g10/keylist.c:182
msgid "Signature policy: "
msgstr "Allkirja poliitika: "
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
msgid "Critical signature notation: "
msgstr "Kriitiline allkirja noteerimine: "
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr "Allkirja noteerimine: "
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr "pole inimese poolt loetav"
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr "V�tmehoidla"
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr " [aegub: %s]"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr " [aegub: %s]"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, fuzzy, c-format
-msgid " [revoked: %s]"
-msgstr "[t�histatud] "
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
msgid "Primary key fingerprint:"
msgstr "Primaarse v�tme s�rmej�lg:"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
msgid " Subkey fingerprint:"
msgstr " Alamv�tme s�rmej�lg:"
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
msgid " Primary key fingerprint:"
msgstr " Primaarse v�tme s�rmej�lg:"
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
msgid " Subkey fingerprint:"
msgstr " Alamv�tme s�rmej�lg:"
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr " V�tme s�rmej�lg ="
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3838,80 +3913,80 @@ msgstr "vana stiili (PGP 2.x) allkiri\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "ei �nnestu blokeerida m�lupildi salvestamist: %s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "Eksperimentaalseid algoritme ei peaks kasutama!\n"
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"see �ifri algoritm ei ole soovitatav; kasutage palun m�nd standardsemat!\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr "IDEA �ifri lisandprogrammi pole\n"
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr "lisainfot leiate lehelt http://www.gnupg.org/why-not-idea.html\n"
-#: g10/misc.c:491
+#: g10/misc.c:517
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: ebasoovitav v�ti \"%s\"\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "palun kasutage selle asemel \"%s%s\"\n"
-#: g10/misc.c:508
+#: g10/misc.c:534
msgid "Uncompressed"
msgstr "Pakkimata"
-#: g10/misc.c:533
+#: g10/misc.c:559
#, fuzzy
msgid "uncompressed|none"
msgstr "Pakkimata"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "see teade ei pruugi olla programmiga %s kasutatav\n"
-#: g10/misc.c:777
+#: g10/misc.c:826
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "loen v�tmeid failist `%s'\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "tundmatu vaikimisi saaja `%s'\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"HOIATUS: t�en�oliselt ebaturvaline s�mmeetriliselt kr�pteeritud sessiooni "
"v�ti\n"
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
@@ -3950,7 +4025,7 @@ msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "probleem gpg-agent programmiga suhtlemisel\n"
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr "probleem agendiga - blokeerin agendi kasutamise\n"
@@ -3986,24 +4061,24 @@ msgstr "liiga pikk parool\n"
msgid "invalid response from agent\n"
msgstr "vigane vastus agendilt\n"
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "katkestatud kasutaja poolt\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "probleem agendiga: agent tagastas 0x%lx\n"
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "pakettmoodis ei saa parooli k�sida\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "Sisestage parool: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4013,22 +4088,22 @@ msgstr ""
"Te vajate kasutaja salajase v�tme lahtilukustamiseks\n"
"parooli: \""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bitine %s v�ti, ID %08lX, loodud %s"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (peamise v�tme ID %08lX)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "Korrake parooli: "
@@ -4242,27 +4317,38 @@ msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
"PGP 2.x stiilis v�tmetega saab eraldi-allkirjastada ainult --pgp2 moodis\n"
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
-msgstr "%s ei �nnestu luua: %s\n"
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
+msgstr "`%s' ei �nnestu luua: %s\n"
-#: g10/sign.c:794
-#, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+#: g10/sign.c:771 g10/sign.c:1008
+#, fuzzy, c-format
+msgid "writing to file `%s'\n"
+msgstr "kirjutan faili `%s'\n"
+
+#: g10/sign.c:795
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr "allkirjastan:"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "faili ei �nnestu avada: %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
"PGP 2.x stiilis v�tmetega saab avateksti allkirjastada ainult --pgp2 moodis\n"
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr "kasutatakse %s kr�pteerimist\n"
@@ -4658,7 +4744,7 @@ msgstr ""
"s�mmeetrilises �ifris ei �nnestu v�ltida n�rga v�tme kasutamist; proovisin %"
"d korda!\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA n�uab 160 bitist r�sialgoritmi kasutamist\n"
@@ -5017,17 +5103,17 @@ msgstr "Abiinfo puudub"
msgid "No help available for `%s'"
msgstr "`%s' kohta abiinfo puudub"
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr "v�tmehoidla `%s' on loodud\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
@@ -5070,8 +5156,7 @@ msgstr "kontrollitud %lu v�tit (%lu allkirja)\n"
msgid "%s: keyring created\n"
msgstr "%s: v�tmehoidla on loodud\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5085,29 +5170,34 @@ msgstr ""
"v�ga suurt pilti, on ka k�ti v�ha suur!\n"
"M�istlik pildi suurus v�iks olla umbes 240x288.\n"
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr "Sisestage foto ID jaoks JPEG faili nimi: "
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "Fotot \"%s\" ei �nnestu avada: %s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
msgid "Are you sure you want to use it (y/N)? "
msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr "\"%s\": ei ole JPEG fail\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Is this photo correct (y/N/q)? "
msgstr "On see foto �ige (j/E/v)? "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
msgid "unable to display photo ID!\n"
msgstr "foto ID ei saa n�idata!\n"
@@ -5128,45 +5218,51 @@ msgstr ""
"ebaturvalised �igused\n"
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
+#, fuzzy
+msgid "this platform requires temporary files when calling external programs\n"
msgstr ""
"see platvorm n�uab v�liste programmide k�ivitamiseks ajutiste failide "
"kasutamist\n"
-#: g10/exec.c:432
-#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
msgstr "ei �nnestu k�ivitada %s \"%s\": %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:436
+#, fuzzy, c-format
+msgid "unable to execute shell `%s': %s\n"
+msgstr "ei �nnestu k�ivitada %s \"%s\": %s\n"
+
+#: g10/exec.c:515
#, c-format
msgid "system error while calling external program: %s\n"
msgstr "s�steemi viga v�lise programmi kasutamisel: %s\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr "v�line programm l�petas erandlikult\n"
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr "v�list programmi ei �nnestu k�ivitada\n"
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr "ei �nnestu lugeda v�lise programmi vastust: %s\n"
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "HOIATUS: ei �nnestu eemaldada ajutist kataloogi `%s': %s\n"
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr "mitte kunagi"
@@ -5326,6 +5422,47 @@ msgstr "viga usalduse kirje otsimisel: %s\n"
msgid "read error: %s\n"
msgstr "viga lugemisel: %s\n"
+#, fuzzy
+#~ msgid "revoked: %s"
+#~ msgstr "[t�histatud] "
+
+#, fuzzy
+#~ msgid "expired: %s"
+#~ msgstr " [aegub: %s]"
+
+#, fuzzy
+#~ msgid "expires: %s"
+#~ msgstr " [aegub: %s]"
+
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "rev! alamv�ti on t�histatud: %s\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "rev- leitud v�ltsitud t�histamine\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "rev? probleem t�histamise kontrollimisel: %s\n"
+
+#~ msgid "[revoked] "
+#~ msgstr "[t�histatud] "
+
+#~ msgid "[expired] "
+#~ msgstr "[aegunud] "
+
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr " [aegub: %s]"
+
+#~ msgid " [expires: %s]"
+#~ msgstr " [aegub: %s]"
+
+#, fuzzy
+#~ msgid " [revoked: %s]"
+#~ msgstr "[t�histatud] "
+
+#~ msgid "can't create %s: %s\n"
+#~ msgstr "%s ei �nnestu luua: %s\n"
+
#~ msgid ""
#~ "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n"
#~ msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 2ae03362c..d7b090eb3 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
"PO-Revision-Date: 2004-06-16 22:40+0300\n"
"Last-Translator: Tommi Vainikainen <[email protected]>\n"
"Language-Team: Finnish <[email protected]>\n"
@@ -62,7 +62,7 @@ msgstr "ei"
msgid "nN"
msgstr "eE"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "lopeta|sulje"
@@ -295,6 +295,16 @@ msgstr "salaista avainta ei voi käyttää"
msgid "keyserver error"
msgstr "avainpalvelinvirhe"
+#: util/errors.c:108
+#, fuzzy
+msgid "canceled"
+msgstr "Peru"
+
+#: util/errors.c:109
+#, fuzzy
+msgid "no card"
+msgstr "salaamaton"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr ""
@@ -317,7 +327,7 @@ msgstr "olet löytänyt ohjelmistovian ... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "entropian keräysmoduulia ei havaittu\n"
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
@@ -350,7 +360,7 @@ msgstr "tiedostoa \"%s\" ei voi lukea: %s\n"
msgid "note: random_seed file not updated\n"
msgstr "huom: random_seed-tiedostoa ei päivitetty\n"
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
@@ -419,7 +429,7 @@ msgstr "alkulukua, jossa on alle %d bittiä, ei voi luoda\n"
msgid "can't generate a prime with less than %d bits\n"
msgstr "alkulukua, jossa on alle %d bittiä, ei voi luoda\n"
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -427,128 +437,128 @@ msgstr ""
"@Komennot:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[tiedosto]|tee allekirjoitus"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "tee erillinen allekirjoitus"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "salaa tiedot"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "salaa vain symmetrisellä salaimella"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "avaa tiedot (oletus)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "tarkista allekirjoitus"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "näytä avaimet"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "näytä avaimet allekirjoituksineen"
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "tarkista avainten allekirjoitukset"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "näytä avaimet sormenjälkineen"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "näytä salaiset avaimet"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "luo uusi avainpari"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "poista avaimet julkisten avainten renkaasta"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "poista avaimet salaisten avainten renkaasta"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "allekirjoita avain"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "allekirjoita avain paikallisesti"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "allekirjoita tai muokkaa avainta"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "luo mitätöintivarmenne"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "vie avaimia"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "vie avaimia palvelimelle"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "nouda avaimia avainpalvelimelta"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "etsi avaimia avainpalvelimelta"
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "päivitä kaikki avaimet avainpalvelimelta"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "nouda/liitä avaimia"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "päivitä luottamustietokanta"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -558,55 +568,51 @@ msgstr ""
"Valitsimet:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "tuota ascii-koodattu tuloste"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|NIMI|salaa vastaanottajalle NIMI"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "käytä tekstimuotoa"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "käytä tulostustiedostona"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "monisanainen"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "älä tee muutoksia"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "kysy ennen ylikirjoittamista"
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -615,7 +621,7 @@ msgstr ""
"(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
"sivuilta)\n"
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -634,16 +640,16 @@ msgstr ""
" --list-keys [nimet] näytä avaimet\n"
" --fingerprint [nimet] näytä sormenjäljet\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <[email protected]>.\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -653,7 +659,7 @@ msgstr ""
"allekirjoita, tarkista, salaa tai avaa\n"
"oletustoiminto riippuu syötteestä\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -661,469 +667,463 @@ msgstr ""
"\n"
"Tuetut algoritmit:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr "JulkAvain: "
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr "Salaus: "
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr "Tiiviste: "
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
msgid "Compression: "
msgstr "Pakkaus: "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "käyttö: gpg [valitsimet] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "ristiriitainen komento\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "=-merkkiä ei löytynyt ryhmämäärityksessä \"%s\"\n"
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
-#: g10/g10.c:1205
+#: g10/g10.c:1210
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
-#: g10/g10.c:1334
-#, c-format
-msgid "unknown configuration item \"%s\"\n"
+#: g10/g10.c:1354
+#, fuzzy, c-format
+msgid "unknown configuration item `%s'\n"
msgstr "tuntematon asetus \"%s\"\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "asetustiedosto \"%s\": %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "luetaan asetukset tiedostosta \"%s\"\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
-#: g10/g10.c:1887
-#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+#: g10/g10.c:2021
+#, fuzzy, c-format
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr "Oikeudet eivät ole turvallisia, salainlaajennuksia \"%s\" ei ladattu\n"
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "%s ei kelpaa merkistöksi\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "virheelliset vientivalitsimet\n"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: virheelliset tuontivalitsimet\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
msgid "invalid import options\n"
msgstr "virheelliset tuontivalitsimet\n"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
msgid "invalid export options\n"
msgstr "virheelliset vientivalitsimet\n"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: virheelliset tuontivalitsimet\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "virheelliset tuontivalitsimet\n"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "virheelliset vientivalitsimet\n"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROITUS: %s korvaa %s:n\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ja %s yhdessä on järjetöntä!\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "erillisen allekirjoituksen voi luoda vain --pgp2-tilassa\n"
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "--pgp2-tilassa ei voi allekirjoittaa ja salata samanaikaisesti\n"
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"sinun tulee käyttää tiedostoja (eikä putkitusta) kun --pgp2 on käytössä.\n"
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "valittu salausalgoritmi ei kelpaa\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "valittu tiivistealgoritmi ei kelpaa\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "valittu salausalgoritmi ei kelpaa\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
msgid "selected certification digest algorithm is invalid\n"
msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed täytyy olla suurempi kuin 0\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth tulee olla välillä 1-255\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "default-cert-level ei kelpaa; täytyy olla 0, 1, 2 tai 3\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "min-cert-level ei kelpaa; täytyy olla 1, 2 tai 3\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr ""
"HUOM: yksinkertaista S2K-tilaa (0) ei todellakaan suositella käytettäväksi\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
msgid "invalid default preferences\n"
msgstr "virheelliset oletusarvoiset valinnat\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
msgid "invalid personal cipher preferences\n"
msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
msgid "invalid personal digest preferences\n"
msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
msgid "invalid personal compress preferences\n"
msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ja %s eivät vielä toimi yhdessä\n"
-#: g10/g10.c:2680
-#, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2797
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
-#: g10/g10.c:2685
-#, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2802
+#, fuzzy, c-format
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "tiivistealgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
-#: g10/g10.c:2690
-#, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2807
+#, fuzzy, c-format
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "pakkausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"VAROITUS: vastaanottajia (-r) annettu käyttämättä julkisen avaimen salausta\n"
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [tiedostonimi]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [tiedostonimi]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [tiedostonimi]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [tiedostonimi]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--allekirjoita [tiedostonimi]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [tiedostonimi]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [tiedostonimi]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [tiedostonimi]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [tiedostonimi]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [tiedostonimi]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key käyttäjätunnus"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key käyttäjätunnus"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrlsign-key käyttäjätunnus"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key käyttäjätunnus"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key käyttäjätunnus [komennot]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "tiedostoa %s ei voi avata: %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [käyttäjätunnus] [avainrengas]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, c-format
msgid "key export failed: %s\n"
msgstr "avaimen vienti epäonnistui: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "ascii-koodauksen purku epäonnistui: %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[tiedostonimi]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "Kirjoita viestisi...\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "tiedostoa \"%s\" ei voi avata\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@ -1131,48 +1131,48 @@ msgstr ""
"notaation nimen täytyy sisältää vain tulostettavia merkkejä tai "
"välilyöntejä, ja sen täytyy loppua merkkiin \"=\"\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
msgid "a user notation name must contain the '@' character\n"
msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "notaatiosssa ei saa olla erikoismerkkejä\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr "annettu varmennekäytännön URL on virheellinen\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
-#: g10/g10.c:3747
+#: g10/g10.c:3863
#, fuzzy
-msgid "the given signature preferred keyserver URL is invalid\n"
+msgid "the given preferred keyserver URL is invalid\n"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "ole jonkinverran hiljaisempi"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
msgid "take the keys from this keyring"
msgstr "ota avaimet tästä avainrenkaasta"
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
msgid "make timestamp conflicts only a warning"
msgstr "käsittele aikaleimakonfliktit pelkkinä varoituksina"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Käyttö: gpgv [valitsimet] [tiedostot] (-h näyttää ohjeen)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1206,12 +1206,13 @@ msgid "invalid dash escaped line: "
msgstr "epäkelpo viiva rivin lopussa: "
#: g10/armor.c:565
-msgid "unexpected armor:"
+#, fuzzy
+msgid "unexpected armor: "
msgstr "odottamaton ascii-koodaus:"
-#: g10/armor.c:695 g10/armor.c:1276
-#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+#: g10/armor.c:695 g10/armor.c:1280
+#, fuzzy, c-format
+msgid "invalid radix64 character %02X skipped\n"
msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
#: g10/armor.c:738
@@ -1222,33 +1223,34 @@ msgstr "ennenaikainen tiedoston loppu (ei CRC:tä)\n"
msgid "premature eof (in CRC)\n"
msgstr "ennenaikainen tiedoston loppu (CRC:ssä)\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "väärinmuotoiltu CRC\n"
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC-virhe; %06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+#, fuzzy
+msgid "premature eof (in trailer)\n"
msgstr "Ennenaikainen tiedoston loppu (Trailerissa)\n"
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "virhe trailer-rivissä\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "epäkelpo ascii-koodaus: yli %d merkkiä pitkä rivi\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1305,7 +1307,7 @@ msgstr " aka \""
msgid " aka \""
msgstr " aka \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1562,96 +1564,116 @@ msgstr "%s ohitettu: julkinen avain on poistettu käytöstä\n"
msgid "no valid addressees\n"
msgstr "ei kelvollisia vastaanottajia\n"
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "valinta %c%lu on kopio\n"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "liian monta \"%c\" valintaa\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
#, fuzzy
msgid "too many digest preferences\n"
msgstr "liian monta \"%c\" valintaa\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
#, fuzzy
msgid "too many compression preferences\n"
msgstr "liian monta \"%c\" valintaa\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "Valinnassa on luvaton merkki\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
msgid "writing direct signature\n"
msgstr "kirjoitetaan suora allekirjoitus\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "kirjoitetaan oma-allekirjoitus\n"
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "avaimen koko on pyöristetty %u bittiin\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "Valitse millaisen avaimen haluat:\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA ja ElGamal (oletus)\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (vain allekirjoitus)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (vain salaus)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (vain allekirjoitus)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (vain salaus)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (salaus ja allekirjoitus)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, fuzzy, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) RSA (vain allekirjoitus)\n"
+
+#: g10/keygen.c:1224
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) RSA (salaus ja allekirjoitus)\n"
+
+#: g10/keygen.c:1226
+#, fuzzy, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) RSA (vain salaus)\n"
+
+#: g10/keygen.c:1228
+#, fuzzy, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) RSA (salaus ja allekirjoitus)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "Valintasi? "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "Valinta ei kelpaa.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1664,28 +1686,28 @@ msgstr ""
" oletusavainkoko on 1024 bittiä\n"
" suurin suositeltava avainkoko on 2048 bittiä\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "Minkä kokoisen avaimen haluat? (1024) "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA sallii avaimen koot vain väliltä 512-1024\n"
-#: g10/keygen.c:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "avainkoko on liian pieni; RSA vaatii vähintään 1024.\n"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "avainkoko on liian pieni; pienin sallittu arvo on 768.\n"
-#: g10/keygen.c:1255
+#: g10/keygen.c:1328
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "avainkoko on liian suuri; suurin sallittu arvo on %d.\n"
-#: g10/keygen.c:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1693,11 +1715,11 @@ msgstr ""
"2048 bittiä suurempia avaimia ei suositella, koska\n"
"laskenta kestää TODELLA pitkään!\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "Haluatko varmasti tämän kokoisen avaimen? "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1705,17 +1727,17 @@ msgstr ""
"Hyvä on, mutta muista että näyttösi ja näppäimistösi säteily on myös "
"alttiina salakuuntelulle!\n"
-#: g10/keygen.c:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Halutun avaimen koko on %u bittiä\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "pyöristetty %u bittiin\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1731,7 +1753,7 @@ msgstr ""
" <n>m = Avain vanhenee n kuukauden kuluttua\n"
" <n>y = Avain vanhenee n vuoden kuluttua\n"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1747,29 +1769,29 @@ msgstr ""
" <n>m = Allekirjoitus vanhenee n kuukauden kuluttua\n"
" <n>y = Allekirjoitus vanhenee n vuoden kuluttua\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "Avain on voimassa? (0) "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr "Allekirjoitus on voimassa? (0) "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "arvo ei kelpaa\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s ei vanhene koskaan\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr "%s vanhenee %s\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1777,16 +1799,17 @@ msgstr ""
"Järjestelmäsi ei osaa näyttää päiväyksiä kuin vuoteen 2038.\n"
"Se kuitenkin käsittelee päiväykset oikein vuoteen 2106.\n"
-#: g10/keygen.c:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "Onko tämä oikein (k/e) "
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
+#, fuzzy
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
@@ -1798,44 +1821,44 @@ msgstr ""
" \"Matti Meikäläinen (nuorempi) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "Oikea nimi: "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "Nimessä on epäkelpo merkki\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr "Nimi ei voi alkaa numerolla\n"
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr "Nimen täytyy olla vähintään 5 merkkiä pitkä\n"
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "Sähköpostiosoite: "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "Sähköpostiosoite ei kelpaa\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "Huomautus: "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "Huomautuksessa on epäkelpo merkki\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Käytät merkistöä \"%s\".\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1846,27 +1869,27 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
-#: g10/keygen.c:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "NnHhSsOoLl"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (L)opeta?"
-#: g10/keygen.c:1542
+#: g10/keygen.c:1615
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (O)k/(L)opeta?"
-#: g10/keygen.c:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr "Ole hyvä ja korjaa ensin virhe\n"
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1874,16 +1897,16 @@ msgstr ""
"Tarvitset salasanan suojaamaan salaista avaintasi.\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1895,7 +1918,7 @@ msgstr ""
"tämän ohjelman valitsimella \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1907,58 +1930,58 @@ msgstr ""
"alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
"paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
-#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr "valitan, tätä ei voi tehdä eräajossa\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA-avainparissa on 1024 bittiä.\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "Avaimen luonti keskeytetty.\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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"
@@ -1966,12 +1989,12 @@ msgstr ""
"Huomaa, että tätä avainta ei voida käyttää salaamiseen. Käytä komentoa\n"
"\"--edit-key\" luodaksesi toissijaisen avaimen salaustarkoitukseen.\n"
-#: g10/keygen.c:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Avaimen luonti epäonnistui: %s\n"
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1979,7 +2002,7 @@ msgstr ""
"avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
"kellon kanssa on ongelmia)\n"
-#: g10/keygen.c:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1987,14 +2010,43 @@ msgstr ""
"avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
"kellon kanssa on ongelmia)\n"
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "HUOM: v3-aliavainten luonti ei ole OpenPGP:n mukaista\n"
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "Haluatko varmasti luoda? "
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "avainlohkojen poisto epäonnistui: %s\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
+
+#: g10/keygen.c:3248
+#, fuzzy, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "HUOM: salainen avain %08lX vanheni %s\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
@@ -2005,7 +2057,7 @@ msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
msgid "%s: can't open: %s\n"
msgstr "%s: ei voida avata kohdetta: %s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
@@ -2034,6 +2086,11 @@ msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
msgstr ""
"--pgp2-tilassa voidaan salata korkeintaan 2048-bittisillä RSA-avaimilla\n"
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "tiedostoa %s ei voi avata: %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -2044,22 +2101,30 @@ msgid ""
"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
msgstr "kaikille salattaville avaimille ei voi käyttää IDEA-salainta.\n"
-#: g10/encode.c:526 g10/encode.c:721
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#: g10/encode.c:526
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
-#: g10/encode.c:634 g10/sign.c:863
-#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+#: g10/encode.c:634 g10/sign.c:864
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
msgstr "valittu pakkausalgoritmi %s (%d) ei ole vastaanottajan suosima\n"
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
+
#: g10/encode.c:818
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s salattu vastaanottajalle: \"%s\"\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "avainta \"%s\" ei löydy: %s\n"
@@ -2094,8 +2159,9 @@ msgstr "VAROITUS: mitään ei viety\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "pk-välimuistissa on liian monta kohdetta - poistettu käytöstä\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+#, fuzzy
+msgid "[User ID not found]"
msgstr "[Käyttäjätunnusta ei löytynyt]"
#: g10/getkey.c:1614
@@ -2253,7 +2319,7 @@ msgstr "avain %08lX: HKP-aliavainvirhe korjattu\n"
#: g10/import.c:722
#, fuzzy, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr ""
"avain %08lX: käyttäjätunnus \"%s\" hyväksytty ilman omaa allekirjoitusta\n"
@@ -2281,7 +2347,7 @@ msgstr "avain %08lX: uusi avain - ohitetaan\n"
msgid "no writable keyring found: %s\n"
msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "kirjoitetaan kohteeseen \"%s\"\n"
@@ -2394,12 +2460,12 @@ msgstr "avain %08lX: allekirjoitukselle ei ole käyttäjätunnusta\n"
#: g10/import.c:1299
#, fuzzy, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "avain %08lX: julkisen avaimen algoritmia \"%s\" ei tueta\n"
#: g10/import.c:1301
#, fuzzy, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "avain %08lX: epäkelpo oma-allekirjoitus käyttäjätunnuksella \"%s\"\n"
#: g10/import.c:1319
@@ -2439,7 +2505,7 @@ msgstr "avain %08lX: useiden aliavainten mitätöinti poistettu\n"
#: g10/import.c:1439
#, fuzzy, c-format
-msgid "key %s: skipped user ID '%s'\n"
+msgid "key %s: skipped user ID \"%s\"\n"
msgstr "avain %08lX: käyttäjätunnus ohitettu '"
#: g10/import.c:1460
@@ -2449,7 +2515,7 @@ msgstr "avain %08lX: aliavain ohitettu\n"
#: g10/import.c:1487
#, fuzzy, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr ""
"avain %08lX: allekirjoitusta ei voida viedä (luokka %02x) - ohitetaan\n"
@@ -2484,115 +2550,115 @@ msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"VAROITUS: avain %08lX saattaa olla mitätöity: haetaan mitätöintiavain %08lX\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"VAROITUS: avain %08lX saattaa olla mitätöity: mitätöintiavainta %08lX \n"
"ei saatavilla.\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[mitätöinti]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[oma-allekirjoitus]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "1 väärä allekirjoitus\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d väärää allekirjoitusta\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d allekirjoitusta jätetty tarkistamatta puuttuvien avainten vuoksi\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d allekirjoitusta jätetty tarkistamatta virheiden vuoksi\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "havaittiin 1 käyttäjätunnus ilman voimassaolevaa oma-allekirjoitusta\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr ""
"havaittiin %d käyttäjätunnusta ilman voimassaolevaa oma-allekirjoitusta\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, fuzzy, c-format
msgid " (%d) I trust marginally\n"
msgstr " %d = Luotan osittain\n"
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, fuzzy, c-format
msgid " (%d) I trust fully\n"
msgstr " %d = Luotan täysin\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Käyttäjätunnus \"%s\" on mitätöity."
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Haluatko varmasti edelleen allekirjoittaa? (k/E) "
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr " Allekirjoittaminen ei onnistu.\n"
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Käyttäjätunnus \"%s\" on vanhentunut."
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2601,13 +2667,13 @@ msgstr ""
"Oma-allekirjoitus kohteessa \"%s\"\n"
"on PGP 2.x -muodon allekirjoitus.\n"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr ""
"Haluatko vahventaa sen täysin vientikelpoiseksi OpenPGP-allekirjoitukseksi? "
"(k/E) "
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2616,11 +2682,11 @@ msgstr ""
"Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
"on vanhentunut.\n"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Haluatko tehdä uuden allekirjoituksen korvaamaan vanhentuneen? (k/E) "
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2629,55 +2695,55 @@ msgstr ""
"Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
"on paikallinen allekirjoitus.\n"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
"Haluatko vahventaa sen täysin vientikelpoiseksi allekirjoitukseksi? (k/E) "
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" on jo allekirjoitettu paikallisesti avaimella %08lX\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" on jo allekirjoitettu avaimella %08lX\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Haluatko allekirjoittaa uudelleen joka tapauksessa? (k/E) "
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "Tämä avain on vanhentunut!"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Avain vanhenee %s.\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Haluatko allekirjoituksesi vanhenevan samaan aikaan? (K/e) "
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
msgstr ""
"Et voi luoda OpenPGP-allekirjoitusta PGP 2.x -avaimella --pgp2-tilassa.\n"
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "Tämä tekisi avaimesta käyttökelvottoman PGP 2.x:lle.\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2686,31 +2752,31 @@ msgstr ""
"Kuinka huolellisesti olet vahvistanut avaimen haltijan henkilöllisyyden?\n"
"Jos et tiedä vastausta, syötä \"0\".\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) En vastaa.%s\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) En ole tarkistanut lainkaan.%s\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Olen suorittanut arkisen tarkistuksen.%s\n"
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Olen suorittanut huolellisen tarkistuksen.%s\n"
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr "Valintasi? (syöttämällä \"?\" saat lisätietoja): "
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2718,7 +2784,7 @@ msgstr ""
"Haluatko varmasti allekirjoittaa tämän avaimen\n"
"omalla avaimellasi: \""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2726,7 +2792,7 @@ msgstr ""
"\n"
"Tämä tulee olemaan oma-allekirjoitus.\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2734,7 +2800,7 @@ msgstr ""
"\n"
"VAROITUS: Tätä allekirjoitusta ei määritellä vientikelvottomaksi.\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2742,7 +2808,7 @@ msgstr ""
"\n"
"VAROITUS: Tätä allekirjoitusta ei määritellä mitätöimättömäksi.\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2750,7 +2816,7 @@ msgstr ""
"\n"
"Tämä allekirjoitus määritellään vientikelvottomaksi.\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2758,7 +2824,7 @@ msgstr ""
"\n"
"Tämä allekirjoitus määritellään mitätöimättömäksi.\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2766,7 +2832,7 @@ msgstr ""
"\n"
"En ole tarkistanut tätä avainta lainkaan.\n"
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2774,7 +2840,7 @@ msgstr ""
"\n"
"Olen tarkistanut avaimen arkisesti.\n"
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2782,34 +2848,34 @@ msgstr ""
"\n"
"Olen tarkistanut avaimen erittäin huolellisesti.\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "Varmastiko allekirjoita? "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "allekirjoitus epäonnistui: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "Avainta ei ole suojattu.\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "Avain on suojattu.\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Ei voi muokata avainta: %s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2817,7 +2883,7 @@ msgstr ""
"Syötä uusi salasana salaiselle avaimelle.\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2825,544 +2891,566 @@ msgstr ""
"Et halua salasanaa - tämä on todennäköisesti *huono* ajatus!\n"
"\n"
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "Haluatko varmasti tehdä tämän? "
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "siirretään avaimen allekirjoitus oikealle paikalle\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "ulos tästä valikosta"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "q"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "tallenna"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "tallenna ja lopeta"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "apua"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "näytä tämä ohje"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "näytä sormenjälki"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "list"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "näytä avaimet ja käyttäjätunnukset"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "valitse käyttäjätunnus N"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "key"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "valitse toissijainen avain N"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "check"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "näytä allekirjoitukset"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "c"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "allekirjoita avain"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "s"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "tsign"
msgstr "sign"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "make a trust signature"
msgstr "tee erillinen allekirjoitus"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "allekirjoita avain paikallisesti"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr "allekirjoita avain mitätöimättömästi"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "sign the key locally and non-revocably"
msgstr "allekirjoita avain paikallisesti ja mitätöimättömästi"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "lisää käyttäjätunnus"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr "addphoto"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr "lisää valokuva"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "poista käyttäjätunnus"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr "delphoto"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "lisää toissijainen avain"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+#, fuzzy
+msgid "addcardkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "poista toissijainen avain"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "addrevoker"
msgstr "addrevoker"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "add a revocation key"
msgstr "lisää mitätöintiavain"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "poista allekirjoitus"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "muuta voimassoloaikaa"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr "primary"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr "merkitse käyttäjätunnus ensisijaiseksi"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "vaihda salaisten ja julkisten avainten luettelon välillä"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "t"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr "näytä valinnat (asiantuntija)"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr "näytä valinnat (monisanaisesti)"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr "näytä valinnat"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr "päivitä valinnat"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "keyserver"
msgstr "avainpalvelinvirhe"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "set preferred keyserver URL"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "muuta salasanaa"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "muuta luottamusastetta"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "mitätöi allekirjoitus"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revuid"
msgstr "revuid"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revoke a user ID"
msgstr "mitätöi käyttäjätunnus"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "mitätöi toissijainen avain"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "poista avain käytöstä"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "ota avain käyttöön"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr "showphoto"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr "näytä valokuvatunniste"
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "tätä ei voi tehdä eräajossa\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "virhe luettaessa salaista avainlohkoa \"%s\": %s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "Salainen avain on saatavilla.\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "Komento> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "Tähän tarvitaan salainen avain.\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr "Käytä ensin komentoa \"toggle\".\n"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
msgid "Key is revoked."
msgstr "Avain on mitätöity."
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "Sinun täytyy valita ainakin yksi käyttäjätunnus.\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "Varmastiko poista kaikki valitut käyttäjätunnukset? "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "Varmastiko poista tämä käyttäjätunnus? "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+#, fuzzy
+msgid "Really move the primary key? "
+msgstr "Varmastiko poista tämä käyttäjätunnus? "
+
+#: g10/keyedit.c:1598
+#, fuzzy
+msgid "You must select exactly one key.\n"
+msgstr "Sinun täytyy valita ainakin yksi avain.\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "Sinun täytyy valita ainakin yksi avain.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "Haluatko varmasti poistaa valitut avaimet? "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "Haluatko varmasti poistaa tämän avaimen? "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
msgid "Really revoke all selected user IDs? "
msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
msgid "Really revoke this user ID? "
msgstr "Varmastiko mitätöi tämä käyttäjätunnus? "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "Haluatko varmasti mitätöidä valitut avaimet? "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
#, fuzzy
msgid "Set preference list to:\n"
msgstr "näytä valinnat"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr "Varmastiko päivitä valinnat? "
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "Tallenna muutokset? "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "Lopeta tallentamatta muutoksia?"
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "salaisen päivitys epäonnistui: %s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr "Tiiviste: "
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr "Ominaisuudet: "
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keyedit.c:2219
#, c-format
msgid "This key may be revoked by %s key "
msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr " (luottamuksellinen)"
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "ei voida luoda kohdetta %s: %s\n"
-#: g10/keyedit.c:2084
-#, fuzzy, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
msgstr "[mitätöity] "
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
-msgstr " [vanhenee: %s]"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
+msgstr "expire"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2246
#, fuzzy, c-format
-msgid "expires: %s"
-msgstr " [vanhenee: %s]"
+msgid "usage: %s"
+msgstr " luottamus: %c/%c"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, fuzzy, c-format
msgid "trust: %s"
msgstr " luottamus: %c/%c"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "Tämä avain on poistettu käytöstä"
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! aliavain on mitätöity: %s\n"
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
-msgstr "rev- väärennetty mitätöinti löydetty\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? mitätöinnin tarkistuksessa ongelmia: %s\n"
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-#, fuzzy
-msgid "revoked"
-msgstr "[mitätöity] "
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-#, fuzzy
-msgid "expired"
-msgstr "expire"
+#: g10/keyedit.c:2300
+msgid "card-no: "
+msgstr ""
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x -muodon käyttäjätunnukselle ei ole valintoja.\n"
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3370,15 +3458,7 @@ msgstr ""
"Huomioi, että tässä näytetty voimassaolo ei ole välttämättä\n"
"ajan tasalla jollet käynnistä ohjelmaa uudelleen\n"
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-msgid "[revoked] "
-msgstr "[mitätöity] "
-
-#: g10/keyedit.c:2274
-msgid "[expired] "
-msgstr "[vanhentunut] "
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@ -3386,7 +3466,7 @@ msgstr ""
"VAROITUS: mitään käyttäjätunnusta ei ole merkitty ensisijaiseksi. Tämän \n"
"komennon johdosta eri käyttäjätunnus voi tulla oletetuksi ensisijaiseksi.\n"
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3395,45 +3475,45 @@ msgstr ""
"VAROITUS: Tämä on PGP2-muodon avain. Valokuvan lisääminen voi\n"
" saada jotkin PGP:n versiot hylkäämään avaimen.\n"
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Et voi lisätä valokuvaa PGP2-muodon avaimeen.\n"
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d allekirjoitus poistettu.\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d allekirjoitusta poistettu.\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "Mitään ei poistettu.\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3443,89 +3523,99 @@ msgstr ""
"voi\n"
" saada jotkin PGP:n versiot hylkäämään avaimen.\n"
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Et voi lisätä määrättyä mitätöijää PGP 2.x -muodon avaimeen.\n"
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
msgid "Enter the user ID of the designated revoker: "
msgstr "Syötä määrätyn mitätöijän käyttäjätunnus: "
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "PGP 2.x -avainta ei voi nimetä määrätyksi mitätöijäksi\n"
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "et voi nimittää avainta sen omaksi määrätyksi mitätöijäksi\n"
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "VAROITUS: avaimen nimittämistä määrätyksi mitätöijäksi ei voi perua!\n"
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr ""
"Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "Poista salaisten avainten valinnat, kiitos.\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
msgid "Please select exactly one user ID.\n"
msgstr "Valitse tasan yksi käyttäjätunnus!\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
-#, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "ohitetaan v3-muodon oma-allekirjoitus käyttäjätunnukselle \"%s\"\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+#, fuzzy
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "Haluatko varmasti käyttää sitä (k/E)? "
+
+#: g10/keyedit.c:3480
+#, fuzzy
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "Haluatko varmasti käyttää sitä (k/E)? "
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Indeksillä %d ei löydy toissijaista avainta\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "käyttäjätunnus: \""
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3534,7 +3624,7 @@ msgstr ""
"\"\n"
"allekirjoitettu avaimellasi %08lX %s\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3543,146 +3633,130 @@ msgstr ""
"\"\n"
"allekirjoitettu paikallisesti avaimellasi %08lX %s\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Tämä allekirjoitus vanheni %s.\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid " signed by %s on %s%s%s\n"
msgstr " %08lX allekirjoitti tämän %s%s%s\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid " revoked by %s on %s\n"
msgstr " %08lX mitätöi tämän %s\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, fuzzy, c-format
msgid " signed by %s on %s%s\n"
msgstr " %08lX allekirjoitti tämän %s%s\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr " (vientiin kelpaamaton)"
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
msgid "Really create the revocation certificates? (y/N) "
msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "salainen avain ei ole saatavilla\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"VAROITUS: käyttäjätunnuksen allekirjoitus on päivätty %d sekuntin päähän "
"tulevaisuuteen\n"
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Näytetään valokuva %s, kokoa %ld avaimelle 0x%08lX\n"
"(käyttäjätunnus %d)\n"
-#: g10/keylist.c:179
+#: g10/keylist.c:180
msgid "Critical signature policy: "
msgstr "Kriittinen allekirjoituskäytäntö: "
-#: g10/keylist.c:181
+#: g10/keylist.c:182
msgid "Signature policy: "
msgstr "Allekirjoituskäytäntö: "
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "VAROITUS: löydettiin väärin muotoiltua notaatiodataa\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
msgid "Critical signature notation: "
msgstr "Kriittinen allekirjoitusnotaatio: "
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr "Allekirjoitusnotaatio: "
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr "ei ihmisten luettavissa"
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr "Avainrengas"
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr " [vanhenee: %s]"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr " [vanhenee: %s]"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, fuzzy, c-format
-msgid " [revoked: %s]"
-msgstr "[mitätöity] "
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
msgid "Primary key fingerprint:"
msgstr "Ensisijaisen avaimen sormenjälki:"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
msgid " Subkey fingerprint:"
msgstr " Aliavaimen sormenjälki:"
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
msgid " Primary key fingerprint:"
msgstr " Ensisijaisen avaimen sormenjälki:"
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
msgid " Subkey fingerprint:"
msgstr " Aliavaimen sormenjälki:"
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr " Avaimen sormenjälki ="
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3893,79 +3967,79 @@ msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "epäkelpo juuripaketti havaittu proc_tree():ssä\n"
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "core-tiedostojen luontia ei voi estää: %s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "Kokeellisia algoritmeja ei pitäisi käyttää!\n"
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"tämän salausalgoritmin käyttöä paheksutaan; ole hyvä ja käytä "
"standardimpaa!\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr "IDEA-salaimen liitännäinen ei käytettävissä\n"
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr "lue lisätietoja osoitteesta http://www.gnupg.org/why-not-idea.html\n"
-#: g10/misc.c:491
+#: g10/misc.c:517
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: paheksuttava valitsin \"%s\"\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "käytä valitsinta \"%s%s\" sen sijaan\n"
-#: g10/misc.c:508
+#: g10/misc.c:534
msgid "Uncompressed"
msgstr "pakkaamaton"
-#: g10/misc.c:533
+#: g10/misc.c:559
#, fuzzy
msgid "uncompressed|none"
msgstr "pakkaamaton"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "%s ei kenties voi käsitellä tätä viestiä\n"
-#: g10/misc.c:777
+#: g10/misc.c:826
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "luetaan asetukset tiedostosta \"%s\"\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
@@ -4004,7 +4078,7 @@ msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "gpg-agentin kanssa yhteysongelma\n"
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr "agentin käytössä on ongelmia - agenttia ei käytetä\n"
@@ -4040,24 +4114,24 @@ msgstr "salasana on liian pitkä\n"
msgid "invalid response from agent\n"
msgstr "agentin lähettämä vastaus ei kelpaa\n"
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "käyttäjän peruma\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "salasanan kysyminen ei onnistu eräajossa\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "Syötä salasana: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4066,22 +4140,22 @@ msgstr ""
"\n"
"Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle: \""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (pääavaimen tunnus %08lX)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "Toista salasana: "
@@ -4309,28 +4383,39 @@ msgstr ""
"voit tehdä erillisiä allekirjoituksia PGP 2.x -muodon avaimilla \n"
"vain --pgp2-tilassa\n"
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
-msgstr "ei voida luoda kohdetta %s: %s\n"
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
+msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
-#: g10/sign.c:794
-#, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+#: g10/sign.c:771 g10/sign.c:1008
+#, fuzzy, c-format
+msgid "writing to file `%s'\n"
+msgstr "kirjoitetaan kohteeseen \"%s\"\n"
+
+#: g10/sign.c:795
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr "allekirjoitetaan:"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "ei voi avata tiedostoa: %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
"PGP 2.x -muodon avaimilla voi allekirjoittaa tekstimuotoon \n"
"vain --pgp2-tilassa\n"
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr "käytetään %s-salausta\n"
@@ -4732,7 +4817,7 @@ msgstr ""
"heikon avaimen luomista symmetriselle salaimelle ei voitu välttää; \n"
"yritettiin %d kertaa!\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA vaatii 160-bittisen tiivistealgoritmin käyttöä\n"
@@ -5101,17 +5186,17 @@ msgstr "Ei ohjeita saatavilla"
msgid "No help available for `%s'"
msgstr "Ei ohjetta aiheesta \"%s\""
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr "avainrengas \"%s\" luotu\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
@@ -5154,8 +5239,7 @@ msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
msgid "%s: keyring created\n"
msgstr "%s: avainrengas luotu\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5170,29 +5254,34 @@ msgstr ""
"käytät erittäin suurta kuvaa, myös avaimesta tulee erittäin suuri!\n"
"Kuvan koon ollessa suunnilleen 240x288, on koko sopiva käyttöön.\n"
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr "Syötä JPEG-tiedostonimi valokuvatunnisteelle: "
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "Valokuvaa \"%s\" ei voi avata: %s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
msgid "Are you sure you want to use it (y/N)? "
msgstr "Haluatko varmasti käyttää sitä (k/E)? "
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr "\"%s\" ei ole JPEG-tiedosto\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Is this photo correct (y/N/q)? "
msgstr "Onko tämä oikein (k/E/l)? "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
msgid "unable to display photo ID!\n"
msgstr "valokuvatunnistetta ei voi näyttää!\n"
@@ -5213,44 +5302,50 @@ msgstr ""
"asetustiedoston oikeuksista\n"
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
+#, fuzzy
+msgid "this platform requires temporary files when calling external programs\n"
msgstr ""
"tämä ympäristö vaatii väliaikaistiedoston kutsuttaessa ulkoisia ohjelmia\n"
-#: g10/exec.c:432
-#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
msgstr "komentoa %s \"%s\" ei voi suorittaa: %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:436
+#, fuzzy, c-format
+msgid "unable to execute shell `%s': %s\n"
+msgstr "komentoa %s \"%s\" ei voi suorittaa: %s\n"
+
+#: g10/exec.c:515
#, c-format
msgid "system error while calling external program: %s\n"
msgstr "järjestelmävirhe kutsuttaessa ulkoista ohjelmaa: %s\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr "ulkoisen ohjelman luonnoton päättyminen\n"
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr "ulkoista ohjelmaa ei voi suorittaa\n"
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr "ulkoisen ohjelman vastausta ei voi lukea: %s\n"
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "VAROITUS: väliaikaishakemistoa \"%s\" ei voi poistaa: %s\n"
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr "ei koskaan"
@@ -5407,6 +5502,47 @@ msgstr "virhe etsittäessä luottamustietuetta: %s\n"
msgid "read error: %s\n"
msgstr "lukuvirhe: %s\n"
+#, fuzzy
+#~ msgid "revoked: %s"
+#~ msgstr "[mitätöity] "
+
+#, fuzzy
+#~ msgid "expired: %s"
+#~ msgstr " [vanhenee: %s]"
+
+#, fuzzy
+#~ msgid "expires: %s"
+#~ msgstr " [vanhenee: %s]"
+
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "rev! aliavain on mitätöity: %s\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "rev- väärennetty mitätöinti löydetty\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "rev? mitätöinnin tarkistuksessa ongelmia: %s\n"
+
+#~ msgid "[revoked] "
+#~ msgstr "[mitätöity] "
+
+#~ msgid "[expired] "
+#~ msgstr "[vanhentunut] "
+
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr " [vanhenee: %s]"
+
+#~ msgid " [expires: %s]"
+#~ msgstr " [vanhenee: %s]"
+
+#, fuzzy
+#~ msgid " [revoked: %s]"
+#~ msgstr "[mitätöity] "
+
+#~ msgid "can't create %s: %s\n"
+#~ msgstr "ei voida luoda kohdetta %s: %s\n"
+
#~ msgid ""
#~ "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n"
#~ msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 3abfbf72d..d2541ce70 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.5\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
"PO-Revision-Date: 2004-06-16 20:20+0200\n"
"Last-Translator: Ga�l Qu�ri <[email protected]>\n"
"Language-Team: French <[email protected]>\n"
@@ -53,7 +53,7 @@ msgstr "non"
msgid "nN"
msgstr "nN"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "quitter"
@@ -286,6 +286,16 @@ msgstr "cl� secr�te inutilisable"
msgid "keyserver error"
msgstr "erreur du serveur de cl�s"
+#: util/errors.c:108
+#, fuzzy
+msgid "canceled"
+msgstr "Annuler"
+
+#: util/errors.c:109
+#, fuzzy
+msgid "no card"
+msgstr "non chiffr�"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr ""
@@ -308,7 +318,7 @@ msgstr "vous avez trouv� un bug... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "aucun module de r�cup�ration d'entropie n'a �t� trouv�.\n"
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "impossible d'ouvrir `%s': %s\n"
@@ -342,7 +352,7 @@ msgstr "impossible de lire `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "note: le fichier `random_seed' n'a pas �t� mis � jour\n"
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr "impossible de cr�er `%s': %s\n"
@@ -414,7 +424,7 @@ msgstr "impossible de g�n�rer un nombre premier avec moins de %d bits\n"
msgid "can't generate a prime with less than %d bits\n"
msgstr "impossible de g�n�rer un nombre premier avec moins de %d bits\n"
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -422,128 +432,128 @@ msgstr ""
"@Commandes:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[fichier]|faire une signature"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[fichier]|faire une signature en texte clair"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "faire une signature d�tach�e"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "chiffrer les donn�es"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "chiffrement sym�trique seulement"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "d�chiffrer les donn�es (d�faut)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "v�rifier une signature"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "lister les cl�s"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "lister les cl�s et les signatures"
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "v�rifier les signatures des cl�s"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "lister les cl�s et les empreintes"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "lister les cl�s secr�tes"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "g�n�rer une nouvelle paire de cl�s"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "enlever les cl�s du porte-cl�s public"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "enlever les cl�s du porte-cl�s secret"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "signer une cl�"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "signer une cl� localement"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "signer ou �diter une cl�"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "g�n�rer un certificat de r�vocation"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "exporter les cl�s"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "exporter les cl�s vers un serveur de cl�s"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "importer les cl�s d'un serveur de cl�s"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "chercher les cl�s avec un serveur de cl�s"
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "mettre � jour les cl�s depuis un serveur"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "importer/fusionner les cl�s"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "mettre la base de confiance � jour"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -553,55 +563,51 @@ msgstr ""
"Options:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "cr�er une sortie ascii avec armure"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|NOM|chiffrer pour NOM"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr "utiliser ce nom pour signer ou d�chiffrer"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr "|N|niveau de compression N (0 d�sactive)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "utiliser le mode texte canonique"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "utiliser comme fichier de sortie"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "bavard"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "ne rien changer"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "demander avant d'�craser un fichier"
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -609,7 +615,7 @@ msgstr ""
"@\n"
"(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -629,17 +635,17 @@ msgstr ""
" --list-keys [utilisateur] montrer les cl�s\n"
" --fingerprint [utilisateur] montrer les empreintes\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Signaler toutes anomalies � <[email protected]> (en anglais)\n"
"et tout probl�me de traduction � <[email protected]>.\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -649,7 +655,7 @@ msgstr ""
"signer, v�rifier, chiffrer ou d�chiffrer\n"
"l'op�ration par d�faut d�pend des donn�es entr�es\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -657,493 +663,487 @@ msgstr ""
"\n"
"Algorithmes support�s:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr "Cl� publique: "
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr "Chiffrement: "
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr "Hachage: "
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
msgid "Compression: "
msgstr "Compression: "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "utilisation: gpg [options] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "commandes en conflit\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "no = signature trouv�e dans la d�finition du groupe \"%s\"\n"
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "AVERTISSEMENT: propri�taire de %s \"%s\" peu s�r\n"
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "AVERTISSEMENT: propri�taire de %s \"%s\" peu s�r\n"
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "AVERTISSEMENT: propri�taire de %s \"%s\" peu s�r\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "AVERTISSEMENT: permissions de %s \"%s\" peu s�res\n"
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "AVERTISSEMENT: permissions de %s \"%s\" peu s�res\n"
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "AVERTISSEMENT: permissions de %s \"%s\" peu s�res\n"
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
"s�r pour %s \"%s\"\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr ""
"AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
"s�r pour %s \"%s\"\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
"AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
"s�r pour %s \"%s\"\n"
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"AVERTISSEMENT: les permissions du r�pertoire contenant %s \"%s\"\n"
"sont peu s�res\n"
-#: g10/g10.c:1205
+#: g10/g10.c:1210
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr ""
"AVERTISSEMENT: les permissions du r�pertoire contenant %s \"%s\"\n"
"sont peu s�res\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
"AVERTISSEMENT: les permissions du r�pertoire contenant %s \"%s\"\n"
"sont peu s�res\n"
-#: g10/g10.c:1334
-#, c-format
-msgid "unknown configuration item \"%s\"\n"
+#: g10/g10.c:1354
+#, fuzzy, c-format
+msgid "unknown configuration item `%s'\n"
msgstr "�l�ment de configuration \"%s\" inconnu\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTE: l'ancien fichier d'options par d�faut `%s' a �t� ignor�\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTE: pas de fichier d'options par d�faut `%s'\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "fichier d'options `%s': %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "lire les options de `%s'\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
-#: g10/g10.c:1887
-#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+#: g10/g10.c:2021
+#, fuzzy, c-format
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr ""
"l'extension de chiffrement \"%s\" n'a pas �t� charg�e car ses\n"
"permissions sont peu s�res\n"
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "%s n'est pas une table de caract�res valide\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "impossible d'interpr�ter l'URI du serveur de cl�s\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: options d'export invalides\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "options d'export invalides\n"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: options d'import invalides\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
msgid "invalid import options\n"
msgstr "options d'import invalides\n"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: options d'export invalides\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
msgid "invalid export options\n"
msgstr "options d'export invalides\n"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: options d'import invalides\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "options d'import invalides\n"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: options d'export invalides\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "options d'export invalides\n"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "impossible de mettre le chemin d'ex�cution � %s\n"
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ATTENTION: %s remplace %s\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n'est pas permis avec %s !\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n'a aucun sens avec %s !\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"il n'est possible de faire une signature d�tach�e ou en texte clair\n"
"qu'en mode --pgp2\n"
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "vous ne pouvez pas signer et chiffrer en m�me temps en mode --pgp2\n"
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"vous devez utiliser des fichiers (et pas un tube) lorsque --pgp2\n"
"est activ�.\n"
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
"chiffrer un message en mode --pgp2 n�cessite l'algorithme de chiffrage IDEA\n"
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "la fonction de hachage s�lectionn�e est invalide\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
msgid "selected certification digest algorithm is invalid\n"
msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "�max-cert-depth� doit �tre compris entre 1 et 255\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "default-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "min-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTE: le mode S2K simple (0) est fortement d�conseill�\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "mode S2K invalide; ce doit �tre 0, 1 ou 3\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
msgid "invalid default preferences\n"
msgstr "pr�f�rences par d�faut invalides\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
msgid "invalid personal cipher preferences\n"
msgstr "pr�f�rences de chiffrement personnelles invalides\n"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
msgid "invalid personal digest preferences\n"
msgstr "pr�f�rences de hachage personnelles invalides\n"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
msgid "invalid personal compress preferences\n"
msgstr "pr�f�rences de compression personnelles invalides\n"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ne marche pas encore avec %s\n"
-#: g10/g10.c:2680
-#, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2797
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr ""
"vous ne pouvez pas utiliser l'algorithme de chiffrement \"%s\"\n"
"en mode %s.\n"
-#: g10/g10.c:2685
-#, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2802
+#, fuzzy, c-format
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr ""
"vous ne pouvez pas utiliser l'algorithme de hachage \"%s\"\n"
"en mode %s.\n"
-#: g10/g10.c:2690
-#, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2807
+#, fuzzy, c-format
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr ""
"vous ne pouvez pas utiliser l'algorithme de compression \"%s\"\n"
"en mode %s.\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "impossible d'initialiser la base de confiance: %s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"AVERTISSEMENT: des r�cipients (-r) ont donn�s alors que le chiffrement\n"
"ne se fait pas par cl� publique\n"
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [nom du fichier]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [nom du fichier]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [nom du fichier]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nom du fichier]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "vous ne pouvez pas utiliser %s en mode %s.\n"
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [nom du fichier]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nom du fichier]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nom du fichier]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "vous ne pouvez pas utiliser %s en mode %s.\n"
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nom du fichier]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [nom du fichier]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [nom du fichier]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key utilisateur"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key utilisateur"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrsign-key utilisateur"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key utilisateur"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key utilisateur [commandes]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "impossible d'ouvrir %s: %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "la r�ception depuis le serveur de cl�s a �chou�: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, c-format
msgid "key export failed: %s\n"
msgstr "l'export de la cl� a �chou�: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "la recherche au sein du serveur de cl�s a �chou�: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "le rafra�chissement par le serveur de cl�s a �chou�: %s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "la suppression d'une armure a �chou�: %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "la construction d'une armure a �chou�: %s \n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algorithme de hachage `%s' invalide\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[nom du fichier]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "Vous pouvez taper votre message...\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "impossible d'ouvrir `%s'\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@ -1151,50 +1151,50 @@ msgstr ""
"le nom d'une notation ne doit comporter que des caract�res imprimables\n"
"ou des espaces, et se terminer par un signe '='\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
msgid "a user notation name must contain the '@' character\n"
msgstr "un nom de notation utilisateur doit contenir le caract�re '@'\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "une valeur de notation ne doit utiliser aucun caract�re de contr�le\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr "l'URL de politique de certification donn�e est invalide\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr "l'URL de politique de signature donn�e est invalide\n"
-#: g10/g10.c:3747
+#: g10/g10.c:3863
#, fuzzy
-msgid "the given signature preferred keyserver URL is invalid\n"
+msgid "the given preferred keyserver URL is invalid\n"
msgstr "l'URL de politique de signature donn�e est invalide\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "devenir beaucoup plus silencieux"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
msgid "take the keys from this keyring"
msgstr "enlever les cl�s de ce porte-cl�s"
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
msgid "make timestamp conflicts only a warning"
msgstr ""
"faire en sorte que les conflits d'horodatage ne soient qu'un\n"
"avertissement non fatal"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr "|FD|�crire l'�tat sur ce descripteur"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Utilisation: gpgv [options] [fichiers] (-h pour l'aide)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1228,12 +1228,13 @@ msgid "invalid dash escaped line: "
msgstr "ligne �chapp�e par `-' invalide: "
#: g10/armor.c:565
-msgid "unexpected armor:"
+#, fuzzy
+msgid "unexpected armor: "
msgstr "armure inattendue:"
-#: g10/armor.c:695 g10/armor.c:1276
-#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+#: g10/armor.c:695 g10/armor.c:1280
+#, fuzzy, c-format
+msgid "invalid radix64 character %02X skipped\n"
msgstr "caract�re %02x invalide en base 64 ignor�\n"
#: g10/armor.c:738
@@ -1244,33 +1245,34 @@ msgstr "fin de fichier pr�matur�e (pas de CRC)\n"
msgid "premature eof (in CRC)\n"
msgstr "fin de fichier pr�matur�e (dans le CRC)\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "CRC d�form�\n"
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "Erreur de CRC; %06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+#, fuzzy
+msgid "premature eof (in trailer)\n"
msgstr "fin de fichier pr�matur�e (dans la remorque)\n"
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "erreur dans la ligne de remorque\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "aucune donn�e OpenPGP valide n'a �t� trouv�e.\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "armure invalide: ligne plus longue que %d caract�res\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1326,7 +1328,7 @@ msgstr " alias \""
msgid " aka \""
msgstr " alias \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1581,99 +1583,119 @@ msgstr "%s: ignor�: la cl� publique est d�sactiv�e\n"
msgid "no valid addressees\n"
msgstr "pas de destinataire valide\n"
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "pr�f�rence %c%lu dupliqu�e\n"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "trop de pr�f�rences `%c'\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
#, fuzzy
msgid "too many digest preferences\n"
msgstr "trop de pr�f�rences `%c'\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
#, fuzzy
msgid "too many compression preferences\n"
msgstr "trop de pr�f�rences `%c'\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "Caract�re invalide dans la cha�ne de pr�f�rences\n"
# g10/keygen.c:123 ???
-#: g10/keygen.c:738
+#: g10/keygen.c:783
msgid "writing direct signature\n"
msgstr "�criture de la signature directe\n"
# g10/keygen.c:123 ???
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "�criture de l'auto-signature\n"
# g10/keygen.c:161 ???
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "�criture de la signature de liaison\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Taille invalide; utilisation de %u bits\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "taille arrondie � %u bits\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "S�lectionnez le type de cl� d�sir�:\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA et ElGamal (par d�faut)\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (signature seule)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (chiffrement seul)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (signature seule)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (chiffrement seul)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (signature et chiffrement)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, fuzzy, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) RSA (signature seule)\n"
+
+#: g10/keygen.c:1224
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) RSA (signature et chiffrement)\n"
+
+#: g10/keygen.c:1226
+#, fuzzy, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) RSA (chiffrement seul)\n"
+
+#: g10/keygen.c:1228
+#, fuzzy, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) RSA (signature et chiffrement)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "Votre choix ? "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "Choix invalide.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1686,28 +1708,28 @@ msgstr ""
" la taille par d�faut est 1024 bits\n"
" la taille maximale conseill�e est 2048 bits\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "Quelle taille de cl� d�sirez-vous ? (1024) "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
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:1241
+#: g10/keygen.c:1314
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"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
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:1255
+#: g10/keygen.c:1328
#, 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:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1715,11 +1737,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:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "Etes-vous s�r de vouloir cette taille ? "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1727,17 +1749,17 @@ 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:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "La taille demand�e est %u bits\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arrondie � %u bits\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1753,7 +1775,7 @@ msgstr ""
" <n>m = la cl� expire dans n mois\n"
" <n>y = la cl� expire dans n ann�es\n"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1769,29 +1791,29 @@ msgstr ""
" <n>m = la signature expire dans n mois\n"
" <n>y = la signature expire dans n ann�es\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "La cl� est valide pour ? (0) "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr "La signature est valide pour ? (0) "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "valeur invalide\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s n'expire pas du tout\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr "%s expire le %s\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1799,16 +1821,17 @@ 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:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "Est-ce correct (o/n) ? "
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
+#, fuzzy
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
@@ -1819,44 +1842,44 @@ msgstr ""
" � Heinrich Heine (Der Dichter) <[email protected]> �\n"
"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "Nom r�el: "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "Caract�re invalide dans le nom\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr "Le nom ne doit pas commencer par un chiffre\n"
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
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:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "Adresse e-mail: "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "Ce n'est pas une adresse e-mail valide\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "Commentaire: "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "Caract�re invalide dans le commentaire\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Vous utilisez le jeu de caract�res '%s'.\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1867,28 +1890,28 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
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:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
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:1542
+#: g10/keygen.c:1615
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:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr "Corrigez l'erreur d'abord\n"
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1896,16 +1919,16 @@ msgstr ""
"Vous avez besoin d'un mot de passe pour prot�ger votre cl� secr�te.\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr "le mot de passe n'a pas �t� correctement r�p�t� ; recommencez."
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1917,7 +1940,7 @@ msgstr ""
"le d�sirez, en utilisant ce programme avec l'option � --edit-key �.\n"
"\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1929,60 +1952,60 @@ 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:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr "d�sol�, impossible de faire cela en mode automatique\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "La paire de cl�s DSA fera 1024 bits.\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "La g�n�ration de cl� a �t� annul�e.\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr "�criture de la cl� publique vers `%s'\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "�criture de la cl� secr�te vers `%s'\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "�criture de la cl� secr�te vers `%s'\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr ""
"aucun portes-cl�s public n'a �t� trouv� avec des droits d'�criture : %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr ""
"aucun portes-cl�s secret n'a �t� trouv� avec des droits d'�criture : %s\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "erreur durant l'�criture du porte-cl�s public `%s': %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "erreur durant l'�criture du porte-cl�s secret `%s': %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
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:2630
+#: g10/keygen.c:2809
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"
@@ -1991,13 +2014,13 @@ msgstr ""
"utiliser la commande �--edit-key� pour g�n�rer une cl� secondaire �\n"
"cette fin.\n"
-#: g10/keygen.c:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, 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:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -2005,7 +2028,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:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -2013,15 +2036,44 @@ 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:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"NOTE: cr�er des sous-cl�s pour des cl�s v3 n'est pas conforme � OpenPGP\n"
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "Cr�er vraiment ? "
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "la suppression du bloc de cl�s a �chou� : %s\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "impossible de cr�er `%s': %s\n"
+
+#: g10/keygen.c:3248
+#, fuzzy, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "NOTE: la cl� secr�te %08lX a expir� le %s\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "--output n'est pas compatible avec cette commande\n"
@@ -2032,7 +2084,7 @@ msgstr "--output n'est pas compatible avec cette commande\n"
msgid "%s: can't open: %s\n"
msgstr "%s: impossible d'ouvrir: %s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "erreur pendant la cr�ation du mot de passe: %s\n"
@@ -2063,6 +2115,11 @@ msgstr ""
"le chiffrement RSA ne se fait qu'avec des cl�s de moins de 2048 bits\n"
"en mode --pgp2\n"
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "impossible d'ouvrir %s: %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -2075,26 +2132,36 @@ msgstr ""
"impossible d'utiliser le chiffre IDEA pour toutes les cl�s vers\n"
"lesquelles vous chiffrez.\n"
-#: g10/encode.c:526 g10/encode.c:721
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#: g10/encode.c:526
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forcer le chiffrement sym�trique %s (%d) entre en d�saccord\n"
"avec les pr�ferences du r�cipient\n"
-#: g10/encode.c:634 g10/sign.c:863
-#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+#: g10/encode.c:634 g10/sign.c:864
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
msgstr ""
"forcer l'algorithme de compression %s (%d) entre en d�saccord\n"
"avec les pr�f�rences du r�cipient\n"
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"forcer le chiffrement sym�trique %s (%d) entre en d�saccord\n"
+"avec les pr�ferences du r�cipient\n"
+
#: g10/encode.c:818
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s chiffr� pour: \"%s\"\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "cl� '%s' introuvable: %s\n"
@@ -2129,8 +2196,9 @@ msgstr "ATTENTION: rien n'a �t� export�\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "trop d'entr�es dans le cache pk - d�sactiv�\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+#, fuzzy
+msgid "[User ID not found]"
msgstr "[Nom utilisateur introuvable]"
#: g10/getkey.c:1614
@@ -2286,7 +2354,7 @@ msgstr "cl� %08lX: corruption de sous-cl� HKP r�par�e\n"
#: g10/import.c:722
#, fuzzy, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "cl� %08lX: nom d'utilisateur non auto-sign� accept� '%s':\n"
#: g10/import.c:728
@@ -2313,7 +2381,7 @@ msgstr "cl� %08lX: nouvelle cl� - ignor�e\n"
msgid "no writable keyring found: %s\n"
msgstr "aucun porte-cl� n'a �t� trouv� avec des droits d'�criture : %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "�criture de `%s'\n"
@@ -2429,14 +2497,14 @@ msgstr "cl� %08lX: pas d'utilisateur pour la signature\n"
#: g10/import.c:1299
#, fuzzy, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"cl� %08lX: algorithme de cl� publique non support� avec le nom\n"
"d'utilisateur \"%s\"\n"
#: g10/import.c:1301
#, fuzzy, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "cl� %08lX: auto-signature du nom d'utilisateur \"%s\" invalide\n"
#: g10/import.c:1319
@@ -2476,7 +2544,7 @@ msgstr "cl� %08lX: suppression de la r�vocation de sous-cl� multiples\n"
#: g10/import.c:1439
#, fuzzy, c-format
-msgid "key %s: skipped user ID '%s'\n"
+msgid "key %s: skipped user ID \"%s\"\n"
msgstr "cl� %08lX: utilisateur non pris en compte: '"
#: g10/import.c:1460
@@ -2486,7 +2554,7 @@ msgstr "cl� %08lX: sous-cl� non prise en compte\n"
#: g10/import.c:1487
#, fuzzy, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "cl� %08lX: signature non exportable (classe %02x) - ignor�e\n"
#: g10/import.c:1497
@@ -2521,114 +2589,114 @@ msgstr ""
"AVERTISSEMENT: la cl� %08lX est peut-�tre r�voqu�e: recherche de la cl� de\n"
"r�vocation %08lX\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"AVERTISSEMENT: la cl� %08lX est peut-�tre r�voqu�e: la cl� de r�vocation\n"
"%08lX est absente.\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "cl�: %08lX: \"%s\" certificat de r�vocation ajout�\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "cl� %08lX: ajout de la signature de cl� directe\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[r�vocation]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[auto-signature]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "une mauvaise signature\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d mauvaises signatures\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "une signature non v�rifi�e � cause d'une cl� manquante\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d signatures non v�rifi�es � cause de cl�s manquantes\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "une signature non v�rifi�e � cause d'une erreur\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d signatures non v�rifi�es � cause d'erreurs\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "un nom d'utilisateur sans auto-signature valide d�tect�\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "%d nom d'utilisateurs sans auto-signature valide d�tect�\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, fuzzy, c-format
msgid " (%d) I trust marginally\n"
msgstr " %d = je crois marginalement\n"
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, fuzzy, c-format
msgid " (%d) I trust fully\n"
msgstr " %d = je fais enti�rement confiance\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Le nom d'utilisateur \"%s\" est r�voqu�."
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Etes-vous s�r de toujours vouloir le signer ? (o/N) "
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr " Impossible de signer.\n"
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Le nom d'utilisateur \"%s\" est expir�."
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Le nom d'utilisateur \"%s\" ne comporte pas d'auto-signature."
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2637,11 +2705,11 @@ msgstr ""
"L'auto-signature de \"%s\"\n"
"est de style PGP 2.x.\n"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Voulez vous la changer en une auto-signature OpenPGP ? (o/N) "
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2650,13 +2718,13 @@ msgstr ""
"Votre signature actuelle de \"%s\"\n"
"a expir�.\n"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Voulez-vous cr�er une nouvelle signature pour remplacer celle qui a\n"
"expir� ? (o/N) "
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2665,43 +2733,43 @@ msgstr ""
"Votre signature actuelle de \"%s\"\n"
"est locale.\n"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Voulez vous la rendre compl�tement exportable ? (o/N) "
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" a d�j� �t� sign� localement par la cl� %08lX\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" a d�j� �t� sign� localement par la cl� %08lX\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Voulez-vous vraiment le signer encore une fois ? (o/N) "
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Rien � signer avec la cl� %08lX\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "Cette cl� a expir� !"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Cette cl� va expirer le %s.\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Voulez-vous que votre signature expire en m�me temps ? (O/n) "
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
@@ -2709,11 +2777,11 @@ msgstr ""
"il n'est pas possible de g�n�rer une signature OpenPGP d'une cl� de style\n"
"PGP 2.x en mode --pgp2.\n"
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "Cela rendra la cl� inutilisable par PGP 2.x.\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2723,31 +2791,31 @@ msgstr ""
"appartient r�ellement � la personne sus-nomm�e ? Si vous ne savez\n"
"quoi r�pondre, entrez \"0\".\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Je ne r�pondrai pas.%s\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Je n'ai pas v�rifi� du tout.%s\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) J'ai un peu v�rifi�.%s\n"
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) J'ai v�rifi� tr�s soigneusement.%s\n"
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr "Votre s�lection ? (entrer '?' pour plus d'informations): "
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2755,7 +2823,7 @@ msgstr ""
"Etes-vous vraiment s�r(e) que vous voulez signer cette cl�\n"
"avec la v�tre: \""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2763,7 +2831,7 @@ msgstr ""
"\n"
"cela sera une auto-signature.\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2771,7 +2839,7 @@ msgstr ""
"\n"
"AVERTISSEMENT: la signature ne sera pas marqu�e comme non-exportable.\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2780,7 +2848,7 @@ msgstr ""
"AVERTISSEMENT: La signature ne sera pas marqu�e comme\n"
"non-r�vocable.\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2788,7 +2856,7 @@ msgstr ""
"\n"
"La signature sera marqu�e comme non-exportable.\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2796,7 +2864,7 @@ msgstr ""
"\n"
"La signature sera marqu�e comme non-r�vocable.\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2804,7 +2872,7 @@ msgstr ""
"\n"
"Je n'ai pas du tout v�rifi� cette cl�.\n"
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2812,7 +2880,7 @@ msgstr ""
"\n"
"J'ai un peu v�rifi� cette cl�.\n"
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2820,40 +2888,40 @@ msgstr ""
"\n"
"J'ai v�rifi� cette cl� avec grand soin.\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "Signer r�ellement ? "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "la signature a �chou�: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "Cette cl� n'est pas prot�g�e.\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr "Les parties secr�tes de la cl� principale ne sont pas disponibles.\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "La cl� est prot�g�e.\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Impossible d'�diter cette cl�: %s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
msgstr "Entrez le nouveau mot de passe pour cette cl� secr�te.\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2862,547 +2930,569 @@ msgstr ""
"*mauvaise* id�e\n"
"\n"
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "Voulez-vous vraiment faire cela ? "
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "replacer la signature d'une cl� � l'endroit correct\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "quitter ce menu"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "q"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "enregistrer"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "enregistrer et quitter"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "help"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "afficher cette aide"
# g10/keyedit.c:556 ???
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "afficher l'empreinte"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "lister"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "lister la cl� et les noms d'utilisateurs"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "s�lectionner le nom d'utilisateur N"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "cl�"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "s�lectionner la cl� secondaire N"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "v�rifier"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "lister les signatures"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "c"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "signer"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "signer la cl�"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "s"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "tsign"
msgstr "signer"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "make a trust signature"
msgstr "faire une signature d�tach�e"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "lsigner"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "signer la cl� localement"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr "nrsigner"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr "signer la cl� de fa�on non-r�vocable"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr "nrlsigner"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "sign the key locally and non-revocably"
msgstr "signer la cl� de fa�on locale et non-r�vocable"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "d�boguer"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "aj.ut"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "ajouter un utilisateur"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr "aj.photo"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr "ajouter une photo d'identit�"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "suppr.ut"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "enlever un utilisateur"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr "suppr.photo"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "aj.cl�"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "ajouter une cl� secondaire"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+#, fuzzy
+msgid "addcardkey"
+msgstr "aj.cl�"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "suppr.cl�"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "enlever une cl� secondaire"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "addrevoker"
msgstr "aj.rev"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "add a revocation key"
msgstr "ajouter une cl� de r�vocation"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "suppr.sign"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "supprimer les signatures"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "changer la date d'expiration"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr "principale"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr "marquer le nom d'utilisateur comme principal"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "changer"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "passer de la liste des cl�s secr�tes aux cl�s priv�es et inversement"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "t"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pr�f"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr "lister les pr�f�rences (expert)"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr "montr.pr�f"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr "lister les pr�f�rences (bavard)"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr "mettre.pr�f"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr "donner la liste de pr�f�rences"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr "pr�f.m�j"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr "pr�f�rences mises � jour"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "keyserver"
msgstr "erreur du serveur de cl�s"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "set preferred keyserver URL"
msgstr "impossible d'interpr�ter l'URI du serveur de cl�s\n"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "mot.pas"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "changer le mot de passe"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "confi."
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "changer la confiance"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "r�voquer les signatures"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revuid"
msgstr "revuid"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revoke a user ID"
msgstr "r�voquer un nom d'utilisateur"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "revcl�"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "r�voquer une cl� secondaire"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "d�sactiver"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "d�sactiver une cl�"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "activer"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "activer une cl�"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr "montr.photo"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr "montrer la photo d'identit�"
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "impossible de faire cela en mode automatique\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "erreur pendant la lecture du bloc de cl� secr�te `%s': %s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "La cl� secr�te est disponible.\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "Commande> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "Il faut la cl� secr�te pour faire cela.\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr "Utilisez la commande �toggle� d'abord.\n"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
msgid "Key is revoked."
msgstr "La cl� est r�voqu�e."
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "Signer vraiment tous les utilisateurs ? "
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "Aide: S�lectionner les utilisateurs � signer\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Cette commande n'est pas admise en mode %s.\n"
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "Enlever r�ellement tous les utilisateurs s�lectionn�s ? "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "Enlever r�ellement cet utilisateur ? "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+#, fuzzy
+msgid "Really move the primary key? "
+msgstr "Enlever r�ellement cet utilisateur ? "
+
+#: g10/keyedit.c:1598
+#, fuzzy
+msgid "You must select exactly one key.\n"
+msgstr "Vous devez s�lectionner au moins une cl�.\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "Vous devez s�lectionner au moins une cl�.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "Voulez-vous vraiment supprimer cette cl� ? "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
msgid "Really revoke all selected user IDs? "
msgstr "R�voquer r�ellement tous les noms d'utilisateurs s�lectionn�s ? "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
msgid "Really revoke this user ID? "
msgstr "R�voquer r�ellement ce nom d'utilisateur ? "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "Voulez-vous vraiment r�voquer les cl�s s�lectionn�es ? "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "Voulez-vous vraiment r�voquer cette cl� ? "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
#, fuzzy
msgid "Set preference list to:\n"
msgstr "donner la liste de pr�f�rences"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr "Enlever r�ellement les pr�f�rences des utilisateurs s�lectionn�s ? "
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr "Faut-il vraiment mettre � jour les pr�f�rences ? "
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "Enregistrer les changements? "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "Quitter sans enregistrer? "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "la mise � jour a �chou�: %s\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "La cl� n'a pas chang� donc la mise � jour est inutile.\n"
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "Commande invalide (essayez �help�)\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr "Hachage: "
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr "Fonctions: "
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keyedit.c:2219
#, c-format
msgid "This key may be revoked by %s key "
msgstr "Cette cl� peut �tre r�voqu�e par la cl� %s "
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr " (sensible)"
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "impossible de cr�er %s: %s\n"
-#: g10/keyedit.c:2084
-#, fuzzy, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
msgstr "[revoqu�e] "
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
-msgstr " [expire: %s]"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
+msgstr "expire"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2246
#, fuzzy, c-format
-msgid "expires: %s"
-msgstr " [expire: %s]"
+msgid "usage: %s"
+msgstr " confiance: %c/%c"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, fuzzy, c-format
msgid "trust: %s"
msgstr " confiance: %c/%c"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "Cette cl� a �t� d�sactiv�e"
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! la sous-cl� a �t� r�voqu�e: %s\n"
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
-msgstr "rev- une r�vocation truqu�e a �t� trouv�e\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? probl�me de v�rification de la r�vocation: %s\n"
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-#, fuzzy
-msgid "revoked"
-msgstr "[revoqu�e] "
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-#, fuzzy
-msgid "expired"
-msgstr "expire"
+#: g10/keyedit.c:2300
+msgid "card-no: "
+msgstr ""
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr ""
"Il n'y a pas de pr�f�rences dans un nom d'utilisateur du style de\n"
"PGP 2.x.\n"
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3410,15 +3500,7 @@ msgstr ""
"Notez que la validit� affich�e pour la cl� n'est pas n�cessairement\n"
"correcte tant que vous n'avez pas relanc� le programme.\n"
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-msgid "[revoked] "
-msgstr "[revoqu�e] "
-
-#: g10/keyedit.c:2274
-msgid "[expired] "
-msgstr "[expir�e] "
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@ -3427,7 +3509,7 @@ msgstr ""
"Cette commande risque de rendre un autre nom d'utilisateur principal\n"
"par d�faut.\n"
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3437,46 +3519,46 @@ msgstr ""
"d'identit� peut emp�cher certaines versions de PGP d'accepter\n"
"cette cl�\n"
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Etes-vous s�r de vouloir l'ajouter ? (y/N) "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr ""
"Vous ne pouvez pas ajouter de photo d'identit� � une cl� du style PGP2.\n"
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "Supprimer cette bonne signature ? (o/N/q)"
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Supprimer cette signature invalide ? (o/N/q)"
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Supprimer cette signature inconnue ? (o/N/q)"
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d signature supprim�e.\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d signatures supprim�es\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "Rien n'a �t� supprim�.\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3486,97 +3568,107 @@ msgstr ""
"d�sign� peut emp�cher certaines versions de PGP d'accepter\n"
"cette cl�.\n"
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"Vous ne pouvez pas ajouter de r�vocateur d�sign� � une cl� de style PGP2.\n"
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
msgid "Enter the user ID of the designated revoker: "
msgstr "Entrez le nom d'utilisateur du r�vocateur d�sign�: "
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"impossible d'utiliser une cl� de style PGP 2.x comme r�vocateur\n"
"d�sign�.\n"
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
"vous ne pouvez pas utiliser une cl� comme son propre r�vocateur\n"
"d�sign�\n"
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "AVERTISSEMENT: Cette cl� � �t� r�voqu�e par son r�vocateur d�sign� !\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"AVERTISSEMENT: l'�tablissement d'une cl� comme r�vocateur d�sign�\n"
"est irr�versible !\n"
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr ""
"Etes-vous s�r de vouloir �tablir cette cl� comme r�vocateur\n"
"d�sign� (o/N): "
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "Vous devez s�lectionner au plus une cl� secondaire.\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "Changer la date d'expiration d'une cl� secondaire.\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "Changer la date d'expiration de la cl� principale.\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Vous ne pouvez pas changer la date d'expiration d'une cl� v3\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
msgid "Please select exactly one user ID.\n"
msgstr "Vous devez s�lectionner exactement un utilisateur.\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
-#, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "l'auto-signature v3 du nom d'utilisateur \"%s\" a �t� ignor�e\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+#, fuzzy
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "Etes-vous s�r de vouloir l'utiliser ? (o/N) "
+
+#: g10/keyedit.c:3480
+#, fuzzy
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "Etes-vous s�r de vouloir l'utiliser ? (o/N) "
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "Pas d'utilisateur avec l'index %d\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Pas de cl� secondaire avec l'index %d\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "nom d'utilisateur: �"
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3585,7 +3677,7 @@ msgstr ""
"�\n"
"sign� avec votre cl� %08lX � %s\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3594,145 +3686,129 @@ msgstr ""
"\"\n"
"sign� localement avec votre cl� %08lX � %s\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Cette signature a expir� le %s.\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Etes-vous s�r de vouloir toujours le r�voquer ? (y/N) "
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "G�n�rer un certificat de r�vocation pour cette signature ? (o/N) "
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "Vous avez sign� ces noms d'utilisateurs:\n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid " signed by %s on %s%s%s\n"
msgstr " sign� par %08lX � %s%s%s\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid " revoked by %s on %s\n"
msgstr " r�voqu� par %08lX � %s\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, fuzzy, c-format
msgid " signed by %s on %s%s\n"
msgstr " sign� par %08lX � %s%s\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr " (non-exportable)"
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
msgid "Really create the revocation certificates? (y/N) "
msgstr "Cr�er r�ellement les certificats de r�vocation ? (o/N) "
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "pas de cl� secr�te\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "Le nom d'utilisateur \"%s\" est d�j� r�voqu�.\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"AVERTISSEMENT: une signature de nom d'utilisateur date de %d secondes\n"
"dans le futur\n"
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Affichage %s photo d'identit� de taille %ld pour la cl� 0x%08lX (uid %d)\n"
-#: g10/keylist.c:179
+#: g10/keylist.c:180
msgid "Critical signature policy: "
msgstr "Politique de signature critique: "
-#: g10/keylist.c:181
+#: g10/keylist.c:182
msgid "Signature policy: "
msgstr "Politique de signature: "
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "ATTENTION: des donn�es de notation invalides ont �t� d�tect�es\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
msgid "Critical signature notation: "
msgstr "Notation de signature critique: "
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr "Notation de signature: "
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr "illisible par un humain"
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr "Porte-cl�s"
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr " [expire: %s]"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr " [expire: %s]"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, fuzzy, c-format
-msgid " [revoked: %s]"
-msgstr "[revoqu�e] "
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
msgid "Primary key fingerprint:"
msgstr "Empreinte de cl� principale:"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
msgid " Subkey fingerprint:"
msgstr " Empreinte de la sous-cl�:"
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
msgid " Primary key fingerprint:"
msgstr " Empreinte de la cl� principale:"
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
msgid " Subkey fingerprint:"
msgstr " Empreinte de la sous-cl�:"
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr " Empreinte de la cl� ="
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3942,82 +4018,82 @@ msgstr "signature d'un ancien style (PGP 2.x)\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "impossible d'emp�cher la g�n�ration de fichiers �core�: %s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "Les algorithmes exp�rimentaux ne devraient pas �tre utilis�s !\n"
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"Cet algorithme de chiffrement est d�conseill�; utilisez-en un\n"
"plus standard !\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr "le module de chiffrement IDEA n'est pas pr�sent\n"
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr ""
"voir http://www.gnupg.org/fr/why-not-idea.html pour plus d'informations\n"
-#: g10/misc.c:491
+#: g10/misc.c:517
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: option d�conseill�e \"%s\"\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AVERTISSEMENT: \"%s\" est une option d�conseill�e.\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "utilisez \"%s%s\" � la place\n"
-#: g10/misc.c:508
+#: g10/misc.c:534
msgid "Uncompressed"
msgstr "D�compress�"
-#: g10/misc.c:533
+#: g10/misc.c:559
#, fuzzy
msgid "uncompressed|none"
msgstr "D�compress�"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "ce message ne sera pas utilisable par %s\n"
-#: g10/misc.c:777
+#: g10/misc.c:826
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "lire les options de `%s'\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "r�cipient par d�faut `%s' inconnu\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "impossible de g�rer l'algorithme � cl� publique %d\n"
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"AVERISSEMENT: la cl� de session chiffr�e de mani�re sym�trique est\n"
"potentiellement non s�re\n"
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, 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"
@@ -4059,7 +4135,7 @@ msgstr "impossible de se connecter � `%s': %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "probl�me de communication avec ssh-agent\n"
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr "probl�me avec l'agent - arr�t d'utilisation de l'agent\n"
@@ -4096,24 +4172,24 @@ msgstr "mot de passe trop long\n"
msgid "invalid response from agent\n"
msgstr "r�ponse de l'agent invalide\n"
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "annul� par l'utilisateur\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "probl�me avec l'agent : l'agent renvoie 0x%lx\n"
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "impossible de demander un mot de passe en mode automatique\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "Entrez le mot de passe: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4123,22 +4199,22 @@ msgstr ""
"Vous avez besoin d'un mot de passe pour d�verrouiller la cl� secr�te pour\n"
"l'utilisateur: \""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "cl� de %u bits %s, ID %08lX, cr��e le %s"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (ID cl� principale %08lX)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "R�p�tez le mot de passe: "
@@ -4381,29 +4457,40 @@ msgstr ""
"il n'est possible g�n�rer une signature d�tach�e avec des cl�s de\n"
"style PGP 2.x qu'en mode --pgp2\n"
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
-msgstr "impossible de cr�er %s: %s\n"
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
+msgstr "impossible de cr�er `%s': %s\n"
-#: g10/sign.c:794
-#, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+#: g10/sign.c:771 g10/sign.c:1008
+#, fuzzy, c-format
+msgid "writing to file `%s'\n"
+msgstr "�criture de `%s'\n"
+
+#: g10/sign.c:795
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"forcer l'algorithme de chiffrement %s (%d) entre en d�saccord avec\n"
"les pr�f�rences du r�cipient\n"
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr "signature:"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "impossible d'ouvrir le fichier: %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
"il n'est possible de faire une signature en texte clair avec des cl�s\n"
"de style PGP 2.x qu'en mode --pgp2\n"
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr "le chiffrement %s sera utilis�\n"
@@ -4810,7 +4897,7 @@ msgstr ""
"impossible d'�viter une cl� faible pour le chiffrement sym�trique:\n"
"%d essais ont eu lieu !\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA n�cessite l'utilisation d'un algorithme de hachage de 160 bits\n"
@@ -5173,17 +5260,17 @@ msgstr "Pas d'aide disponible"
msgid "No help available for `%s'"
msgstr "Pas d'aide disponible pour `%s'"
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "erreur durant la cr�ation du porte-cl�s `%s' : %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr "le porte-cl�s `%s` a �t� cr��\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "la reconstruction du cache de porte-cl�s a �chou� : %s\n"
@@ -5227,8 +5314,7 @@ msgstr "%lu cl�s v�rifi�es (%lu signatures)\n"
msgid "%s: keyring created\n"
msgstr "%s: porte-cl�s cr��\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5243,29 +5329,34 @@ msgstr ""
"en sera de m�me pour votre cl� !\n"
"La meilleure taille � utiliser est 240x288.\n"
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr "Entrez le nom du fichier JPEG pour la photo d'identit�: "
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "Impossible d'ouvrir la photo � %s �: %s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
msgid "Are you sure you want to use it (y/N)? "
msgstr "Etes-vous s�r de vouloir l'utiliser ? (o/N) "
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr "� %s � n'est pas un fichier JPEG\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Is this photo correct (y/N/q)? "
msgstr "Cette photo est-elle correcte (o/N/q) ? "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
msgid "unable to display photo ID!\n"
msgstr "impossible d'afficher la photo d'identit� !\n"
@@ -5286,49 +5377,55 @@ msgstr ""
"du fichier d'options sont trop peu s�res\n"
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
+#, fuzzy
+msgid "this platform requires temporary files when calling external programs\n"
msgstr ""
"cette plateforme a besoin de fichiers temporaires pour appeler des\n"
"programmes externes\n"
-#: g10/exec.c:432
-#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
msgstr "impossible d'ex�cuter %s � %s �: %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:436
+#, fuzzy, c-format
+msgid "unable to execute shell `%s': %s\n"
+msgstr "impossible d'ex�cuter %s � %s �: %s\n"
+
+#: g10/exec.c:515
#, c-format
msgid "system error while calling external program: %s\n"
msgstr "erreur syst�me pendant l'appel du programme externe: %s\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr "sortie non naturelle du programme externe\n"
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr "impossible d'ex�cuter le programme externe\n"
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr "impossible de lire la r�ponse du programme externe: %s\n"
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr ""
"AVERTISSEMENT: impossible d'enlever le fichier temporaire\n"
"(%s) `%s': %s\n"
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr ""
"AVERTISSEMENT: impossible d'effacer le r�pertoire temporaire `%s':\n"
"%s\n"
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr "jamais "
@@ -5485,6 +5582,47 @@ msgstr "erreur pendant la recherche de l'enregistrement de confiance: %s\n"
msgid "read error: %s\n"
msgstr "erreur de lecture: %s\n"
+#, fuzzy
+#~ msgid "revoked: %s"
+#~ msgstr "[revoqu�e] "
+
+#, fuzzy
+#~ msgid "expired: %s"
+#~ msgstr " [expire: %s]"
+
+#, fuzzy
+#~ msgid "expires: %s"
+#~ msgstr " [expire: %s]"
+
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "rev! la sous-cl� a �t� r�voqu�e: %s\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "rev- une r�vocation truqu�e a �t� trouv�e\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "rev? probl�me de v�rification de la r�vocation: %s\n"
+
+#~ msgid "[revoked] "
+#~ msgstr "[revoqu�e] "
+
+#~ msgid "[expired] "
+#~ msgstr "[expir�e] "
+
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr " [expire: %s]"
+
+#~ msgid " [expires: %s]"
+#~ msgstr " [expire: %s]"
+
+#, fuzzy
+#~ msgid " [revoked: %s]"
+#~ msgstr "[revoqu�e] "
+
+#~ msgid "can't create %s: %s\n"
+#~ msgstr "impossible de cr�er %s: %s\n"
+
#~ msgid ""
#~ "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n"
#~ msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 7a6c09f65..283161166 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.4\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
"PO-Revision-Date: 2003-12-04 11:39+0100\n"
"Last-Translator: Jacobo Tarrio <[email protected]>\n"
"Language-Team: Galician <[email protected]>\n"
@@ -46,7 +46,7 @@ msgstr "non|nom"
msgid "nN"
msgstr "nN"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "abandonar"
@@ -279,6 +279,16 @@ msgstr "chave secreta non utilizable"
msgid "keyserver error"
msgstr "erro do servidor de chaves"
+#: util/errors.c:108
+#, fuzzy
+msgid "canceled"
+msgstr "Cancelar"
+
+#: util/errors.c:109
+#, fuzzy
+msgid "no card"
+msgstr "non cifrado"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr ""
@@ -301,7 +311,7 @@ msgstr "atopou un erro ... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "non se detectou un m�dulo de acumulaci�n de entrop�a\n"
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "non se puido abrir `%s': %s\n"
@@ -333,7 +343,7 @@ msgstr "non se pode ler de `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "nota: o ficheiro random_seed non se actualiza\n"
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr "non se pode crear `%s': %s\n"
@@ -404,7 +414,7 @@ msgstr "non se pode xerar un n�mero primo de menos de %d bits\n"
msgid "can't generate a prime with less than %d bits\n"
msgstr "non se pode xerar un n�mero primo de menos de %d bits\n"
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -412,128 +422,128 @@ msgstr ""
"@Comandos:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[ficheiro]|facer unha sinatura"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[ficheiro]|facer unha sinatura en texto claro"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "facer unha sinatura separada"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "cifrar datos"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "cifrar s� con cifrado sim�trico"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "descifrar datos (por defecto)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "verificar unha sinatura"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "ve-la lista de chaves"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "ve-la lista de chaves e sinaturas"
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "verifica-las sinaturas das chaves"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "ve-la lista de chaves e pegadas dactilares"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "ve-la lista de chaves secretas"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "xerar un novo par de chaves"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "borrar chaves do chaveiro p�blico"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "borrar chaves do chaveiro secreto"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "asinar unha chave"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "asinar unha chave localmente"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "asinar ou editar unha chave"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "xerar un certificado de revocaci�n"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "exportar chaves"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "exportar chaves a un servidor de chaves"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "importar chaves dun servidor de chaves"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "buscar chaves nun servidor de chaves"
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "actualizar t�dalas chaves dun servidor de chaves"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "importar/mesturar chaves"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "actualiza-la base de datos de confianza"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -543,55 +553,51 @@ msgstr ""
"Opci�ns:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "crear sa�da con armadura en ascii"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|NOME|cifrar para NOME"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr "empregar este id de usuario para asinar ou descifrar"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr "|N|axusta-lo nivel de compresi�n a N (0 desactiva)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "usar modo de texto can�nico"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "usar coma ficheiro de sa�da"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "lareto"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "non facer ning�n cambio"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "avisar antes de sobrescribir"
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -599,7 +605,7 @@ msgstr ""
"@\n"
"(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -619,17 +625,17 @@ msgstr ""
" --list-keys [nomes] amosa-las chaves\n"
" --fingerprint [nomes] amosa-las pegadas dactilares\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Por favor, informe dos erros no programa a <[email protected]>,\n"
"e dos erros na traducci�n a <[email protected]>.\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -639,7 +645,7 @@ msgstr ""
"asinar, verificar, cifrar ou descifrar\n"
"a operaci�n por defecto depende dos datos de entrada\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -647,472 +653,466 @@ msgstr ""
"\n"
"Algoritmos soportados:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr "P�blica: "
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr "Cifra: "
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr "Hash: "
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
msgid "Compression: "
msgstr "Compresi�n: "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "uso: gpg [opci�ns] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "comandos conflictivos\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "non se atopou un signo = na definici�n do grupo \"%s\"\n"
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
-#: g10/g10.c:1205
+#: g10/g10.c:1210
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
-#: g10/g10.c:1334
+#: g10/g10.c:1354
#, fuzzy, c-format
-msgid "unknown configuration item \"%s\"\n"
+msgid "unknown configuration item `%s'\n"
msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTA: ign�rase o antigo ficheiro de opci�ns por defecto `%s'\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: non existe o ficheiro de opci�ns por defecto `%s'\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "ficheiro de opci�ns `%s': %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "lendo as opci�ns de `%s'\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: �%s non � para uso normal!\n"
-#: g10/g10.c:1887
-#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+#: g10/g10.c:2021
+#, fuzzy, c-format
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr ""
"non se cargou a extensi�n de cifrado \"%s\" debido a permisos inseguros\n"
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "%s non � un xogo de caracteres v�lido\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "non se puido analisa-lo URI do servidor de chaves\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
msgid "invalid import options\n"
msgstr "opci�ns de importaci�n non v�lidas\n"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
msgid "invalid export options\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "opci�ns de importaci�n non v�lidas\n"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "non se puido estabrecer exec-path a %s\n"
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s fai que se ignore %s\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "�%s non se admite con %s!\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "s� pode crear sinaturas separadas ou en claro no modo --pgp2\n"
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "non pode asinar e cifrar ao mesmo tempo no modo --pgp2\n"
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"debe empregar ficheiros (e non canalizaci�ns) ao traballar con --pgp2 "
"activado.\n"
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "para cifrar unha mensaxe en modo --pgp2 prec�sase da cifra IDEA\n"
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
msgid "selected certification digest algorithm is invalid\n"
msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed debe ser superior a 0\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed debe ser superior a 1\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth debe valer entre 1 e 255\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
#, fuzzy
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
#, fuzzy
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K non v�lido; debe ser 0, 1 ou 3\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
msgid "invalid default preferences\n"
msgstr "preferencias por defecto non v�lidas\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
msgid "invalid personal cipher preferences\n"
msgstr "preferencias de cifrado personais non v�lidas\n"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
msgid "invalid personal digest preferences\n"
msgstr "preferencias de resumo personais non v�lidas\n"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
msgid "invalid personal compress preferences\n"
msgstr "preferencias de compresi�n personais non v�lidas\n"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "�%s a�nda non traballa con %s!\n"
-#: g10/g10.c:2680
-#, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2797
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
-#: g10/g10.c:2685
-#, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2802
+#, fuzzy, c-format
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n"
-#: g10/g10.c:2690
-#, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2807
+#, fuzzy, c-format
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "non se pode empregar o algoritmo de compresi�n \"%s\" no modo %s\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"AVISO: deronse destinatarios (-r) sen empregar cifrado de chave p�blica\n"
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [ficheiro]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [ficheiro]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [ficheiro]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [ficheiro]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "non se pode empregar %s no modo %s\n"
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [ficheiro]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [ficheiro]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [ficheiro]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "non se pode empregar %s no modo %s\n"
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [ficheiro]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [ficheiro]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [ficheiro]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key id-de-usuario"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key id-de-usuario"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrsign-key id-de-usuario"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key id-de-usuario"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-de-usuario [comandos]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "non se puido abrir %s: %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "o env�o ao servidor de chaves fallou: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "a recepci�n do servidor de chaves fallou: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, c-format
msgid "key export failed: %s\n"
msgstr "a exportaci�n da chave fallou: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "a busca no servidor de chaves fallou fallou: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "non se puido quita-la armadura: %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "non se puido po�e-la armadura: %s\n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de hash non v�lido `%s'\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[ficheiro]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "Escriba a s�a mensaxe ...\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "non se puido abrir `%s'\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@ -1120,48 +1120,48 @@ msgstr ""
"un nome de notaci�n s� debe ter caracteres imprimibles ou espacios, e debe "
"rematar en '='\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
msgid "a user notation name must contain the '@' character\n"
msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "un valor de notaci�n non pode empregar ning�n car�cter de control\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr "o URL de normativa de certificaci�n dado non � v�lido\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
-#: g10/g10.c:3747
+#: g10/g10.c:3863
#, fuzzy
-msgid "the given signature preferred keyserver URL is invalid\n"
+msgid "the given preferred keyserver URL is invalid\n"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "ser un pouqui�o m�is calado"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
msgid "take the keys from this keyring"
msgstr "toma-las chaves deste chaveiro"
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
msgid "make timestamp conflicts only a warning"
msgstr "converte-los conflictos de selo de data nun aviso"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr "|DF|escribi-la informaci�n de estado a este DF"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Uso: gpgv [opci�ns] [ficheiros] (-h para ve-la axuda)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1195,12 +1195,13 @@ msgid "invalid dash escaped line: "
msgstr "li�a escapada cunha barra non v�lida: "
#: g10/armor.c:565
-msgid "unexpected armor:"
+#, fuzzy
+msgid "unexpected armor: "
msgstr "armadura inesperada:"
-#: g10/armor.c:695 g10/armor.c:1276
-#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+#: g10/armor.c:695 g10/armor.c:1280
+#, fuzzy, c-format
+msgid "invalid radix64 character %02X skipped\n"
msgstr "car�cter radix64 non v�lido %02x omitido\n"
#: g10/armor.c:738
@@ -1211,33 +1212,34 @@ msgstr "fin de ficheiro prematura (non hai CRC)\n"
msgid "premature eof (in CRC)\n"
msgstr "fin de ficheiro prematura (no CRC)\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "CRC mal formado\n"
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "Erro de CRC; %06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+#, fuzzy
+msgid "premature eof (in trailer)\n"
msgstr "fin de ficheiro prematura (nas li�as adicionais)\n"
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "error nunha li�a adicional\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "non se atoparon datos OpenPGP v�lidos.\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "armadura incorrecta: li�a m�is longa ca %d caracteres\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1293,7 +1295,7 @@ msgstr " alias \""
msgid " aka \""
msgstr " alias \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1548,96 +1550,116 @@ msgstr "%s: omitido: a chave p�blica est� desactivada\n"
msgid "no valid addressees\n"
msgstr "non hai enderezos v�lidos\n"
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "preferencia %c%lu duplicada\n"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "demasiadas preferencias `%c'\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
#, fuzzy
msgid "too many digest preferences\n"
msgstr "demasiadas preferencias `%c'\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
#, fuzzy
msgid "too many compression preferences\n"
msgstr "demasiadas preferencias `%c'\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "caracter non v�lido na cadea de preferencias\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
msgid "writing direct signature\n"
msgstr "escribindo unha sinatura directa\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "escribindo a propia sinatura\n"
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "escribindo unha sinatura que liga a chave\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "tama�o de chave non v�lido; empregando %u bits\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "tama�o de chave redondeado a %u bits\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "Por favor, seleccione o tipo de chave que quere:\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA e ElGamal (por defecto)\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (s� asinar)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (s� cifrar)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (s� asinar)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (s� cifrar)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (asinar e cifrar)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, fuzzy, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) RSA (s� asinar)\n"
+
+#: g10/keygen.c:1224
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) RSA (asinar e cifrar)\n"
+
+#: g10/keygen.c:1226
+#, fuzzy, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) RSA (s� cifrar)\n"
+
+#: g10/keygen.c:1228
+#, fuzzy, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) RSA (asinar e cifrar)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "�A s�a selecci�n? "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "Selecci�n non v�lida.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1650,28 +1672,28 @@ msgstr ""
" tama�o de chave por defecto: 1024 bits\n"
" tama�o de chave m�ximo recomendado: 2048 bits\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "�Qu� tama�o de chave quere? (1024) "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA s� admite tama�os entre 512 e 1024\n"
-#: g10/keygen.c:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "chave pequena de m�is; 1024 � o menor valor admitido para RSA.\n"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "chave pequena de m�is; 768 � o menor valor admitido\n"
-#: g10/keygen.c:1255
+#: g10/keygen.c:1328
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "chave grande de m�is; %d � o maior tama�o admitido.\n"
-#: g10/keygen.c:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1679,11 +1701,11 @@ msgstr ""
"�As chaves maiores de 2048 bits non se aconsellan porque\n"
"os c�lculos levan MOITO tempo!\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "�Est� seguro de que quere este tama�o de chave? "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1691,17 +1713,17 @@ msgstr ""
"De acordo, �pero te�a en conta que a radiaci�n do monitor e o teclado tam�n "
"son vulnerables a ataques!\n"
-#: g10/keygen.c:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "O tama�o de chave requerido son %u bits\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "redondeado a %u bits\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1717,7 +1739,7 @@ msgstr ""
" <n>m = a chave caduca en n meses\n"
" <n>y = a chave caduca en n anos\n"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1733,29 +1755,29 @@ msgstr ""
" <n>m = a sinatura caduca en n meses\n"
" <n>y = a sinatura caduca en n anos\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "�Por canto tempo � v�lida a chave? (0) "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr "�Por canto tempo � v�lida a sinatura? (0) "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "valor non v�lido\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s non caduca nunca\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr "%s caduca o %s\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1763,16 +1785,17 @@ msgstr ""
"O seu sistema non pode amosar datas m�is al� do 2038.\n"
"A�nda as�, hase tratar correctamente ata o 2106.\n"
-#: g10/keygen.c:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "�Isto � correcto? (s/n) "
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
+#, fuzzy
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
@@ -1783,44 +1806,44 @@ msgstr ""
" \"Heinrich Heime (Der Dichter) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "Nome: "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "Caracter non v�lido no nome\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr "O nome non pode comezar cun d�xito\n"
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr "O nome debe ter alomenos 5 caracteres\n"
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "Enderezo de E-mail: "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "Non � un enderezo de e-mail v�lido\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "Comentario: "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "Car�cter non v�lido no comentario\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Est� a usa-lo xogo de caracteres `%s'.\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1831,28 +1854,28 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Por favor, non po�a o enderezo de correo no nome real ou no comentario\n"
-#: g10/keygen.c:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "NnCcEeAaSs"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "�Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)a�r? "
-#: g10/keygen.c:1542
+#: g10/keygen.c:1615
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "�Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)a�r? "
-#: g10/keygen.c:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr "Por favor, corrixa antes o erro\n"
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1860,16 +1883,16 @@ msgstr ""
"Necesita un contrasinal para protexe-la s�a chave secreta.\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1881,7 +1904,7 @@ msgstr ""
"momento, empregando este programa coa opci�n \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1893,58 +1916,58 @@ msgstr ""
"mentres se xeran os n�meros primos; isto proporci�nalle ao xerador de\n"
"n�meros aleatorios unha opoertunidade de acumular entrop�a de abondo.\n"
-#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr "sent�molo, non se pode facer isto no modo por lotes\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "O par de chaves DSA ha ter 1024 bits.\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "Cancelouse a xeraci�n de chaves.\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr "gravando a chave p�blica en `%s'\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "gravando a chave secreta en `%s'\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "gravando a chave secreta en `%s'\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "non se atopou un chaveiro p�blico no que se poida escribir: %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "non se atopou un chaveiro privado no que se poida escribir: %s\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "erro escribindo no chaveiro p�blico `%s': %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "cre�ronse e asin�ronse as chaves p�blica e secreta.\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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"
@@ -1953,12 +1976,12 @@ msgstr ""
"queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
"con esa finalidade.\n"
-#: g10/keygen.c:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A xeraci�n da chave fallou: %s\n"
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1966,7 +1989,7 @@ msgstr ""
"creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
"reloxo)\n"
-#: g10/keygen.c:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1974,14 +1997,43 @@ msgstr ""
"creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
"reloxo)\n"
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTA: a creaci�n de subchaves para chaves v3 non cumpre OpenPGP\n"
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "�Crear realmente? "
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "fallou o borrado do bloque de chaves: %s\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "non se pode crear `%s': %s\n"
+
+#: g10/keygen.c:3248
+#, fuzzy, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "--output non traballa con este comando\n"
@@ -1992,7 +2044,7 @@ msgstr "--output non traballa con este comando\n"
msgid "%s: can't open: %s\n"
msgstr "%s: non se pode abrir: %s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
@@ -2020,6 +2072,11 @@ msgstr "%s: AVISO: ficheiro baleiro\n"
msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
msgstr "s� pode cifrar a chaves RSA de 2048 bits ou menos en modo --pgp2\n"
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "non se puido abrir %s: %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -2032,25 +2089,34 @@ msgstr ""
"non se puido emprega-la cifra IDEA para t�dalas chaves �s que est� a "
"cifrar.\n"
-#: g10/encode.c:526 g10/encode.c:721
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#: g10/encode.c:526
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
-#: g10/encode.c:634 g10/sign.c:863
-#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+#: g10/encode.c:634 g10/sign.c:864
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
msgstr ""
"forza-lo algoritmo de compresi�n %s (%d) viola as preferencias do "
"destinatario\n"
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
+
#: g10/encode.c:818
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrado para: \"%s\"\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "non se atopou a chave `%s': %s\n"
@@ -2084,8 +2150,9 @@ msgstr "AVISO: non se exportou nada\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "demasiadas entradas na cach� de chaves p�blicas - desactivada\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+#, fuzzy
+msgid "[User ID not found]"
msgstr "[Non se atopou o id de usuario]"
#: g10/getkey.c:1614
@@ -2240,7 +2307,7 @@ msgstr "chave %08lX: arranxouse a corrupci�n da sub-chave HKP\n"
#: g10/import.c:722
#, fuzzy, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "chave %08lX: aceptouse o ID de usuario '%s' sen auto-sinatura\n"
#: g10/import.c:728
@@ -2267,7 +2334,7 @@ msgstr "chave %08lX: nova chave - omitida\n"
msgid "no writable keyring found: %s\n"
msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "escribindo a `%s'\n"
@@ -2387,14 +2454,14 @@ msgstr "chave %08lX: non hai ID de usuario para a sinatura\n"
#: g10/import.c:1299
#, fuzzy, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"chave %08lX: algoritmo de chave p�blica non soportado no ID de usuario \"%s"
"\"\n"
#: g10/import.c:1301
#, fuzzy, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr ""
"chave %08lX: auto-sinatura non v�lida no identificadr de usuario \"%s\"\n"
@@ -2435,7 +2502,7 @@ msgstr "chave %08lX: eliminouse a revocaci�n de sub-chaves m�ltiples\n"
#: g10/import.c:1439
#, fuzzy, c-format
-msgid "key %s: skipped user ID '%s'\n"
+msgid "key %s: skipped user ID \"%s\"\n"
msgstr "chave %08lX: omitido o ID de usuario '"
#: g10/import.c:1460
@@ -2445,7 +2512,7 @@ msgstr "chave %08lX: omitida a sub-chave\n"
#: g10/import.c:1487
#, fuzzy, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "chave %08lX: sinatura non exportable (clase %02x) - omitida\n"
#: g10/import.c:1497
@@ -2480,114 +2547,114 @@ msgstr ""
"AVISO: a chave %08lX pode estar revocada: obtendo a chave de revocaci�n %"
"08lX\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"AVISO: a chave %08lX pode estar revocada: chave de revocaci�n %08lX "
"ausente.\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chave %08lX: \"%s\" certificado de revocaci�n engadido\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[revocaci�n]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[auto-sinatura]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "1 sinatura err�nea\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d sinaturas err�neas\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "1 sinatura non verificada debido a unha chave que falta\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d sinaturas non verificadas debido a chaves que faltan\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "1 sinatura non verificada debido a un erro\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d sinaturas non verificadas debido a erros\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "detectado 1 ID de usuario sin auto-sinatura v�lida\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "detectados %d IDs de usuario sin auto-sinatura v�lida\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, fuzzy, c-format
msgid " (%d) I trust marginally\n"
msgstr " %d = Conf�o marxinalmente\n"
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, fuzzy, c-format
msgid " (%d) I trust fully\n"
msgstr " %d = Conf�o totalmente\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "O ID de usuario \"%s\" est� revocado."
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "�Est� seguro de que quere asinalo? (s/N) "
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr " Non se puido asinar.\n"
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "O ID de usuario \"%s\" est� caducado."
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "O ID de usuario \"%s\" non est� asinado por el mesmo."
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2596,11 +2663,11 @@ msgstr ""
"A auto-sinatura de \"%s\"\n"
"� unha sinatura tipo PGP 2.x\n"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "�Quere promovela a unha auto-sinatura OpenPGP? (s/N) "
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2609,11 +2676,11 @@ msgstr ""
"A s�a sinatura actual en \"%s\"\n"
"caducou.\n"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "�Quere emitir unha nova sinatura que substit�a � caducada? (s/N) "
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2622,54 +2689,54 @@ msgstr ""
"A s�a sinatura actual en \"%s\"\n"
"� unha sinatura local.\n"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "�Quere promovela a sinatura totalmente exportable? (s/N) "
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" xa estaba asinado localmente coa chave %08lX\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" xa estaba asinado coa chave %08lX\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "�Quere asinalo outra vez de t�dolos xeitos? (s/N) "
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nada que asinar coa chave %08lX\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "�Esta chave caducou!"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Esta chave ha caducar o %s.\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "�Quere que a s�a sinatura caduque ao mesmo tempo? (S/n) "
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
msgstr ""
"Non pode facer unha sinatura OpenPGP nunha chave PGP 2.x no modo --pgp2.\n"
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "Isto poder�a face-la chave non utilizable en PGP 2.x.\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2678,31 +2745,31 @@ msgstr ""
"�Con canto tino comprobou que a chave que vai asinar realmente pertence �\n"
"persoa de enriba? Se non sabe que respostar, introduza \"0\".\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Non hei respostar.%s\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Non o comprobei en absoluto.%s\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Fixen algunhas comprobaci�ns.%s\n"
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Fixen comprobaci�ns moi exhaustivas.%s\n"
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr "�A s�a elecci�n? (introduza '?' para ter m�is informaci�n): "
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2710,7 +2777,7 @@ msgstr ""
"�Esta seguro de que quere asinar esta chave\n"
"coa s�a chave: \""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2718,7 +2785,7 @@ msgstr ""
"\n"
"Esta ha ser unha auto-sinatura.\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2726,7 +2793,7 @@ msgstr ""
"\n"
"AVISO: a sinatura non se ha marcar coma non exportable.\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2734,7 +2801,7 @@ msgstr ""
"\n"
"AVISO: A sinatura non se ha marcar coma non revocable.\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2742,7 +2809,7 @@ msgstr ""
"\n"
"A sinatura hase marcar coma non exportable.\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2750,7 +2817,7 @@ msgstr ""
"\n"
"A sinatura hase marcar coma non revocable.\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2758,7 +2825,7 @@ msgstr ""
"\n"
"Non se comprobou esta chave en absoluto.\n"
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2766,7 +2833,7 @@ msgstr ""
"\n"
"Comprobouse esta chave de xeito informal.\n"
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2774,34 +2841,34 @@ msgstr ""
"\n"
"Comprobouse esta chave con moito tino.\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "�Asinar de verdade? "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "fallou a sinatura: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "Esta chave non est� protexida.\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "A chave est� protexida.\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Non se pode editar esta chave: %s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2809,7 +2876,7 @@ msgstr ""
"Introduza o novo contrasinal para esta chave secreta.\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2817,546 +2884,568 @@ msgstr ""
"Non desexa un contrainal - �o que � unha *mala* idea!\n"
"\n"
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "�Seguro que quere facer esto? "
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "movendo a sinatura dunha chave � seu sitio\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "sa�r deste men�"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "s"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "gardar"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "gardar e sa�r"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "axuda"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "amosar esta axuda"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "amosar fingerprint"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "listar"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "listar chave e IDs de usuario"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "selecciona-lo ID de usuario N"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "chave"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "selecciona-la chave secundaria N"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "verificar"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "listar sinaturas"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "v"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "asina-la chave"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "f"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "tsign"
msgstr "sign"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "make a trust signature"
msgstr "facer unha sinatura separada"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "asina-la chave localmente"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr "asina-la chave de xeito non revocable"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "sign the key locally and non-revocably"
msgstr "asina-la chave localmente e de xeito non revocable"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "depurar"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "engadir un ID de usuario"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr "addphoto"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr "engadir unha identificaci�n fotogr�fica"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "borrar un ID de usuario"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr "delphoto"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "engadir unha chave secundaria"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+#, fuzzy
+msgid "addcardkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "borrar unha chave secundaria"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "addrevoker"
msgstr "addrevoker"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "add a revocation key"
msgstr "engadir unha chave de revocaci�n"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "borrar sinaturas"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "cambia-la fecha de expiraci�n"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr "primary"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr "marcar un ID de usuario coma primario"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "cambiar entre o listado de chaves p�blicas e secretas"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "c"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr "lista-las preferencias (expertos)"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr "lista-las preferencias (moitos datos)"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr "estabrece-la lista de preferencias"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr "preferencias actualizadas"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "keyserver"
msgstr "erro do servidor de chaves"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "set preferred keyserver URL"
msgstr "non se puido analisa-lo URI do servidor de chaves\n"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "cambia-lo contrasinal"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "cambia-la confianza sobre o dono"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "revocar sinaturas"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revuid"
msgstr "revuid"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revoke a user ID"
msgstr "revocar un ID de usuario"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "revocar unha chave secundaria"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "deshabilitar unha chave"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "habilitar unha chave"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr "showphoto"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr "amosa-la identificaci�n fotogr�fica"
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "non se pode facer iso no modo por lotes\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "erro ao le-lo bloque de chave secreta `%s': %s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "A chave secreta est� disponible.\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "Comando> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "C�mpre a chave secreta para facer isto.\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr "Por favor, empregue o comando \"toggle\" antes.\n"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
msgid "Key is revoked."
msgstr "A chave est� revocada."
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "�Seguro de que quere asinar t�dolos IDs de usuario? "
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Non se admite este comando no modo %s.\n"
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "Debe seleccionar alomenos un ID de usuario.\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "�Non pode borra-lo �ltimo ID de usuario!\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "�Seguro de que quere borrar t�dolos IDs de usuario seleccionados? "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "�Seguro de que quere borrar este ID de usuario? "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+#, fuzzy
+msgid "Really move the primary key? "
+msgstr "�Seguro de que quere borrar este ID de usuario? "
+
+#: g10/keyedit.c:1598
+#, fuzzy
+msgid "You must select exactly one key.\n"
+msgstr "Debe seleccionar alomenos unha chave.\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "Debe seleccionar alomenos unha chave.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "�Seguro de que quere borra-las chaves seleccionadas? "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "�Seguro de que quere borrar esta chave? "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
msgid "Really revoke all selected user IDs? "
msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
msgid "Really revoke this user ID? "
msgstr "�Seguro de que quere revocar este ID de usuario? "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "�Realmente quere revoca-las chaves seleccionadas? "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "�Realmente quere revocar esta chave? "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
#, fuzzy
msgid "Set preference list to:\n"
msgstr "estabrece-la lista de preferencias"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr ""
"�Seguro que quere actualiza-las preferencias dos IDs de usuario "
"seleccionados? "
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr "�Realmente desexa actualiza-las preferencias? "
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "�Garda-los cambios? "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "�Sa�r sin gardar? "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "a actualizaci�n fallou: %s\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "o segredo da actualizaci�n fallou: %s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "Comando incorrecto (tente \"help\")\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr "Resumo: "
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr "Caracter�sticas: "
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keyedit.c:2219
#, c-format
msgid "This key may be revoked by %s key "
msgstr "Esta chave pode estar revocada por %s chave "
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr " (sensible)"
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "non foi posible crear %s: %s\n"
-#: g10/keyedit.c:2084
-#, fuzzy, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
msgstr "[revocada] "
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
-msgstr " [caduca: %s]"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
+msgstr "expire"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2246
#, fuzzy, c-format
-msgid "expires: %s"
-msgstr " [caduca: %s]"
+msgid "usage: %s"
+msgstr " confianza: %c/%c"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, fuzzy, c-format
msgid "trust: %s"
msgstr " confianza: %c/%c"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "Esta chave est� desactivada"
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! revocouse a subchave: %s\n"
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
-msgstr "rev- atopouse unha revocaci�n falsa\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? problema ao comproba-la revocaci�n: %s\n"
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-#, fuzzy
-msgid "revoked"
-msgstr "[revocada] "
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-#, fuzzy
-msgid "expired"
-msgstr "expire"
+#: g10/keyedit.c:2300
+msgid "card-no: "
+msgstr ""
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Non hai preferencias nun ID de usuario estilo PGP 2.x.\n"
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3364,15 +3453,7 @@ msgstr ""
"Te�a en conta que a validez da chave amosada non � necesariamente\n"
"correcta a menos que reinicie o programa.\n"
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-msgid "[revoked] "
-msgstr "[revocada] "
-
-#: g10/keyedit.c:2274
-msgid "[expired] "
-msgstr "[caducada ]"
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@ -3380,7 +3461,7 @@ msgstr ""
"AVISO: non se marcou ning�n ID de usuario coma primario. Esta orde pode\n"
" facer que un ID de usuario diferente se converta no primario.\n"
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3389,47 +3470,47 @@ msgstr ""
"AVISO: Esta � unha chave de estilo PGP2. Se engade unha identificaci�n\n"
" fotogr�fica algunhas versi�ns de PGP han rexeitar esta chave.\n"
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
msgid "Are you sure you still want to add it? (y/N) "
msgstr "�Est� seguro de que quere engadila? (s/N) "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr ""
"Non pode engadir unha identificaci�n fotogr�fica a unha chave de estilo "
"PGP2.\n"
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "�Borrar esta sinatura correcta? (s/N/q)"
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "�Borrar esta sinatura incorrecta? (s/N/q)"
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "�Borrar esta sinatura desco�ecida? (s/N/q)"
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "�Realmente quere borrar esta auto-sinatura? (s/N)"
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Borrada %d sinatura.\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Borradas %d sinaturas.\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "Non se borrou nada.\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3439,93 +3520,103 @@ msgstr ""
"designado\n"
" pode facer que algunhas versi�ns de PGP rexeiten esta chave.\n"
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"Non pode engadir un revocador designado a unha chave de estilo PGP 2.x.\n"
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
msgid "Enter the user ID of the designated revoker: "
msgstr "Introduza o ID de usuario do revocador designado: "
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n"
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "non se pode nomear unha chave coma o seu propio revocador designado\n"
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
"se pode desfacer!\n"
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr ""
"�Est� seguro de que quere nomear esta chave coma revocador designado? (s/N): "
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "Por favor, quite as selecci�ns das chaves secretas.\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "Por favor, seleccione como m�ximo unha chave secundaria.\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Non pode cambia-la data de expiraci�n dunha chave v3\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
msgid "Please select exactly one user ID.\n"
msgstr "Escolla exactamente un ID de usuario.\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
-#, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "omitindo a auto-sinatura v3 do id de usuario \"%s\"\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+#, fuzzy
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "�Est� seguro de que quere empregala (s/N)? "
+
+#: g10/keyedit.c:3480
+#, fuzzy
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "�Est� seguro de que quere empregala (s/N)? "
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "Non hai ID de usuario con �ndice %d\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Non hai chave secundaria con �ndice %d\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "ID de usuario: \""
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3534,7 +3625,7 @@ msgstr ""
"\"\n"
"asinado coa s�a chave %08lX no %s\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3543,144 +3634,128 @@ msgstr ""
"\"\n"
"asinado localmente coa s�a chave %08lX no %s\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Esta sinatura caducou o %s.\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "�Est� seguro de que quere revocala? (s/N) "
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "�Crear un certificado de revocaci�n para esta sinatura? (s/N) "
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "Asinou estes IDs de usuario: \n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid " signed by %s on %s%s%s\n"
msgstr " asinada por %08lX no %s%s%s\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid " revoked by %s on %s\n"
msgstr " revocada por %08lX no %s\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "Est� a punto de revocar estas sinaturas:\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, fuzzy, c-format
msgid " signed by %s on %s%s\n"
msgstr " asinada por %08lX no %s%s\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr " (non exportable)"
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
msgid "Really create the revocation certificates? (y/N) "
msgstr "�Realmente desexa crea-los certificados de revocaci�n? (s/N) "
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "non hai chave secreta\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "o ID de usuario \"%s\" xa est� revocado\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"AVISO: unha sinatura de ID de usuario ten unha data %d segundos no futuro\n"
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Amosando a id. fotogr�fica %s de tama�o %ld da chave 0x%08lX (uid %d)\n"
-#: g10/keylist.c:179
+#: g10/keylist.c:180
msgid "Critical signature policy: "
msgstr "Normativa de sinaturas cr�ticas: "
-#: g10/keylist.c:181
+#: g10/keylist.c:182
msgid "Signature policy: "
msgstr "Normativa de sinaturas: "
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "AVISO: atop�ronse datos de notaci�n non v�lidos\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
msgid "Critical signature notation: "
msgstr "Notaci�n de sinaturas cr�ticas: "
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr "Notaci�n de sinaturas: "
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr "non lexible por humanos"
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr "Chaveiro"
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr " [caduca: %s]"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr " [caduca: %s]"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, fuzzy, c-format
-msgid " [revoked: %s]"
-msgstr "[revocada] "
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
msgid "Primary key fingerprint:"
msgstr "Pegada dactilar da chave primaria:"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
msgid " Subkey fingerprint:"
msgstr " Pegada dactilar da sub-chave:"
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
msgid " Primary key fingerprint:"
msgstr "Pegada dactilar da chave primaria:"
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
msgid " Subkey fingerprint:"
msgstr " Pegada dactilar da sub-chave:"
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr " Pegada dactilar ="
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3886,81 +3961,81 @@ msgstr "Sinatura � vello estilo (PGP 2.x)\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "paquete ra�z incorrecto detectado en proc_tree()\n"
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "non � posible deshabilita-los volcados de 'core': %s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "�Os algoritmos experimentais non deber�an ser usados!\n"
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"este algoritmo de cifrado est� obsoleto; por favor, empregue un m�is "
"est�ndar!\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr "o plugin de cifra IDEA non est� presente\n"
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr ""
"mire en http://www.gnupg.org/why-not-idea.html para obter m�is informaci�n\n"
-#: g10/misc.c:491
+#: g10/misc.c:517
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: opci�n a extinguir \"%s\"\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "empregue \"%s%s\" no seu canto\n"
-#: g10/misc.c:508
+#: g10/misc.c:534
msgid "Uncompressed"
msgstr "Sen comprimir"
-#: g10/misc.c:533
+#: g10/misc.c:559
#, fuzzy
msgid "uncompressed|none"
msgstr "Sen comprimir"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "esta mensaxe pode non ser utilizable por %s\n"
-#: g10/misc.c:777
+#: g10/misc.c:826
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "lendo as opci�ns de `%s'\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "destinatario por defecto `%s' desco�ecido\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "non � posible manexa-lo algoritmo de chave p�blica %d\n"
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"AVISO: chave de sesi�n cifrada simetricamente potencialmente insegura\n"
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "un subpaquete de tipo %d ten o bit cr�tico posto\n"
@@ -3999,7 +4074,7 @@ msgstr "non se puido conectar a `%s': %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "problema de comunicaci�n con gpg-agent\n"
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr "problema co axente - desactivando o emprego do axente\n"
@@ -4035,24 +4110,24 @@ msgstr "contrasinal demasiado longo\n"
msgid "invalid response from agent\n"
msgstr "resposta do axente non v�lida\n"
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "cancelado polo usuario\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "non se pode consulta-lo contrasinal en modo de proceso por lotes\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "Introduza o contrasinal: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4062,22 +4137,22 @@ msgstr ""
"Necesita un contrasinal para desbloquea-la chave secreta para\n"
"o usuario \""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bits, chave %s, ID %08lX, creada %s"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (ID principal da chave %08lX)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "Repita o contrasinal: "
@@ -4307,26 +4382,37 @@ msgstr ""
"s� pode asinar nun ficheiro separado con chaves estilo PGP 2.x no modo --"
"pgp2\n"
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
-msgstr "non foi posible crear %s: %s\n"
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
+msgstr "non se pode crear `%s': %s\n"
-#: g10/sign.c:794
-#, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+#: g10/sign.c:771 g10/sign.c:1008
+#, fuzzy, c-format
+msgid "writing to file `%s'\n"
+msgstr "escribindo a `%s'\n"
+
+#: g10/sign.c:795
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr "asinando:"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "non se puido abrir un ficheiro: %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "s� pode asinar en claro con chaves estilo PGP 2.x no modo --pgp2\n"
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr "hase empregar cifrado %s\n"
@@ -4728,7 +4814,7 @@ msgstr ""
"non se pode evitar unha chave feble para o cifrado sim�trico; tentouse %d "
"veces\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA require o emprego dun algoritmo hash de 160 bits\n"
@@ -5089,17 +5175,17 @@ msgstr "Non hai axuda dispo�ible"
msgid "No help available for `%s'"
msgstr "Non hai axuda dispo�ible para `%s'"
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "erro ao crea-lo chaveiro `%s': %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr "chaveiro `%s' creado\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
@@ -5142,8 +5228,7 @@ msgstr "%lu chaves comprobadas (%lu sinaturas)\n"
msgid "%s: keyring created\n"
msgstr "%s: chaveiro creado\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5157,29 +5242,34 @@ msgstr ""
"p�blica. Se emprega unha imaxe moi grande, a s�a chave tam�n se ha volver\n"
"moi grande. Un bo tama�o para empregar � un semellante a 240x288.\n"
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr "Introduza o nome do ficheiro JPEG: "
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "Non se puido abri-la foto \"%s\": %s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
msgid "Are you sure you want to use it (y/N)? "
msgstr "�Est� seguro de que quere empregala (s/N)? "
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr "\"%s\" non � un ficheiro JPEG\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Is this photo correct (y/N/q)? "
msgstr "�� esta foto correcta (s/N/q)? "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
msgid "unable to display photo ID!\n"
msgstr "�non se pode amosa-la identificaci�n fotogr�fica!\n"
@@ -5200,45 +5290,51 @@ msgstr ""
"permisos de ficheiros non seguras\n"
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
+#, fuzzy
+msgid "this platform requires temporary files when calling external programs\n"
msgstr ""
"esta plataforma precisa de ficheiros temporais ao chamar a programas "
"externos\n"
-#: g10/exec.c:432
-#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
msgstr "non se puido executar %s \"%s\": %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:436
+#, fuzzy, c-format
+msgid "unable to execute shell `%s': %s\n"
+msgstr "non se puido executar %s \"%s\": %s\n"
+
+#: g10/exec.c:515
#, c-format
msgid "system error while calling external program: %s\n"
msgstr "erro do sistema ao chamar a un programa externo: %s\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr "sa�da non natural do programa externo\n"
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr "non se puido executar un programa externo\n"
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr "non se puido le-la resposta do programa externo: %s\n"
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "AVISO: non se puido elimina-lo directorio temporal `%s': %s\n"
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr "nunca "
@@ -5393,6 +5489,47 @@ msgstr "erro ao buscar un rexistro de confianza: %s\n"
msgid "read error: %s\n"
msgstr "erro de lectura: %s\n"
+#, fuzzy
+#~ msgid "revoked: %s"
+#~ msgstr "[revocada] "
+
+#, fuzzy
+#~ msgid "expired: %s"
+#~ msgstr " [caduca: %s]"
+
+#, fuzzy
+#~ msgid "expires: %s"
+#~ msgstr " [caduca: %s]"
+
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "rev! revocouse a subchave: %s\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "rev- atopouse unha revocaci�n falsa\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "rev? problema ao comproba-la revocaci�n: %s\n"
+
+#~ msgid "[revoked] "
+#~ msgstr "[revocada] "
+
+#~ msgid "[expired] "
+#~ msgstr "[caducada ]"
+
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr " [caduca: %s]"
+
+#~ msgid " [expires: %s]"
+#~ msgstr " [caduca: %s]"
+
+#, fuzzy
+#~ msgid " [revoked: %s]"
+#~ msgstr "[revocada] "
+
+#~ msgid "can't create %s: %s\n"
+#~ msgstr "non foi posible crear %s: %s\n"
+
#~ msgid ""
#~ "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n"
#~ msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 176a014c1..f6304f41a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.5\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
"PO-Revision-Date: 2004-06-19 21:53+0200\n"
"Last-Translator: Nagy Ferenc L�szl� <[email protected]>\n"
"Language-Team: Hungarian <[email protected]>\n"
@@ -46,7 +46,7 @@ msgstr "nem"
msgid "nN"
msgstr "nN"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "kil�p�s|kilepes"
@@ -279,6 +279,16 @@ msgstr "haszn�lhatatlan titkos kulcs"
msgid "keyserver error"
msgstr "kulcsszerverhiba"
+#: util/errors.c:108
+#, fuzzy
+msgid "canceled"
+msgstr "M�gsem"
+
+#: util/errors.c:109
+#, fuzzy
+msgid "no card"
+msgstr "nem titkos�tott"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr ""
@@ -301,7 +311,7 @@ msgstr "Tal�lt egy programhib�t... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "Nem �szleltem entr�piagy�jt� modult.\n"
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
@@ -334,7 +344,7 @@ msgstr "Nem tudom olvasni a(z) \"%s\" �llom�nyt: %s.\n"
msgid "note: random_seed file not updated\n"
msgstr "Megjegyz�s: random_seed �llom�nyt nem friss�tettem.\n"
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
@@ -403,7 +413,7 @@ msgstr "Nem tudok l�trehozni %d bitesn�l kisebb pr�msz�mot.\n"
msgid "can't generate a prime with less than %d bits\n"
msgstr "Nem tudok l�trehozni %d bitesn�l kisebb pr�msz�mot.\n"
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -411,128 +421,128 @@ msgstr ""
"@Parancsok:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[f�jl]|al��r�s k�sz�t�se"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "k�l�n�ll� al��r�s k�sz�t�se"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "adat titkos�t�sa"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "adat visszafejt�se (alap�rtelmez�s)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "al��r�s ellen�rz�se"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "kulcsok list�z�sa"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "kulcsok �s al��r�sok list�z�sa"
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "kulcsal��r�sok ellen�rz�se"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "kulcsok �s ujjlenyomatok list�z�sa"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "titkos kulcsok list�z�sa"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "�j kulcsp�r l�trehoz�sa"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "kulcsok elt�vol�t�sa a titkoskulcs-karik�r�l"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "kulcs al��r�sa"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "kulcs al��r�sa helyileg"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "kulcs al��r�sa vagy szerkeszt�se"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "visszavon�si igazol�s k�sz�t�se"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "kulcsok export�l�sa"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "kulcsok export�l�sa kulcsszerverre"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "kulcsok import�l�sa kulcsszerverr�l"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "kulcsok keres�se kulcsszerveren"
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "minden kulcs friss�t�se kulcsszerverr�l"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "kulcsok import�l�sa/�sszef�z�se"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "bizalmi adatb�zis friss�t�se"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -542,55 +552,51 @@ msgstr ""
"Opci�k:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|N�V|titkos�t�s N�V r�sz�re"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr "|N|t�m�r�t�si szint be�ll�t�sa N-re (0: tilt�s)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "kanonikus sz�veges m�d haszn�lata"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "kimeneti �llom�ny megad�sa"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "b�besz�d� m�d"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "ne csin�ljon semmi v�ltoztat�st"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "fel�l�r�s el�tt r�k�rdez�s"
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -598,7 +604,7 @@ msgstr ""
"@\n"
"(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -618,15 +624,15 @@ msgstr ""
" --list-keys [nevek] kulcsok ki�rat�sa\n"
" --fingerprint [nevek] ujjlenyomatok ki�rat�sa\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr "A hib�kat (angolul) a <[email protected]> c�mre �rja meg!\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -636,7 +642,7 @@ msgstr ""
"Al��r�s, ellen�rz�s, titkos�t�s vagy visszafejt�s.\n"
"Az alap�rtelmezett m�velet a bemeneti adatt�l f�gg.\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -644,469 +650,463 @@ msgstr ""
"\n"
"T�mogatott algoritmusok:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr "Nyilv�nos kulcs� (pubkey): "
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr "Rejtjelez� (cipher): "
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr "Kivonatol� (hash): "
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
msgid "Compression: "
msgstr "T�m�r�t� (compression): "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "Haszn�lat: gpg [opci�k] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "Egym�snak ellentmond� parancsok!\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "Nem tal�ltam = jelet a \"%s\" csoportdefin�ci�ban!\n"
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
-#: g10/g10.c:1205
+#: g10/g10.c:1210
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
-#: g10/g10.c:1334
-#, c-format
-msgid "unknown configuration item \"%s\"\n"
+#: g10/g10.c:1354
+#, fuzzy, c-format
+msgid "unknown configuration item `%s'\n"
msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "MEGJEGYZ�S: Figyelmen k�v�l hagytam a r�gi opci�kat (%s).\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "MEGJEGYZ�S: Nincs alap�rtelmezett opci�s f�jl (%s).\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "\"%s\" opci�s f�jl: %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "MEGJEGYZ�S: %s nem norm�l haszn�latra van!\n"
-#: g10/g10.c:1887
-#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+#: g10/g10.c:2021
+#, fuzzy, c-format
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr "A \"%s\" rejtjelez� b�v�t�st rossz enged�lyek miatt t�lt�m be.\n"
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "�rv�nytelen export opci�k!\n"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: �rv�nytelen import opci�k!\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
msgid "invalid import options\n"
msgstr "�rv�nytelen import opci�k!\n"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
msgid "invalid export options\n"
msgstr "�rv�nytelen export opci�k!\n"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: �rv�nytelen import opci�k!\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "�rv�nytelen import opci�k!\n"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "�rv�nytelen export opci�k!\n"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "Nem tudom a v�grehajt�si el�r�si utat %s �rt�kre �ll�tani!\n"
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s �rtelmetlen %s mellett!\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "Csak k�l�n�ll� �s olvashat�sz�veg-al��r�st k�sz�thet --pgp2 m�dban!\n"
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "Nem �rhat al� �s titkos�that egyszerre --pgp2 m�dban!\n"
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "Csak �llom�nyokat (pipe-ot nem) haszn�lhat --pgp2 m�dban!\n"
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "�zenet titkos�t�sa --pgp2 m�dban IDEA rejtjelez�t ig�nyel!\n"
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
msgid "selected certification digest algorithm is invalid\n"
msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth 1 �s 255 k�z� kell essen!\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "�rv�nytelen default-cert-level; 0, 1, 2 vagy 3 lehet.\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "�rv�nytelen min-cert-level; 0, 1, 2 vagy 3 lehet.\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "MEGJEGYZ�S: Egyszer� S2K m�d (0) er�sen ellenjavallt!\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "�rv�nytelen S2K m�d; 0, 1 vagy 3 lehet.\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
msgid "invalid default preferences\n"
msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
msgid "invalid personal cipher preferences\n"
msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
msgid "invalid personal digest preferences\n"
msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
msgid "invalid personal compress preferences\n"
msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s �s %s egyel�re nem haszn�lhat� egy�tt!\n"
-#: g10/g10.c:2680
-#, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2797
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr ""
"Lehet, hogy nem haszn�lhatja \"%s\" rejtjelez� algoritmust %s m�dban!\n"
-#: g10/g10.c:2685
-#, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2802
+#, fuzzy, c-format
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr ""
"Lehet, hogy nem haszn�lhatja \"%s\" kivonatol� algoritmust %s m�dban!\n"
-#: g10/g10.c:2690
-#, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2807
+#, fuzzy, c-format
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "Lehet, hogy nem haszn�lhatja \"%s\" t�m�r�t� algoritmust %s m�dban!\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"FIGYELEM: C�mzett megadva (-r), de nincs nyilv�nos kulcs� titkos�t�s!\n"
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [f�jln�v]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [f�jln�v]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [f�jln�v]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [f�jln�v]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [f�jln�v]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [f�jln�v]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [f�jln�v]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [f�jln�v]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [f�jln�v]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [f�jln�v]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key felh-azonos�t�"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key felh-azonos�t�"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrsign-key felh-azonos�t�"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key felh-azonos�t�"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key felh-azonos�t� [parancsok]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "Nem tudom megnyitni %s-t: %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [felh-azonos�t�] [kulcskarika]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, c-format
msgid "key export failed: %s\n"
msgstr "Kulcsexport�l�s sikertelen: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "P�nc�loz�s nem siker�lt: %s\n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[f�jln�v]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "Kezdheti g�pelni az �zenetet...\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "Nem tudom megnyitni %s-t!\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@ -1114,48 +1114,48 @@ msgstr ""
"Egy jel�l�s neve csak nyomtathat� karaktereket �s sz�k�zt tartalmazhat, �s = "
"jellel kell befejez�dj�n.\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
msgid "a user notation name must contain the '@' character\n"
msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "Egy jel�l�s �rt�k�ben nem szerepelhet vez�rl�karakter!\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr "A megadott igazol�si elj�r�sm�d URL-je �rv�nytelen!\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
-#: g10/g10.c:3747
+#: g10/g10.c:3863
#, fuzzy
-msgid "the given signature preferred keyserver URL is invalid\n"
+msgid "the given preferred keyserver URL is invalid\n"
msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "m�g sz�kszav�bb m�d"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
msgid "take the keys from this keyring"
msgstr "a megadott kulcskarik�r�l vegye a kulcsokat"
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
msgid "make timestamp conflicts only a warning"
msgstr "id�b�lyeg-konfliktus eset�n csak figyelmeztessen"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr "|�L|�llapotinform�ci�k �r�sa �L �llom�nyle�r�ra"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Haszn�lat: gpgv [opci�k] [f�jlok] (-h a s�g�hoz)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1189,12 +1189,13 @@ msgid "invalid dash escaped line: "
msgstr "�rv�nytelen k�t�jeles sor: "
#: g10/armor.c:565
-msgid "unexpected armor:"
+#, fuzzy
+msgid "unexpected armor: "
msgstr "V�ratlan p�nc�l:"
-#: g10/armor.c:695 g10/armor.c:1276
-#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+#: g10/armor.c:695 g10/armor.c:1280
+#, fuzzy, c-format
+msgid "invalid radix64 character %02X skipped\n"
msgstr "Kihagytam a %02x k�d� �rv�nytelen radix64 karaktert.\n"
#: g10/armor.c:738
@@ -1205,33 +1206,34 @@ msgstr "Korai �llom�nyv�g (nincs CRC).\n"
msgid "premature eof (in CRC)\n"
msgstr "Korai �llom�nyv�g (a CRC-ben).\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "Hib�s form�j� CRC.\n"
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC hiba; %06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+#, fuzzy
+msgid "premature eof (in trailer)\n"
msgstr "Korai �llom�nyv�g (a lez�r�sban).\n"
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "Hiba a z�r� sorban!\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "�rv�nytelen p�nc�l: %d karaktern�l hosszabb sor.\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1286,7 +1288,7 @@ msgstr " azaz \""
msgid " aka \""
msgstr " azaz \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1538,96 +1540,116 @@ msgstr "%s: Kihagyva: Nyilv�nos kulcs nincs enged�lyezve.\n"
msgid "no valid addressees\n"
msgstr "Nincsenek �rv�nyes c�mzettek!\n"
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "%c%lu preferencia k�tszer szerepel!\n"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "T�l sok \"%c\" preferencia.\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
#, fuzzy
msgid "too many digest preferences\n"
msgstr "T�l sok \"%c\" preferencia.\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
#, fuzzy
msgid "too many compression preferences\n"
msgstr "T�l sok \"%c\" preferencia.\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
msgid "writing direct signature\n"
msgstr "Sima al��r�st �rok.\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "�nal��r�st �rok.\n"
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "�sszef�z� al��r�st �rok.\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "Kulcsm�ret �rv�nytelen; %u bitet haszn�lok.\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "Kulcsm�retet felkerek�tettem %u bitre.\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA �s ElGamal (alap�rtelmez�s)\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (csak al��r�s)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (csak titkos�t�s)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (csak al��r�s)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (csak titkos�t�s)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (al��r�s �s titkos�t�s)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, fuzzy, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) RSA (csak al��r�s)\n"
+
+#: g10/keygen.c:1224
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) RSA (al��r�s �s titkos�t�s)\n"
+
+#: g10/keygen.c:1226
+#, fuzzy, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) RSA (csak titkos�t�s)\n"
+
+#: g10/keygen.c:1228
+#, fuzzy, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) RSA (al��r�s �s titkos�t�s)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "Mit v�laszt? "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "�rv�nytelen v�laszt�s.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1640,28 +1662,28 @@ msgstr ""
" alap�rtelmezett kulcsm�ret: 1024 bit\n"
" legnagyobb aj�nlott kulcsm�ret: 2048 bit\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "Milyen kulcsm�retet szeretne? (1024) "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "A DSA csak 512 �s 1024 k�z�tti kulcsm�retet t�mogat.\n"
-#: g10/keygen.c:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "Kulcsm�ret t�l kicsi; 1024 a legkisebb megengedett �rt�k RSA-hoz.\n"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "Kulcsm�ret t�l kicsi; 768 a legkisebb megengedett �rt�k.\n"
-#: g10/keygen.c:1255
+#: g10/keygen.c:1328
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "Kulcsm�ret t�l nagy; %d a legnagyobb megengedett �rt�k.\n"
-#: g10/keygen.c:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1669,11 +1691,11 @@ msgstr ""
"2048-n�l nagyobb kulcsm�ret nem aj�nlott, mert a sz�m�t�sok\n"
"NAGYON sok�ig fognak tartani!\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "Biztos benne, hogy akarja ezt a kulcsm�retet? "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1681,17 +1703,17 @@ msgstr ""
"Rendben, de vegye figyelembe, hogy a t�mad�k a monitor�nak vagy\n"
"a billenty�zet�nek a sug�rz�s�t is felhaszn�lhatj�k!\n"
-#: g10/keygen.c:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "A k�v�nt kulcsm�ret %u bit.\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "Felkerek�tve %u bitre.\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1707,7 +1729,7 @@ msgstr ""
" <n>m = a kulcs n h�napig �rv�nyes\n"
" <n>y = a kulcs n �vig �rv�nyes\n"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1723,29 +1745,29 @@ msgstr ""
" <n>m = az al��r�s n h�napig �rv�nyes\n"
" <n>y = az al��r�s n �vig �rv�nyes\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "Meddig �rv�nyes a kulcs? (0) "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr "Meddig �rv�nyes az al��r�s? (0) "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "�rv�nytelen �rt�k!\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s soha nem j�r le.\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr "%s lej�r: %s\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1753,16 +1775,17 @@ msgstr ""
"Az �n rendszere nem tud megjelen�teni 2038 ut�ni d�tumokat.\n"
"Azonban kezelni helyesen tudja �ket eg�szen 2106-ig.\n"
-#: g10/keygen.c:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "Ez �gy helyes (i/n)? "
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
+#, fuzzy
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
@@ -1773,44 +1796,44 @@ msgstr ""
" \"Heinrich Heine (a k�lt�) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "Teljes n�v: "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "�rv�nytelen karakter a n�vben!\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr "A n�v lehet, hogy nem kezd�dhet sz�mmal!\n"
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr "A n�v legal�bb 5 karakter kell legyen!\n"
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "E-mail c�m: "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "Ez nem �rv�nyes e-mail c�m.\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "Megjegyz�s: "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "�rv�nytelen karakter a megjegyz�sben!\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "�n a(z) %s karakterk�dol�st haszn�lja.\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1821,28 +1844,28 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "K�rem, ne rakja az e-mail c�met a teljes n�vbe vagy a megjegyz�sbe!\n"
-#: g10/keygen.c:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "NnMmEeRrKk"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "(N)�v, (M)egjegyz�s, (E)-mail megv�ltoztat�sa vagy (K)il�p�s? "
-#: g10/keygen.c:1542
+#: g10/keygen.c:1615
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"(N)�v, (M)egjegyz�s, (E)-mail megv�ltoztat�sa vagy (R)endben/(K)il�p�s? "
-#: g10/keygen.c:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr "K�rem, el�bb jav�tsa ki a hib�t!\n"
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1850,16 +1873,16 @@ msgstr ""
"Most sz�ks�g van egy jelsz�ra (vagy mondatra), amely a titkos kulcs�t v�di.\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1871,7 +1894,7 @@ msgstr ""
"az \"--edit-key\" opci�val.\n"
"\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1883,58 +1906,58 @@ msgstr ""
"a lemezeket) a pr�msz�m gener�l�sa alatt. Ez seg�ti a v�letlensz�m-\n"
"gener�tort, hogy entr�pi�t tudjon gy�jteni.\n"
-#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr "Sajn�lom, ezt nem tudom megcsin�lni k�tegelt m�dban!\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "A DSA kulcsp�r 1024 bites lesz.\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "Kulcs l�trehoz�sa megszak�tva.\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr "�rom a kulcsot a %s �llom�nyba.\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "Nem �rhat� nyilv�noskulcs-karik�t tal�ltam: %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "Nem �rhat� titkoskulcs-karik�t tal�ltam: %s\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "Hiba a(z) \"%s\" nyilv�noskulcs-karika �r�sakor: %s.\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "A nyilv�nos �s titkos kulcsokat l�trehoztam �s al��rtam.\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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"
@@ -1943,34 +1966,63 @@ msgstr ""
"k�v�n ilyen c�lra l�trehozni, azt az \"--edit-key\" parancs seg�ts�g�vel\n"
"teheti meg.\n"
-#: g10/keygen.c:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Kulcsgener�l�s sikertelen: %s\n"
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
-#: g10/keygen.c:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
"A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"MEGJEGYZ�S: Alkulcsok l�trehoz�sa v3 kulcsokhoz nem OpenPGP-megfelel�.\n"
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "Val�ban l�trehozzam? "
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
+
+#: g10/keygen.c:3248
+#, fuzzy, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "MEGJEGYZ�S: %08lX titkos kulcs %s-kor lej�rt.\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
@@ -1981,7 +2033,7 @@ msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
msgid "%s: can't open: %s\n"
msgstr "%s-t nem tudom megnyitni: %s.\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
@@ -2010,6 +2062,11 @@ msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
msgstr ""
"Csak 2048 bites, vagy r�videbb RSA kulcsokkal titkos�that --pgp2 m�dban!\n"
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "Nem tudom megnyitni %s-t: %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -2020,22 +2077,30 @@ msgid ""
"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
msgstr "Nem tudom az IDEA rejtjelez�t haszn�lni az �sszes c�mzett kulcshoz.\n"
-#: g10/encode.c:526 g10/encode.c:721
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#: g10/encode.c:526
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "A %s (%d) rejtjelez� haszn�lata s�rti a c�mzett preferenci�it!\n"
-#: g10/encode.c:634 g10/sign.c:863
-#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+#: g10/encode.c:634 g10/sign.c:864
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
msgstr "A %s (%d) t�m�r�t�s haszn�lata s�rti a c�mzett preferenci�it!\n"
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "A %s (%d) rejtjelez� haszn�lata s�rti a c�mzett preferenci�it!\n"
+
#: g10/encode.c:818
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s titkos�tva \"%s\" sz�m�ra\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
@@ -2068,8 +2133,9 @@ msgstr "FIGYELEM: Semmit sem export�ltam.\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "T�l sok bejegyz�s van a nyilv�noskulcs-gyors�t�t�rban - letiltom.\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+#, fuzzy
+msgid "[User ID not found]"
msgstr "[ismeretlen kulcs]"
#: g10/getkey.c:1614
@@ -2225,7 +2291,7 @@ msgstr "%08lX kulcs: HKP alkulcss�r�l�s kijav�tva.\n"
#: g10/import.c:722
#, fuzzy, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "%08lX kulcs: Nem �nal��rt felh. azonos�t� (\"%s\") elfogadva.\n"
#: g10/import.c:728
@@ -2252,7 +2318,7 @@ msgstr "%08lX kulcs: �j kulcs - kihagytam.\n"
msgid "no writable keyring found: %s\n"
msgstr "Nem �rhat� kulcskarik�t tal�ltam: %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "�rok a \"%s\" �llom�nyba.\n"
@@ -2365,14 +2431,14 @@ msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t� ehhez az al��r�shoz!\n"
#: g10/import.c:1299
#, fuzzy, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� alg. a \"%s\" felh. "
"azonos�t�n!\n"
#: g10/import.c:1301
#, fuzzy, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "%08lX kulcs: �rv�nytelen �nal��r�s a \"%s\" felh. azonos�t�n!\n"
#: g10/import.c:1319
@@ -2412,7 +2478,7 @@ msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsvisszavon�st.\n"
#: g10/import.c:1439
#, fuzzy, c-format
-msgid "key %s: skipped user ID '%s'\n"
+msgid "key %s: skipped user ID \"%s\"\n"
msgstr "%08lX kulcs: Kihagytam a felh. azonos�t�t: '"
#: g10/import.c:1460
@@ -2422,7 +2488,7 @@ msgstr "%08lX kulcs: Alkulcsot kihagytam.\n"
#: g10/import.c:1487
#, fuzzy, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "%08lX kulcs: Nem export�lhat� al��r�s (%02x. oszt�ly) - kihagytam.\n"
#: g10/import.c:1497
@@ -2457,114 +2523,114 @@ msgstr ""
"FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
"leh�vom a %08lX visszavon� kulcsot.\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
"visszavon� kulcs (%08lX) nincs jelen.\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st hozz�adtam.\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[visszavon�s]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[�nal��r�s]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "1 rossz al��r�s.\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d rossz al��r�s.\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "1 al��r�st nem ellen�riztem hi�nyz� kulcs miatt.\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d al��r�st nem ellen�riztem hi�nyz� kulcs miatt.\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "1 al��r�st nem ellen�riztem hiba miatt.\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d al��r�st nem ellen�riztem hiba miatt.\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "1 felhaszn�l�azonos�t�t tal�ltam �rv�nyes �nal��r�s n�lk�l.\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "%d felhaszn�l�azonos�t�t tal�ltam �rv�nyes �nal��r�s n�lk�l.\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, fuzzy, c-format
msgid " (%d) I trust marginally\n"
msgstr " %d = r�szlegesen megb�zom benne\n"
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, fuzzy, c-format
msgid " (%d) I trust fully\n"
msgstr " %d = teljesen megb�zom benne\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Biztos abban, hogy tov�bbra is al� akarja �rni? (i/N) "
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr " Nem tudom al��rni.\n"
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "\"%s\" felhaszn�l�i azonos�t� lej�rt."
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2573,11 +2639,11 @@ msgstr ""
"\"%s\" �nal��r�sa\n"
"PGP 2.x st�lus�.\n"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Szeretn� �talak�tani OpenPGP �nal��r�ss�? (i/N) "
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2586,11 +2652,11 @@ msgstr ""
"Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
"kulcson lej�rt.\n"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Szeretne kiadni egy �j al��r�st, amellyel lecser�li a lej�rtat? (i/N) "
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2599,54 +2665,54 @@ msgstr ""
"Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
"kulcson helyi al��r�s.\n"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Szeretn� �talak�tani teljes, export�lhat� al��r�ss�? (i/N) "
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" m�r al� lett �rva helyileg a %08lX kulccsal!\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" m�r al� lett �rva a %08lX kulccsal!\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "M�g egyszer al� akarja �rni? (i/N) "
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nincs mit al��rni a %08lX kulccsal!\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "Ez a kulcs lej�rt!"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Ez a kulcs lej�r: %s.\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Szeretn�, ha az al��r�sa ugyanekkor j�rna le? (I/n) "
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
msgstr ""
"Lehet, hogy nem rakhat OpenPGP al��r�st egy PGP 2.x kulcsra --pgp2 m�dban.\n"
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "Ez haszn�lhatatlann� tenn� a kulcsot PGP 2.x-ben.\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2655,31 +2721,31 @@ msgstr ""
"Mennyire gondosan ellen�rizte, hogy a kulcs, melyet al��rni k�sz�l, val�ban\n"
"a fent nevezett szem�lyhez tartozik? Ha nem tudja a v�laszt, �rjon \"0\"-t!\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Nem v�laszolok.%s\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Egy�ltal�n nem ellen�riztem.%s\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) A szok�sos ellen�rz�seket v�geztem.%s\n"
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Nagyon alaposan ellen�riztem.%s\n"
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr "Mi a v�lasza? (Adjon meg \"?\"-et magyar�zathoz!): "
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2687,7 +2753,7 @@ msgstr ""
"Teljesen biztos abban, hogy al� akarja �rni ezt a kulcsot\n"
"az �n kulcs�val: \""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2695,7 +2761,7 @@ msgstr ""
"\n"
"Ez egy �nal��r�s lesz.\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2703,7 +2769,7 @@ msgstr ""
"\n"
"FIGYELEM: Az al��r�s nem lesz \"nem export�lhat�k�nt\" megjel�lve.\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2711,7 +2777,7 @@ msgstr ""
"\n"
"FIGYELEM: Az al��r�s nem lesz \"nem visszavonhat�k�nt\" megjel�lve.\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2719,7 +2785,7 @@ msgstr ""
"\n"
"Az al��r�st \"nem export�lhat�nak\" jel�lj�k.\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2727,7 +2793,7 @@ msgstr ""
"\n"
"Az al��r�st \"nem visszavonhat�nak\" jel�lj�k.\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2735,7 +2801,7 @@ msgstr ""
"\n"
"Egy�ltal�n nem ellen�riztem ezt a kulcsot.\n"
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2743,7 +2809,7 @@ msgstr ""
"\n"
"A szok�sos m�don ellen�riztem ezt a kulcsot.\n"
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2751,34 +2817,34 @@ msgstr ""
"\n"
"Nagyon gondosan ellen�riztem ezt a kulcsot.\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "Val�ban al��rja? "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "Al��r�s sikertelen: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "Ez a kulcs nem v�dett.\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "A kulcs v�dett.\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Nem tudom szerkeszteni ezt a kulcsot: %s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2786,7 +2852,7 @@ msgstr ""
"�rja be az �j jelsz�t ehhez a titkos kulcshoz!\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2794,544 +2860,566 @@ msgstr ""
"�n nem akar jelsz�t. Ez val�sz�n�leg *rossz* �tlet!\n"
"\n"
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "Val�ban ezt akarja? "
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "�trakom a kulcsal��r�st a megfelel� helyre.\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "kil�p�s ebb�l a men�b�l"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "q"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "save"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "ment�s �s kil�p�s"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "help"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "megmutatja ezt a s�g�t"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "megmutatja az ujjlenyomatot"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "list"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "kilist�zza a kulcs- �s felhaszn�l�azonos�t�kat"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "key"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "N. m�sodlagos kulcs kiv�laszt�sa"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "check"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "al��r�sok kilist�z�sa"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "c"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "kulcs al��r�sa"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "s"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "tsign"
msgstr "sign"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "make a trust signature"
msgstr "k�l�n�ll� al��r�s k�sz�t�se"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "kulcs helyi al��r�sa"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr "kulcs nem visszavonhat� al��r�sa"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "sign the key locally and non-revocably"
msgstr "kulcs nem visszavonhat� helyi al��r�sa"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "felhaszn�l�i azonos�t� hozz�ad�sa"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr "addphoto"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr "fot�azonos�t� hozz�ad�sa"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "felhaszn�l�i azonos�t� t�rl�se"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr "delphoto"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "m�sodlagos kulcs (alkulcs) hozz�ad�sa"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+#, fuzzy
+msgid "addcardkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "m�sodlagos kulcs t�rl�se"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "addrevoker"
msgstr "addrevoker"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "add a revocation key"
msgstr "visszavon� kulcs hozz�ad�sa"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "al��r�sok t�rl�se"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "lej�rat megv�ltoztat�sa"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr "primary"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr "felhaszn�l�azonos�t� megjel�l�se els�dlegesk�nt"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "v�lt�s a titkos �s a nyilv�nos kulcs list�z�sa k�z�tt"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "t"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr "preferenci�k list�z�sa (szak�rt�)"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr "preferenci�k list�z�sa (r�szletes)"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr "preferencialista be�ll�t�sa"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr "preferenci�k friss�t�se"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "keyserver"
msgstr "kulcsszerverhiba"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "set preferred keyserver URL"
msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "jelsz�v�ltoztat�s"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "al��r�sok visszavon�sa"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revuid"
msgstr "revuid"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revoke a user ID"
msgstr "felhaszn�l�i azonos�t� visszavon�sa"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "m�sodlagos kulcs visszavon�sa"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "kulcs tilt�sa"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "kulcs enged�lyez�se"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr "showphoto"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr "fot�azonos�t� megmutat�sa"
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban!\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "Hiba \"%s\" titkoskulcs-blokk olvas�sakor: %s.\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "Titkos kulcs rendelkez�sre �ll.\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "Parancs> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "Ehhez sz�ks�g van a titkos kulcsra.\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr "K�rem, haszn�lja el�bb a \"toggle\" parancsot!\n"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
msgid "Key is revoked."
msgstr "A kulcsot visszavont�k."
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "Val�ban al��rja az �sszes felhaszn�l�azonos�t�t? "
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "Javaslat: V�lassza ki az al��rni k�v�nt felhaszn�l�azonos�t�kat!\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Ez a parancs %s m�dban nem enged�lyezett.\n"
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "Legal�bb egy felhaszn�l�azonos�t�t ki kell v�lasztania!\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "Nem t�r�lheti az utols� felhaszn�l�azonos�t�t!\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "Val�ban elt�vol�tja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "Val�ban elt�vol�tja ezt a felhaszn�l�azonos�t�t? "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+#, fuzzy
+msgid "Really move the primary key? "
+msgstr "Val�ban elt�vol�tja ezt a felhaszn�l�azonos�t�t? "
+
+#: g10/keyedit.c:1598
+#, fuzzy
+msgid "You must select exactly one key.\n"
+msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "Val�ban t�rli a kiv�lasztott kulcsokat? "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "Val�ban t�rli ezt a kulcsot? "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
msgid "Really revoke all selected user IDs? "
msgstr "Val�ban visszavonja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
msgid "Really revoke this user ID? "
msgstr "Val�ban visszavonja ezt a felhaszn�l�azonos�t�t? "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "Val�ban visszavonja a kijel�lt kulcsokat? "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "Val�ban visszavonja ezt a kulcsot? "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
#, fuzzy
msgid "Set preference list to:\n"
msgstr "preferencialista be�ll�t�sa"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr "Val�ban friss�tsem a preferenci�kat? "
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "Mentsem a v�ltoztat�sokat? "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "Kil�pjek ment�s n�lk�l? "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "Friss�t�s sikertelen: %s.\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "A kulcs nem v�ltozott, nincs sz�ks�g friss�t�sre.\n"
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr "Kivonat: "
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr "Jellemz�k: "
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keyedit.c:2219
#, c-format
msgid "This key may be revoked by %s key "
msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr " (�rz�keny)"
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "%s nem hozhat� l�tre: %s\n"
-#: g10/keyedit.c:2084
-#, fuzzy, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
msgstr "[visszavont] "
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
-msgstr " [lej�r: %s]"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
+msgstr "expire"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2246
#, fuzzy, c-format
-msgid "expires: %s"
-msgstr " [lej�r: %s]"
+msgid "usage: %s"
+msgstr " bizalom: %c/%c"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, fuzzy, c-format
msgid "trust: %s"
msgstr " bizalom: %c/%c"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "Ez a kulcs tiltott."
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! Alkulcsot visszavont�k: %s.\n"
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
-msgstr "rev- Hamis visszavon�st tal�ltam!\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? Nem tudom ellen�rizni a visszavon�st: %s.\n"
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-#, fuzzy
-msgid "revoked"
-msgstr "[visszavont] "
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-#, fuzzy
-msgid "expired"
-msgstr "expire"
+#: g10/keyedit.c:2300
+msgid "card-no: "
+msgstr ""
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Nincsenek preferenci�k egy PGP 2.x felhaszn�l�azonos�t�n!\n"
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3339,15 +3427,7 @@ msgstr ""
"K�rem, vegye figyelembe, hogy az itt l�that� kulcs �rv�nyess�ge nem\n"
"felt�tlen�l helyes, am�g �jra nem ind�tja a programot!\n"
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-msgid "[revoked] "
-msgstr "[visszavont] "
-
-#: g10/keyedit.c:2274
-msgid "[expired] "
-msgstr "[lej�rt] "
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@ -3355,7 +3435,7 @@ msgstr ""
"FIGYELEM: Nincs kijel�lt els�dleges felhaszn�l�azonos�t�. Ez a parancs\n"
" azt okozhatja, hogy egy m�sik azonos�t� lesz els�dlegesk�nt haszn�lva.\n"
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3365,45 +3445,45 @@ msgstr ""
"okozhatja,\n"
" hogy a PGP egyes verzi�i visszautas�tj�k ezt a kulcsot.\n"
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Tov�bbra is hozz� akarja adni? (i/N) "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Lehet, hogy nem adhat fot�azonos�t�t egy PGP2 st�lus� kulcshoz!\n"
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "T�rli ezt a j� al��r�st? (i/N/k)"
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "T�rli ezt az �rv�nytelen al��r�st? (i/N/k)"
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "T�rli ezt az ismeretlen al��r�st? (i/N/k)"
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "Val�ban t�rli ezt az �nal��r�st? (i/N)"
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "T�r�ltem %d al��r�st.\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "T�r�ltem %d al��r�st.\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "Nem t�r�ltem semmit.\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3413,90 +3493,100 @@ msgstr ""
" azt okozhatja, hogy egyes PGP verzi�k visszautas�tj�k ezt a "
"kulcsot!\n"
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"Lehet, hogy nem adhat kijel�lt visszavon�t egy PGP 2.x-st�lus� kulcshoz.\n"
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
msgid "Enter the user ID of the designated revoker: "
msgstr "�rja be a kijel�lt visszavon� felhaszn�l�azonos�t�j�t: "
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "Nem adhat meg PGP 2.x st�lus� kulcsot kijel�lt visszavon�nak!\n"
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "Nem adhat meg egy kulcsot saj�t kijel�lt visszavon�j�nak!\n"
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "FIGYELEM: Ezt a kulcsot a kijel�lt visszavon� visszavonta!\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"FIGYELEM: A kijel�lt visszavon� kulcs megad�sa nem csin�lhat� vissza!\n"
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr "Biztosan ez a kulcs legyen a kijel�lt visszavon�? (i/N): "
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "K�rem, t�vol�tsa el a kijel�l�seket a titkos kulcsokr�l!\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "Maximum egy m�sodlagos kulcsot jel�lj�n ki, k�rem!\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "M�sodlagos kulcs lej�rati idej�nek v�ltoztat�sa.\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "Els�dleges kulcs lej�rati idej�nek v�ltoztat�sa.\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
msgid "Please select exactly one user ID.\n"
msgstr "K�rem, v�lasszon ki pontosan egy felhaszn�l�azonos�t�t!\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
-#, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "Kihagyom a v3 �nal��r�st a \"%s\" felhaszn�l�azonos�t�n.\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+#, fuzzy
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
+
+#: g10/keyedit.c:3480
+#, fuzzy
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Nincs %d index� m�sodlagos kulcs!\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "Felhaszn�l�azonos�t�: \""
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3505,7 +3595,7 @@ msgstr ""
"\"\n"
"Al��rva az �n %08lX kulcs�val %s id�pontban.\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3514,143 +3604,127 @@ msgstr ""
"\"\n"
"Helyileg al��rva az �n %08lX kulcs�val %s id�pontban.\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Biztos benne, hogy m�gis visszavonja? (i/N) "
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Csin�ljunk egy visszavon� igazol�st ehhez az al��r�shoz? (i/N) "
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "�n al��rta a k�vetkez� felhaszn�l�azonos�t�kat:\n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid " signed by %s on %s%s%s\n"
msgstr " al��rva %08lX �ltal %s%s%s id�pontban.\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid " revoked by %s on %s\n"
msgstr " visszavonva %08lX �ltal %s id�pontban.\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "A k�vetkez� al��r�sokat fogja visszavonni:\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, fuzzy, c-format
msgid " signed by %s on %s%s\n"
msgstr " al��rva %08lX �ltal %s%s id�pontban.\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr " (nem export�lhat�)"
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
msgid "Really create the revocation certificates? (y/N) "
msgstr "Val�ban l�trehozzam a visszavon� igazol�st? (i/N) "
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "Nincs titkos kulcs.\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"FIGYELEM: A felhaszn�l�azonos�t�t %d m�sodperccel a j�v�ben �rt�k al�.\n"
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "%s fot�azonos�t� (m�ret: %ld, kulcs: 0x%08lX, felh: %d) mutat�sa.\n"
-#: g10/keylist.c:179
+#: g10/keylist.c:180
msgid "Critical signature policy: "
msgstr "Kritikus al��r�si elj�r�sm�d: "
-#: g10/keylist.c:181
+#: g10/keylist.c:182
msgid "Signature policy: "
msgstr "Al��r�si elj�r�sm�d: "
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "FIGYELEM: �rv�nytelen jel�l� adatot tal�ltam.\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
msgid "Critical signature notation: "
msgstr "Kritikus al��r�s-jel�l�s: "
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr "Al��r�s-jel�l�s: "
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr "nem olvashat� forma"
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr "Kulcskarika"
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr " [lej�r: %s]"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr " [lej�r: %s]"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, fuzzy, c-format
-msgid " [revoked: %s]"
-msgstr "[visszavont] "
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
msgid "Primary key fingerprint:"
msgstr "Els�dlegeskulcs-ujjlenyomat:"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
msgid " Subkey fingerprint:"
msgstr " Alkulcsujjlenyomat:"
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
msgid " Primary key fingerprint:"
msgstr "Els�dlegeskulcs-ujjlenyomat:"
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
msgid " Subkey fingerprint:"
msgstr " Alkulcsujjlenyomat:"
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr " Kulcs ujjlenyomata ="
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3858,80 +3932,80 @@ msgstr "R�gi st�lus� (PGP 2.x) al��r�s.\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "�rv�nytelen gy�k�rcsomagot tal�ltam a proc_tree() f�ggv�nyben!\n"
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "Nem tudom letiltani a core f�jlokat: %s.\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "Nem szabadna k�s�rleti algoritmusokat haszn�lni!\n"
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"Ez a rejtjelez� algoritmus nem aj�nlott. K�rem, haszn�ljon szabv�nyosabbat!\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr "Az IDEA rejtjelez� b�v�t�s nincs jelen!\n"
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr ""
"Tov�bbi inform�ci�t a http://www.gnupg.org/why-not-idea.html oldalon tal�l.\n"
-#: g10/misc.c:491
+#: g10/misc.c:517
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: Elavult opci�: \"%s\"\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "K�rem, ezt haszn�lja helyette: \"%s%s\"\n"
-#: g10/misc.c:508
+#: g10/misc.c:534
msgid "Uncompressed"
msgstr "t�m�r�tetlen"
-#: g10/misc.c:533
+#: g10/misc.c:559
#, fuzzy
msgid "uncompressed|none"
msgstr "t�m�r�tetlen"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "Lehet, hogy ez az �zenet haszn�lhatatlan a %s sz�m�ra!\n"
-#: g10/misc.c:777
+#: g10/misc.c:826
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "Nem tudom kezelni a(z) %d. sz�m� nyilv�nos kulcs� algoritmust!\n"
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"FIGYELEM: A rejtjelezett munkafolyamat-kulcs lehet, hogy nem biztons�gos!\n"
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "A %d t�pus� alcsomag kritikus bitje be�ll�tott.\n"
@@ -3970,7 +4044,7 @@ msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "Kommunik�ci�s probl�ma a gpg �gyn�kkel!\n"
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr "Probl�ma van az �gyn�kkel. Letiltom a haszn�lat�t.\n"
@@ -4009,24 +4083,24 @@ msgstr "A jelsz� t�l hossz�!\n"
msgid "invalid response from agent\n"
msgstr "�rv�nytelen v�lasz az �gyn�kt�l!\n"
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "Nem tudok jelsz�t bek�rni k�tegelt m�dban!\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "�rja be a jelsz�t: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4037,24 +4111,24 @@ msgstr ""
"haszn�lat�hoz:\n"
"\""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u bites %s kulcs, azonos�t�: %08lX, l�trehozva: %s."
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr ""
" \n"
" (f� kulcsazonos�t�: %08lX)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "Ism�telje meg a jelsz�t: "
@@ -4277,28 +4351,39 @@ msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
"K�l�n�ll� al��r�st PGP 2.x st�lus� kulcsokkal csak --pgp2 m�dban k�sz�thet!\n"
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
-msgstr "%s nem hozhat� l�tre: %s\n"
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
+msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
-#: g10/sign.c:794
-#, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+#: g10/sign.c:771 g10/sign.c:1008
+#, fuzzy, c-format
+msgid "writing to file `%s'\n"
+msgstr "�rok a \"%s\" �llom�nyba.\n"
+
+#: g10/sign.c:795
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
"a c�mzett preferenci�ival.\n"
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr "Al��rom:"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
"Olvashat� sz�veget PGP 2.x st�lus� kulccsal csak --pgp2 m�dban �rhat al�!\n"
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s titkos�t�st fogok haszn�lni.\n"
@@ -4698,7 +4783,7 @@ msgstr ""
"Nem tudom elker�lni a gyenge kulcsot a szimmetrikus titkos�t�hoz.\n"
"%d alkalommal pr�b�ltam!\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "A DSA 160 bites hash (kivonatol�) algoritmust ig�nyel.\n"
@@ -5067,17 +5152,17 @@ msgstr "Nem �ll rendelkez�sre seg�ts�g."
msgid "No help available for `%s'"
msgstr "Nem �ll rendelkez�sre seg�ts�g \"%s\" t�m�hoz."
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr "\"%s\" kulcskarik�t l�trehoztam.\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
@@ -5120,8 +5205,7 @@ msgstr "%lu kulcsot ellen�riztem (%lu al��r�ssal).\n"
msgid "%s: keyring created\n"
msgstr "%s: Kulcskarik�t l�trehoztam.\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5135,29 +5219,34 @@ msgstr ""
"k�pet haszn�l, a kulcsa is nagyon nagy lesz!\n"
"A 240x288 k�r�li k�pm�ret j�l haszn�lhat�.\n"
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr "Adja meg egy JPEG f�jl nev�t a fot�azonos�t�hoz: "
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "Nem tudom megnyitni a \"%s\" fot�t: %s.\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
msgid "Are you sure you want to use it (y/N)? "
msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr "\"%s\" nem JPEG �llom�ny.\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Is this photo correct (y/N/q)? "
msgstr "Ez a fot� megfelel� (i/N/k)? "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
msgid "unable to display photo ID!\n"
msgstr "Nem tudom megjelen�teni a fot�azonos�t�t!\n"
@@ -5178,45 +5267,51 @@ msgstr ""
"nem biztons�gosak.\n"
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
+#, fuzzy
+msgid "this platform requires temporary files when calling external programs\n"
msgstr ""
"Ez a platform �tmeneti �llom�nyokat ig�nyel k�ls� programok h�v�s�hoz.\n"
-#: g10/exec.c:432
-#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
msgstr "Nem tudom v�grehajtani a k�vetkez� \"%s\"-t: \"%s\": %s.\n"
-#: g10/exec.c:513
+#: g10/exec.c:436
+#, fuzzy, c-format
+msgid "unable to execute shell `%s': %s\n"
+msgstr "Nem tudom v�grehajtani a k�vetkez� \"%s\"-t: \"%s\": %s.\n"
+
+#: g10/exec.c:515
#, c-format
msgid "system error while calling external program: %s\n"
msgstr "Rendszerhiba k�ls� program h�v�sakor: %s.\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr "A k�ls� program nem term�szetes m�don �rt v�get.\n"
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr "Nem tudom a v�grehajtani a k�ls� programot.\n"
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr "Nem tudom beolvasni a k�ls� program v�lasz�t: %s\n"
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr ""
"FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "FIGYELEM: nem tudom t�r�lni a \"%s\" �tmeneti k�nyvt�rat: %s\n"
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr "soha "
@@ -5371,6 +5466,47 @@ msgstr "Hiba bizalmi rekord keres�sekor: %s.\n"
msgid "read error: %s\n"
msgstr "Olvas�si hiba: %s.\n"
+#, fuzzy
+#~ msgid "revoked: %s"
+#~ msgstr "[visszavont] "
+
+#, fuzzy
+#~ msgid "expired: %s"
+#~ msgstr " [lej�r: %s]"
+
+#, fuzzy
+#~ msgid "expires: %s"
+#~ msgstr " [lej�r: %s]"
+
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "rev! Alkulcsot visszavont�k: %s.\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "rev- Hamis visszavon�st tal�ltam!\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "rev? Nem tudom ellen�rizni a visszavon�st: %s.\n"
+
+#~ msgid "[revoked] "
+#~ msgstr "[visszavont] "
+
+#~ msgid "[expired] "
+#~ msgstr "[lej�rt] "
+
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr " [lej�r: %s]"
+
+#~ msgid " [expires: %s]"
+#~ msgstr " [lej�r: %s]"
+
+#, fuzzy
+#~ msgid " [revoked: %s]"
+#~ msgstr "[visszavont] "
+
+#~ msgid "can't create %s: %s\n"
+#~ msgstr "%s nem hozhat� l�tre: %s\n"
+
#~ msgid ""
#~ "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n"
#~ msgstr ""
diff --git a/po/id.po b/po/id.po
index 0831030dd..a411efe60 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-id\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
"PO-Revision-Date: 2004-06-17 16:32+0700\n"
"Last-Translator: Tedi Heriyanto <[email protected]>\n"
"Language-Team: Indonesian <[email protected]>\n"
@@ -49,7 +49,7 @@ msgstr "n|t|tidak"
msgid "nN"
msgstr "tT"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "q|k|keluar"
@@ -282,6 +282,16 @@ msgstr "kunci rahasia tidak dapat dipakai"
msgid "keyserver error"
msgstr "kesalahan keyserver"
+#: util/errors.c:108
+#, fuzzy
+msgid "canceled"
+msgstr "Batal"
+
+#: util/errors.c:109
+#, fuzzy
+msgid "no card"
+msgstr "tidak dienkripsi"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr ""
@@ -304,7 +314,7 @@ msgstr "anda menemukan kesalahan ...(%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "modul entropi gathering tidak terdeteksi\n"
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "tidak dapat membuka `%s': %s\n"
@@ -336,7 +346,7 @@ msgstr "tidak dapat membaca `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "catatan: file random_seed tidak diupdate\n"
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr "tidak dapat membuat %s: %s\n"
@@ -405,7 +415,7 @@ msgstr "tidak dapat membuat bilangan prima dengan bit kurang dari %d\n"
msgid "can't generate a prime with less than %d bits\n"
msgstr "tidak dapat membuat bilangan prima dengan bit kurang dari %d\n"
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -413,128 +423,128 @@ msgstr ""
"@Perintah:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[file]|buat signature"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[file]|buat signature teks"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "buat detached signature"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "enkripsi data"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "enkripsi hanya dengan symmetric cipher"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "dekripsi data (default)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "verifikasi signature"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "tampilkan kunci"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "tampilkan kunci dan signature"
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "periksa signature kunci"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "tampilkan kunci dan fingerprint"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "tampilkan kunci rahasia"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "buat sepasang kunci baru"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "hapus kunci dari keyring publik"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "hapus kunci dari keyring pribadi"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "tandai kunci"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "tandai kunci secara lokal"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "tandai atau edit kunci"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "buat sertifikat revokasi"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "ekspor kunci"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "ekspor kunci ke key server"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "impor kunci dari key server"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "cari kunci di key server"
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "update semua kunci dari keyserver"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "impor/gabung kunci"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "perbarui database trust"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|algo [file]|cetak digest pesan"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -544,55 +554,51 @@ msgstr ""
"Pilihan:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "ciptakan output ascii"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|NAMA|enkripsi untuk NAMA"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr "gunakan id-user ini untuk menandai/dekripsi"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr "|N|set tingkat kompresi N (0 tidak ada)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "gunakan mode teks kanonikal"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "gunakan sebagai file output"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "detil"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "jangan buat perubahan"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "tanya sebelum menimpa"
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -600,7 +606,7 @@ msgstr ""
"@\n"
"(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -620,15 +626,15 @@ msgstr ""
" --list-keys [nama] tampilkan kunci\n"
" --fingerprint [nama] tampilkan fingerprint\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Laporkan bug ke <[email protected]>.\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -638,7 +644,7 @@ msgstr ""
"tandai, cek, enkripsi atau dekripsi\n"
"operasi baku tergantung pada data input\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -646,477 +652,471 @@ msgstr ""
"\n"
"Algoritma yang didukung:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr "Pubkey: "
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr "Cipher: "
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr "Hash: "
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
msgid "Compression: "
msgstr "Kompresi: "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "pemakaian: gpg [pilihan] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "perintah saling konflik\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
-#: g10/g10.c:1205
+#: g10/g10.c:1210
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
-#: g10/g10.c:1334
-#, c-format
-msgid "unknown configuration item \"%s\"\n"
+#: g10/g10.c:1354
+#, fuzzy, c-format
+msgid "unknown configuration item `%s'\n"
msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "file pilihan `%s': %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "membaca pilihan dari `%s'\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
-#: g10/g10.c:1887
-#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+#: g10/g10.c:2021
+#, fuzzy, c-format
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr "ekstensi cipher \"%s\" tidak dimuat karena permisi tidak aman\n"
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "%s bukanlah set karakter yang valid\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "tidak dapat memparsing URI keyserver\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opsi ekspor tidak valid\n"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opsi impor tidak valid\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
msgid "invalid import options\n"
msgstr "opsi impor tidak valid\n"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
msgid "invalid export options\n"
msgstr "opsi ekspor tidak valid\n"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opsi impor tidak valid\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "opsi impor tidak valid\n"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "opsi ekspor tidak valid\n"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "tidak dapat menset path exec ke %s\n"
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "PERINGATAN: program mungkin membuat file core!\n"
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "PERINGATAN: %s menimpa %s\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s tidak dibolehkan dengan %s!\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s tidak masuk akal dengan %s!\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"anda hanya dapat membuat signature detached atau clear saat dalam mode --"
"pgp2\n"
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
"anda tidak dapat menandai dan mengenkripsi pada saat bersamaan dalam mode --"
"pgp2\n"
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"anda harus menggunakan file (dan bukan pipe) saat bekerja dengan opsi --"
"pgpg2\n"
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n"
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritma cipher yang dipilih tidak valid\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "algoritma digest yang dipilih tidak valid\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "algoritma cipher yang dipilih tidak valid\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
msgid "selected certification digest algorithm is invalid\n"
msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed harus lebih dari 0\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed harus lebih dari 1\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth harus di antara 1 hingga 255\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "level cert default tidak valid; harus 0, 1, 2, atau 3\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "level cert min tidak valid; harus 0, 1, 2, atau 3\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
msgid "invalid default preferences\n"
msgstr "preferensi baku tidak valid\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
msgid "invalid personal cipher preferences\n"
msgstr "preferensi cipher personal tidak valid\n"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
msgid "invalid personal digest preferences\n"
msgstr "preferensi digest personal tidak valid\n"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
msgid "invalid personal compress preferences\n"
msgstr "preferensi kompresi personal tidak valid\n"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s belum dapat dipakai dengan %s\n"
-#: g10/g10.c:2680
-#, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2797
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr ""
"anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
-#: g10/g10.c:2685
-#, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2802
+#, fuzzy, c-format
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr ""
"anda tidak boleh menggunakan algoritma digest \"%s\" saat dalam mode %s.\n"
-#: g10/g10.c:2690
-#, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2807
+#, fuzzy, c-format
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr ""
"anda tidak boleh menggunakan algoritma kompresi \"%s\" saat dalam mode %s.\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public "
"key \n"
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [namafile]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [namafile]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [namafile]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [namafile]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [namafile]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [namafile]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [namafile]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [namafile]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [namafile]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [namafile]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key id-user"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key id-user"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrsign-key user-id"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key user-id"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-user [perintah]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "tidak dapat membuka %s: %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id-user] [keyring]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "Pengiriman keyserver gagal: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "Penerimaan keyserver gagal: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, c-format
msgid "key export failed: %s\n"
msgstr "Ekspor kunci gagal: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Pencarian keyserver gagal: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Refresh keyserver gagal: %s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "gagal dearmoring: %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "gagal enarmoring: %s\n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritma hash tidak valid `%s'\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[namafile]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "Teruskan dan ketikkan pesan anda ....\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "tidak dapat membuka `%s'\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@ -1124,48 +1124,48 @@ msgstr ""
"nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, "
"dan diakhiri dengan sebuah '='\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
msgid "a user notation name must contain the '@' character\n"
msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
-#: g10/g10.c:3747
+#: g10/g10.c:3863
#, fuzzy
-msgid "the given signature preferred keyserver URL is invalid\n"
+msgid "the given preferred keyserver URL is invalid\n"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "lebih diam"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
msgid "take the keys from this keyring"
msgstr "mengambil kunci ini dari keyring"
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
msgid "make timestamp conflicts only a warning"
msgstr "buat timestamp konflik hanya sebagai peringatan"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr "|FD|tulis info status ke FD ini"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Pemakaian: gpgv [opsi] [file] (-h untuk bantuan)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1199,12 +1199,13 @@ msgid "invalid dash escaped line: "
msgstr "dash escaped line tidak valid: "
#: g10/armor.c:565
-msgid "unexpected armor:"
+#, fuzzy
+msgid "unexpected armor: "
msgstr "armor tidak terduga:"
-#: g10/armor.c:695 g10/armor.c:1276
-#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+#: g10/armor.c:695 g10/armor.c:1280
+#, fuzzy, c-format
+msgid "invalid radix64 character %02X skipped\n"
msgstr "karakter radix64 tidak valid %02x dilewati\n"
#: g10/armor.c:738
@@ -1215,33 +1216,34 @@ msgstr "eof prematur (tanpa CRC)\n"
msgid "premature eof (in CRC)\n"
msgstr "eof prematur (dalam CRC)\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "CRC tidak tepat\n"
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "kesalahan CRC; %06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+#, fuzzy
+msgid "premature eof (in trailer)\n"
msgstr "eof prematur (dalam Trailer)\n"
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "kesalahan dalam garis trailer\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "tidak ditemukan data OpenPGP yang valid.\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "armor tidak valid: baris melebihi %d karakter\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1297,7 +1299,7 @@ msgstr " alias \""
msgid " aka \""
msgstr " alias \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1548,96 +1550,116 @@ msgstr "%s: dilewati: kunci publik dimatikan\n"
msgid "no valid addressees\n"
msgstr "tidak ada alamat yang valid\n"
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "preferensi %c%lu ganda \n"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "terlalu banyak preferensi `%c'\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
#, fuzzy
msgid "too many digest preferences\n"
msgstr "terlalu banyak preferensi `%c'\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
#, fuzzy
msgid "too many compression preferences\n"
msgstr "terlalu banyak preferensi `%c'\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "Karakter tidak valid dalam string preferensi\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
msgid "writing direct signature\n"
msgstr "menulis signature direct\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "menulis self signature\n"
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "menulis key binding signature\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "keysize tidak valid; menggunakan %u bit\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "keysize dibulatkan hingga %u bit\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "Silakan pilih kunci yang anda inginkan:\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA dan ElGamal (baku)\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (hanya menandai)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (hanya enkripsi)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (hanya menandai)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (hanya enkripsi)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (tandai dan enkripsi)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, fuzzy, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) RSA (hanya menandai)\n"
+
+#: g10/keygen.c:1224
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) RSA (tandai dan enkripsi)\n"
+
+#: g10/keygen.c:1226
+#, fuzzy, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) RSA (hanya enkripsi)\n"
+
+#: g10/keygen.c:1228
+#, fuzzy, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) RSA (tandai dan enkripsi)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "Pilihan anda? "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "Pilihan tidak valid.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1650,29 +1672,29 @@ msgstr ""
" keysize default adalah 1024 bit\n"
" keysize tertinggi dianjurkan 2048 bit\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "Keysize yang anda inginkan? (1024) "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA hanya membolehkan keysize dari 512 hingga 1024\n"
-#: g10/keygen.c:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr ""
"keysize terlalu kecil; 1024 adalah nilai terendah yang diijinkan untuk RSA.\n"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
-#: g10/keygen.c:1255
+#: g10/keygen.c:1328
#, 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:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1680,11 +1702,11 @@ msgstr ""
"Keysize lebih besar dari 2048 tidak dianjurkan karena\n"
"komputasi akan sangat lama!\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "Apakah anda yakin memerlukan keysize ini? "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1692,17 +1714,17 @@ msgstr ""
"Oke, tetapi ingat bahwa radiasi monitor dan keyboard anda juga sangat mudah "
"diserang!\n"
-#: g10/keygen.c:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Keysize yang diminta adalah %u bit\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "dibulatkan hingga %u bit\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1718,7 +1740,7 @@ msgstr ""
" <n>m = kunci berakhir dalam n bulan\n"
" <n>y = kunci berakhir dalam n tahun\n"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1734,29 +1756,29 @@ msgstr ""
" <n>m = signature berakhir dalam n bulan\n"
" <n>y = signature berakhir dalam n tahun\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "Kunci valid untuk? (0) "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr "Signature valid untuk? (0) "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "nilai yang tidak valid\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s tidak pernah berakhir\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr "%s berakhir pada %s\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1764,16 +1786,17 @@ msgstr ""
"Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
"Namun, ia dapat menanganinya secara benar hingga 2106.\n"
-#: g10/keygen.c:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "Benar (y/t)? "
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
+#, fuzzy
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
@@ -1783,44 +1806,44 @@ msgstr ""
"user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "Nama sebenarnya: "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "Karakter tidak valid dalam nama\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr "Nama tidak boleh dimulai dengan digit\n"
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr "Nama harus berukuran minimum 5 karakter\n"
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "Alamat email: "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "Bukan alamat email yang valid\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "Komentar: "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "Karakter tidak valid dalam komentar\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Anda menggunakan set karakter `%s'.\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1830,27 +1853,27 @@ msgstr ""
"Anda memilih USER-ID ini:\n"
" \"%s\"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
-#: g10/keygen.c:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoQq"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
-#: g10/keygen.c:1542
+#: g10/keygen.c:1615
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:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr "Silakan perbaiki kesalahan ini dulu\n"
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1858,16 +1881,16 @@ msgstr ""
"Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr "passphrase tidak diulang dengan benar; coba lagi"
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1880,7 +1903,7 @@ msgstr ""
"menggunakan program ini dengan pilihan \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1892,58 +1915,58 @@ msgstr ""
"selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
"yang baik untuk memperoleh entropi.\n"
-#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr "maaf, tidak dapat melakukan hal ini dalam mode batch\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "Keypair DSA akan memiliki 1024 bit.\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "Pembuatan kunci dibatalkan.\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr "menulis kunci publik ke `%s'\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "menulis kunci rahasia ke `%s'\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "menulis kunci rahasia ke `%s'\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "kesalahan menulis keyring publik `%s': %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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"
@@ -1952,33 +1975,62 @@ msgstr ""
"mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
"untuk tujuan ini.\n"
-#: g10/keygen.c:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Pembuatan kunci gagal: %s\n"
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, 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:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, 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:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "CATATAN: membuat subkey bagi kunci-kunci v3 tidak OpenPGP compliant\n"
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "Ingin diciptakan? "
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "gagal menghapus keyblok: %s\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "tidak dapat membuat %s: %s\n"
+
+#: g10/keygen.c:3248
+#, fuzzy, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "--output tidak berfungsi untuk perintah ini\n"
@@ -1989,7 +2041,7 @@ msgstr "--output tidak berfungsi untuk perintah ini\n"
msgid "%s: can't open: %s\n"
msgstr "%s: tidak dapat membuka: %s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
@@ -2019,6 +2071,11 @@ msgstr ""
"anda hanya dapat mengenkripsi ke kunci RSA 2048 bit atau kurang dalam mode --"
"pgp2\n"
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "tidak dapat membuka %s: %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -2030,22 +2087,30 @@ msgid ""
msgstr ""
"tidak dapat menggunakan cipher IDEA untuk semua kunci yang anda enkripsi.\n"
-#: g10/encode.c:526 g10/encode.c:721
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#: g10/encode.c:526
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
-#: g10/encode.c:634 g10/sign.c:863
-#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+#: g10/encode.c:634 g10/sign.c:864
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
msgstr "memaksa algoritma kompresi %s (%d) melanggar preferensi penerima\n"
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
+
#: g10/encode.c:818
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s dienkripsi untuk: %s\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "kunci '%s' tidak ditemukan: %s\n"
@@ -2079,8 +2144,9 @@ msgstr "PERINGATAN: tidak ada yang diekspor\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+#, fuzzy
+msgid "[User ID not found]"
msgstr "[User id tidak ditemukan]"
#: g10/getkey.c:1614
@@ -2233,7 +2299,7 @@ msgstr "kunci %08lX: subkey HKP yang rusak diperbaiki\n"
#: g10/import.c:722
#, fuzzy, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "kunci %08lX: menerima ID user '%s' yang tidak self-signed\n"
#: g10/import.c:728
@@ -2260,7 +2326,7 @@ msgstr "kunci %08lX: kunci baru - dilewati\n"
msgid "no writable keyring found: %s\n"
msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "menulis ke `%s'\n"
@@ -2374,12 +2440,12 @@ msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
#: g10/import.c:1299
#, fuzzy, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "kunci %08lX: algoritma publik key tidak didukung pada user id \"%s\"\n"
#: g10/import.c:1301
#, fuzzy, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "kunci %08lX: self-signature tidak valid pada user id \"%s\"\n"
#: g10/import.c:1319
@@ -2419,7 +2485,7 @@ msgstr "kunci %08lX: hapus pembatalan subkey ganda\n"
#: g10/import.c:1439
#, fuzzy, c-format
-msgid "key %s: skipped user ID '%s'\n"
+msgid "key %s: skipped user ID \"%s\"\n"
msgstr "kunci %08lX: melewati ID user "
#: g10/import.c:1460
@@ -2429,7 +2495,7 @@ msgstr "kunci %08lX: melewati subkey\n"
#: g10/import.c:1487
#, fuzzy, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "kunci %08lX: signature tidak dapat diekpor (kelas %02x) - dilewati\n"
#: g10/import.c:1497
@@ -2463,113 +2529,113 @@ msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"Peringatan: kunci %08lX dapat dibatalkan: mengambil kunci pembatalan %08lX\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"Peringatan: kunci %08lX dapat dibatalkan: kunci pembatalan %08lX tidak ada\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[pembatalan]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[self-signature]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "1 signature yang buruk\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d signature yang buruk\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "1 signature tidak diperiksa karena tidak ada kunci\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d signature tidak diperiksa karena tidak ada kunci\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "1 signature tidak diperiksa karena kesalahan\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d signature tidak diperiksa karena ada kesalahan\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "terdeteksi 1 ID user tanpa self-signature yang valid\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "terdeteksi ID %d user tanpa self-signature yang valid\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, fuzzy, c-format
msgid " (%d) I trust marginally\n"
msgstr " %d = Saya cukup percaya\n"
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, fuzzy, c-format
msgid " (%d) I trust fully\n"
msgstr " %d = Saya sangat percaya\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "User ID \"%s\" dibatalkan."
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Apakah anda yakin masih ingin menandainya? (y/N) "
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr "..Tidak dapat menandai.\n"
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "User ID \"%s\" kadaluwarsa."
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "User ID \"%s\" bukan self-signed."
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2578,11 +2644,11 @@ msgstr ""
"Self-signature pada \"%s\"\n"
"adalah signature bergaya PGP 2.x.\n"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Anda ingin mempromosikannya ke self-signature OpenPGP ? (y/N) "
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2591,13 +2657,13 @@ msgstr ""
"Signature anda saat ini pada \"%s\"\n"
"telah habis berlaku.\n"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Anda ingin mengeluarkan signature baru untuk menggantikan yang telah habis "
"berlaku? (y/N)"
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2606,43 +2672,43 @@ msgstr ""
"Signature anda saat ini pada \"%s\"\n"
"adalah signature.lokal \n"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Apakah anda ingin menjadikannya signature yang full exportable? (y/N)"
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" Sudah ditandai secara lokal dengan kunci %08lX\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" Sudah ditandai dengan kunci %08lX\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Apakah anda ingin menandainya lagi? (y/N) "
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "Kunci ini telah berakhir!"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Kunci ini akan kadaluarsa pada %s \n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Anda ingin signature anda kadaluarsa pada waktu yang sama? (y/n) "
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
@@ -2650,11 +2716,11 @@ msgstr ""
"Anda tidak boleh membuat signature OpenPGP pada sebuah kunci PGP 2.x saat "
"dalam mode --pgp2\n"
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "Hal ini akan membuat kunci tidak dapat digunakan dalam PGP 2.x.\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2664,31 +2730,31 @@ msgstr ""
"menandai benar benar milik\n"
"orang tersebut? Jika anda tidak tahu jawabannya. masukkan \"0\".\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Saya tidak akan menjawab.%s\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Saya belum memeriksanya.%s\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Saya telah melakukan pemeriksaan biasa.%s\n"
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Saya telah melakukan pemeriksaan hati-hati.%s\n"
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr "Pilihan Anda? (berikan '?' untuk informasi lebih lanjut):"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2696,7 +2762,7 @@ msgstr ""
"Apakah anda yakin untuk menandai kunci ini \n"
"dengan kunci anda: "
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2704,7 +2770,7 @@ msgstr ""
"\n"
"Ini akan jadi self-signature.\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2712,7 +2778,7 @@ msgstr ""
"\n"
"Peringatan: Signature akan ditandai sebagai tidak dapat diekspor.\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2720,7 +2786,7 @@ msgstr ""
"\n"
"Peringatan: Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2728,7 +2794,7 @@ msgstr ""
"\n"
"Signature akan ditandai sebagai tidak dapat diekspor.\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2736,7 +2802,7 @@ msgstr ""
"\n"
"Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2744,7 +2810,7 @@ msgstr ""
"\n"
"Saya belum memeriksa kunci ini sama sekali.\n"
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2752,7 +2818,7 @@ msgstr ""
"\n"
"Saya telah memeriksa kunci ini.\n"
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2760,34 +2826,34 @@ msgstr ""
"\n"
"Saya telah memeriksa kunci ini dengan sangat hati-hati.\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "Ditandai? "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "gagal menandai: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "Kunci ini tidak diproteksi.\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "Kunci diproteksi.\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Tidak dapat mengedit kunci ini: %s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2795,7 +2861,7 @@ msgstr ""
"Masukkan passphrase baru untuk kunci rahasia ini.\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2803,544 +2869,566 @@ msgstr ""
"Anda tidak ingin passphrase - bukan ide yang baik!\n"
"\n"
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "Apakah anda ingin melakukan hal ini? "
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "memindahkan signature kunci ke tempat yang tepat\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "berhenti dari menu ini"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "q"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "simpan"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "simpan dan berhenti"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "bantuan"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "tampilkan bantuan"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "tampilkan fingerprint"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "tampilkan"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "tampilkan kunci dan ID user"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "pilih ID user N"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "kunci"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "pilih kunci sekunder N"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "periksa"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "tampilkan signature"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "c"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "tandai"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "tandai kunci"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "s"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "tsign"
msgstr "tandai"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "make a trust signature"
msgstr "buat detached signature"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "tandai kunci secara lokal"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr "tandai kunci sebagai tidak dapat dibatalkan"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "sign the key locally and non-revocably"
msgstr "tandai kunci secara lokal dan tidak dapat dibatalkan"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "tambah sebuah ID user"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr "addphoto"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr "tambah sebuah photo ID"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "hapus ID user"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr "delphoto"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "tambah kunci sekunder"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+#, fuzzy
+msgid "addcardkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "hapus kunci sekunder"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "addrevoker"
msgstr "addrevoker"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "add a revocation key"
msgstr "tambah kunci pembatalan"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "hapus signature"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "ubah tanggal kadaluarsa"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr "primer"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr "tandai ID user sebagai primer"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "ubah tampilan kunci rahasia dan publik"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "t"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr "tampilkan preferensi (ahli)"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr "tampilkan preferensi (verbose)"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr "set daftar preferensi"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr "perbarui preferensi"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "keyserver"
msgstr "kesalahan keyserver"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "set preferred keyserver URL"
msgstr "tidak dapat memparsing URI keyserver\n"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "ubah passphrase"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "ubah ownertrust"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "batalkan signature"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revuid"
msgstr "revuid"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revoke a user ID"
msgstr "batalkan sebuah ID user"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "batalkan kunci sekunder"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "tiadakan kunci"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "aktifkan kunci"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr "showphoto"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr "tampilkan photo ID"
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "kesalahan membaca keyblock rahasia `%s': %s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "Kunci rahasia tersedia.\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "Perintah> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr "Silakan gunakan dulu perintah \"toogle\".\n"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
msgid "Key is revoked."
msgstr "Kunci dibatalkan"
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "Tandai ID seluruh user? "
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "Anda harus memilih minimum satu ID user.\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "Hapus seluruh ID user terpilih? "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "Hapus ID user ini? "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+#, fuzzy
+msgid "Really move the primary key? "
+msgstr "Hapus ID user ini? "
+
+#: g10/keyedit.c:1598
+#, fuzzy
+msgid "You must select exactly one key.\n"
+msgstr "Anda harus memilih minimum satu kunci.\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "Anda harus memilih minimum satu kunci.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "Anda ingin menghapus kunci terpilih ini? "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "Anda ingin menghapus kunci ini? "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
msgid "Really revoke all selected user IDs? "
msgstr "Benar-benar hapus seluruh ID user terpilih? "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
msgid "Really revoke this user ID? "
msgstr "Benar-benar hapus ID user ini? "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "Anda ingin membatalkan kunci terpilih ini? "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "Anda ingin membatalkan kunci ini? "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
#, fuzzy
msgid "Set preference list to:\n"
msgstr "set daftar preferensi"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr "Perbarui preferensi untuk user ID terpilih?"
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr "Update preferensi?"
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "Simpan perubahan? "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "Berhenti tanpa menyimpan? "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "gagal memperbarui: %s\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "gagal perbarui rahasia: %s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "Perintah tidak valid (coba \"help\")\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr "Digest: "
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr "Fitur: "
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keyedit.c:2219
#, c-format
msgid "This key may be revoked by %s key "
msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr " (sensitive)"
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "tidak dapat membuat %s: %s\n"
-#: g10/keyedit.c:2084
-#, fuzzy, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
msgstr "[revoked] "
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
-msgstr " [berakhir: %s]"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
+msgstr "expire"
+
+#: g10/keyedit.c:2246
#, fuzzy, c-format
-msgid "expires: %s"
-msgstr " [berakhir: %s]"
+msgid "usage: %s"
+msgstr " trust: %c/%c"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, fuzzy, c-format
msgid "trust: %s"
msgstr " trust: %c/%c"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "Kunci ini telah ditiadakan"
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! subkey telah dibatalkan: %s\n"
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
-msgstr "rev - ditemukan pembatalan palsu\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? masalah memeriksa pembatalan: %s\n"
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-#, fuzzy
-msgid "revoked"
-msgstr "[revoked] "
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-#, fuzzy
-msgid "expired"
-msgstr "expire"
+#: g10/keyedit.c:2300
+msgid "card-no: "
+msgstr ""
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Tidak ada preferensi pada user ID bergaya PGP 2.x.\n"
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3348,15 +3436,7 @@ msgstr ""
"Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
"kecuali anda memulai kembali program.\n"
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-msgid "[revoked] "
-msgstr "[revoked] "
-
-#: g10/keyedit.c:2274
-msgid "[expired] "
-msgstr "[expired] "
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@ -3364,7 +3444,7 @@ msgstr ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3374,45 +3454,45 @@ msgstr ""
"dapat menyebabkan beberapa versi\n"
" PGP menolak kunci ini.\n"
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Anda tetap ingin menambahkannya? (y/n) "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Anda tidak boleh menambahkan sebuah photo ID ke kunci bergaya PGP2 \n"
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "Hapus signature baik ini? (y/T/q)"
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Hapus signature tidak valid ini? (y/T/q)"
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Menghapus %d signature.\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Menghapus %d signature.\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "Tidak ada yang dihapus.\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3422,94 +3502,104 @@ msgstr ""
"designated dapat\n"
"............menyebabkan beberapa versi PGP menolak kunci ini.\n"
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Anda tidak boleh revoker designated ke kunci bergaya PGP2.x.\n"
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
msgid "Enter the user ID of the designated revoker: "
msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n"
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
"anda tidak dapat menunjuk sebuah kunci sebagai pihak yang dibatalkan "
"sendiri\n"
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"PERINGATAN: menunjuk sebuah kunci sebagai pihak yang dibatalkan tidak dapat "
"dilakukan\n"
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr ""
"Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "Merubah batas waktu untuk kunci sekunder.\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "Merubah batas waktu untuk kunci primer.\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
msgid "Please select exactly one user ID.\n"
msgstr "Anda harus memilih minimum satu ID user.\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
-#, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "melewati self-signature v3 pada user id \"%s\"\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+#, fuzzy
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
+
+#: g10/keyedit.c:3480
+#, fuzzy
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "Tidak ada ID user dengan index %d\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Tidak ada kunci sekunder dengan index %d\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "ID user: "
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3518,7 +3608,7 @@ msgstr ""
"\"\n"
"ditandai dengan kunci anda %08lX pada %s\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3527,142 +3617,126 @@ msgstr ""
"\"\n"
"ditandai secara lokal dengan kunci anda %08lX pada %s\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Kunci ini akan kadaluarsa pada %s \n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Anda tetap ingin membatalkannya? (y/n) "
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "Anda telah menandai ID user ini:\n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid " signed by %s on %s%s%s\n"
msgstr " ditandai oleh %08lX pada %s%s%s\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid " revoked by %s on %s\n"
msgstr " dibatalkan oleh %08lX pada %s\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "Anda akan membatalkan signature ini:\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, fuzzy, c-format
msgid " signed by %s on %s%s\n"
msgstr " ditandai oleh %08lX pada %s%s\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr " (tidak dapat diekspor)"
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
msgid "Really create the revocation certificates? (y/N) "
msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "tidak ada kunci rahasia\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "User ID \"%s\" telah dibatalkan\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "PERINGATAN: signature user ID bertanggal %d detik di masa depan\n"
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Menampilkan photo ID %s berukuran %ld untuk kunci 0x%08lX (uid %d)\n"
-#: g10/keylist.c:179
+#: g10/keylist.c:180
msgid "Critical signature policy: "
msgstr "Kebijakan signature kritis: "
-#: g10/keylist.c:181
+#: g10/keylist.c:182
msgid "Signature policy: "
msgstr "Kebijakan signature: "
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
msgid "Critical signature notation: "
msgstr "Notasi signature kritis: "
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr "Notasi signature: "
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr "tidak dapat dibaca manusia"
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr "Keyring"
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr " [berakhir: %s]"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr " [berakhir: %s]"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, fuzzy, c-format
-msgid " [revoked: %s]"
-msgstr "[revoked] "
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
msgid "Primary key fingerprint:"
msgstr "Fingerprint kunci primer:"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
msgid " Subkey fingerprint:"
msgstr " Fingerprint subkunci ="
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
msgid " Primary key fingerprint:"
msgstr " Fingerprint kunci primer ="
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
msgid " Subkey fingerprint:"
msgstr " Fingerprint subkunci ="
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr " Fingerprint kunci ="
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3868,80 +3942,80 @@ msgstr "signature model lama (PGP 2.X)\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "tidak dapat meniadakan core dump: %s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "Algoritma eksperimental sebaiknya tidak dipakai!\n"
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"algoritma cipher ini didepresiasi; silakan gunakan yang lebih standar!\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr "plugin cipher IDEA tidak tersedia\n"
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr ""
"silakan lihat http://www.gnupg.org/why-not-idea.html untuk informasi lebih "
"lanjut\n"
-#: g10/misc.c:491
+#: g10/misc.c:517
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: opsi tidak digunakan lagi \"%s\"\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "silakan gunakan \"%s%s\"\n"
-#: g10/misc.c:508
+#: g10/misc.c:534
msgid "Uncompressed"
msgstr "Tidak dikompresi"
-#: g10/misc.c:533
+#: g10/misc.c:559
#, fuzzy
msgid "uncompressed|none"
msgstr "Tidak dikompresi"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "pesan ini mungkin tidak dapat digunakan oleh %s\n"
-#: g10/misc.c:777
+#: g10/misc.c:826
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "membaca pilihan dari `%s'\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "penerima baku tidak dikenal `%s'\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "tidak dapat menangani algoritma kunci publik %d\n"
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpaket tipe %d memiliki bit kritis terset\n"
@@ -3980,7 +4054,7 @@ msgstr "tidak dapat terkoneksi ke `%s': %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "masalah komunikasi dengan gpg-agent\n"
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr "masalah dengan agen - tiadakan penggunaan agen\n"
@@ -4016,24 +4090,24 @@ msgstr "passphrase terlalu panjang\n"
msgid "invalid response from agent\n"
msgstr "respon tidak valid dari agen\n"
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "dibatalkan oleh user\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "tidak dapat meminta password dalam mode batch\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "Masukkan passphrase: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4043,22 +4117,22 @@ msgstr ""
"Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
"pemakai: \""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (ID kunci utama %08lX)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "Ulangi passphrase: "
@@ -4280,27 +4354,38 @@ msgstr ""
"anda hanya dapat detach-sign dengan kunci bergaya PGP 2.x saat dalam mode --"
"pgp2\n"
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
msgstr "tidak dapat membuat %s: %s\n"
-#: g10/sign.c:794
-#, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+#: g10/sign.c:771 g10/sign.c:1008
+#, fuzzy, c-format
+msgid "writing to file `%s'\n"
+msgstr "menulis ke `%s'\n"
+
+#: g10/sign.c:795
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr "menandai:"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "tidak dapat membuka file: %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
"anda hanya dapat clearsign dengan kunci bergaya PGP 2.x saat dalam mode --"
"pgp2\n"
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s enkripsi akan digunakan\n"
@@ -4697,7 +4782,7 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"tidak dapat menghindari kunci lemah untuk cipher simetrik; mencoba %d kali!\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA butuh penggunaan algoritma hash 160 bit\n"
@@ -5070,17 +5155,17 @@ msgstr "Tidak tersedia bantuan"
msgid "No help available for `%s'"
msgstr "Tidak tersedia bantuan untuk `%s'"
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr "%s: keyring tercipta\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "gagal membuat kembali cache keyring: %s\n"
@@ -5123,8 +5208,7 @@ msgstr "%lu kunci telah diperiksa (%lu signature)\n"
msgid "%s: keyring created\n"
msgstr "%s: keyring tercipta\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5140,29 +5224,34 @@ msgstr ""
"gambar yang sangat besar, kunci anda akan menjadi semakin besar pula!\n"
"Jagalah agar gambar mendekati ukuran 240x288.\n"
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr "Masukkan nama file JPEG sebagai ID foto: "
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "Tidak dapat membuka foto \"%s\":%s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
msgid "Are you sure you want to use it (y/N)? "
msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr "\"%s\" bukan sebuah file JPEG\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Is this photo correct (y/N/q)? "
msgstr "Apakah foto ini benar (y/N/q)? "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
msgid "unable to display photo ID!\n"
msgstr "tidak dapat menampilkan photo ID!\n"
@@ -5183,44 +5272,50 @@ msgstr ""
"aman\n"
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
+#, fuzzy
+msgid "this platform requires temporary files when calling external programs\n"
msgstr ""
"platform ini membutuhkan file temp ketika memanggil program eksternal\n"
-#: g10/exec.c:432
-#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
msgstr "tidak dapat mengeksekusi %s \"%s\": %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:436
+#, fuzzy, c-format
+msgid "unable to execute shell `%s': %s\n"
+msgstr "tidak dapat mengeksekusi %s \"%s\": %s\n"
+
+#: g10/exec.c:515
#, c-format
msgid "system error while calling external program: %s\n"
msgstr "kesalahan sistem ketika memanggil program eksternal: %s\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr "program eksternal berhenti secara tidak natual\n"
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr "tidak dapat mengeksekusi program eksternal\n"
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr "tidak dapat membaca tanggapan program eksternal: %s\n"
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "PERINGATAN: tidak dapat menghapus direktori temp `%s': %s\n"
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr "tidak pernah..."
@@ -5378,6 +5473,47 @@ msgstr "kesalahan: gagal menemukan catatan trust: %s\n"
msgid "read error: %s\n"
msgstr "kesalahan pembacaan: %s\n"
+#, fuzzy
+#~ msgid "revoked: %s"
+#~ msgstr "[revoked] "
+
+#, fuzzy
+#~ msgid "expired: %s"
+#~ msgstr " [berakhir: %s]"
+
+#, fuzzy
+#~ msgid "expires: %s"
+#~ msgstr " [berakhir: %s]"
+
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "rev! subkey telah dibatalkan: %s\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "rev - ditemukan pembatalan palsu\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "rev? masalah memeriksa pembatalan: %s\n"
+
+#~ msgid "[revoked] "
+#~ msgstr "[revoked] "
+
+#~ msgid "[expired] "
+#~ msgstr "[expired] "
+
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr " [berakhir: %s]"
+
+#~ msgid " [expires: %s]"
+#~ msgstr " [berakhir: %s]"
+
+#, fuzzy
+#~ msgid " [revoked: %s]"
+#~ msgstr "[revoked] "
+
+#~ msgid "can't create %s: %s\n"
+#~ msgstr "tidak dapat membuat %s: %s\n"
+
#~ msgid ""
#~ "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n"
#~ msgstr ""
diff --git a/po/it.po b/po/it.po
index ff4e568f7..61853ec1b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.1.92\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
"PO-Revision-Date: 2004-06-16 17:01+0200\n"
"Last-Translator: Marco d'Itri <[email protected]>\n"
"Language-Team: Italian <[email protected]>\n"
@@ -46,7 +46,7 @@ msgstr "no"
msgid "nN"
msgstr "nN"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "quit"
@@ -280,6 +280,16 @@ msgstr "chiave segreta inutilizzabile"
msgid "keyserver error"
msgstr "errore del keyserver"
+#: util/errors.c:108
+#, fuzzy
+msgid "canceled"
+msgstr "Cancella"
+
+#: util/errors.c:109
+#, fuzzy
+msgid "no card"
+msgstr "non cifrato"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr ""
@@ -302,7 +312,7 @@ msgstr "hai trovato un bug... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "non � stato trovato il modulo per raccogliere l'entropia\n"
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "impossibile aprire `%s': %s\n"
@@ -335,7 +345,7 @@ msgstr "impossibile leggere `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "nota: il file random_seed non � stato aggiornato\n"
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr "impossibile creare `%s': %s\n"
@@ -406,7 +416,7 @@ msgstr "impossibile generare un numero primo di meno di %d bit\n"
msgid "can't generate a prime with less than %d bits\n"
msgstr "impossibile generare un numero primo di meno di %d bit\n"
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -414,128 +424,128 @@ msgstr ""
"@Comandi:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[file]|fai una firma"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "fai una firma separata"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "cifra dati"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "cifra solo con un cifrario simmetrico"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "decifra dati (predefinito)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "verifica una firma"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "elenca le chiavi"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "elenca le chiavi e le firme"
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "controlla le firme delle chiavi"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "elenca le chiavi e le impronte digitali"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "elenca le chiavi segrete"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "genera una nuova coppia di chiavi"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "rimuove le chiavi dal portachiavi pubblico"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "rimuove le chiavi dal portachiavi privato"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "firma una chiave"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "firma una chiave localmente"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "firma o modifica una chiave"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "genera un certificato di revoca"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "esporta delle chiavi"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "esporta le chiavi a un key server"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "importa le chiavi da un key server"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "cerca delle chiavi su un key server"
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "aggiorna tutte le chiavi da un key server"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "importa/aggiungi delle chiavi"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "aggiorna il database della fiducia"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|algo [files]|stampa tutti i message digests"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -545,55 +555,51 @@ msgstr ""
"Opzioni:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "crea un output ascii con armatura"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|NOME|cifra per NOME"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr "usa questo user-id per firmare o decifrare"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr "|N|imposta il livello di compressione (0 disab.)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "usa il modo testo canonico"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "usa come file di output"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "prolisso"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "non fa cambiamenti"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "chiede prima di sovrascrivere"
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -601,7 +607,7 @@ msgstr ""
"@\n"
"(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -621,15 +627,15 @@ msgstr ""
" --list-keys [nomi] mostra le chiavi\n"
" --fingerprint [nomi] mostra le impronte digitali\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Per favore segnala i bug a <[email protected]>.\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -639,7 +645,7 @@ msgstr ""
"firma, controlla, cifra o decifra\n"
"l'operazione predefinita dipende dai dati di input\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -647,474 +653,468 @@ msgstr ""
"\n"
"Algoritmi gestiti:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr "A chiave pubblica: "
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr "Cifrari: "
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr "Hash: "
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
msgid "Compression: "
msgstr "Compressione: "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "uso: gpg [opzioni] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "comandi in conflitto\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "non � stato trovato il segno = nella definizione del gruppo \"%s\"\n"
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
-#: g10/g10.c:1205
+#: g10/g10.c:1210
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
-#: g10/g10.c:1334
-#, c-format
-msgid "unknown configuration item \"%s\"\n"
+#: g10/g10.c:1354
+#, fuzzy, c-format
+msgid "unknown configuration item `%s'\n"
msgstr "elemento della configurazione sconosciuto \"%s\"\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr ""
"NOTA: il vecchio file `%s' con le opzioni predefinite � stato ignorato\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "file con le opzioni `%s': %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "lettura delle opzioni da `%s'\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: %s normalmente non deve essere usato!\n"
-#: g10/g10.c:1887
-#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+#: g10/g10.c:2021
+#, fuzzy, c-format
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr ""
"l'estensione crittografica \"%s\" non � stata caricata a causa dei\n"
"permessi insicuri.\n"
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "%s non � un set di caratteri valido\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "impossibile fare il parsing dell'URI del keyserver\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opzioni di esportazione non valide\n"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opzioni di importazione non valide\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
msgid "invalid import options\n"
msgstr "opzioni di importazione non valide\n"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
msgid "invalid export options\n"
msgstr "opzioni di esportazione non valide\n"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opzioni di importazione non valide\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "opzioni di importazione non valide\n"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "opzioni di esportazione non valide\n"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "impossibile impostare exec-path a %s\n"
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Non � permesso usare %s con %s!\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "Non ha senso usare %s con %s!\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "nella modalit� --pgp2 puoi fare solo firme in chiaro o separate\n"
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "nella modalit� --pgp2 non puoi firmare e cifrare contemporaneamente\n"
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"devi usare dei file (e non una pipe) quando lavori con --pgp2 attivo.\n"
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
"nella modalit� --pgp2 � richiesto il cifrario IDEA per cifrare un messaggio\n"
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algoritmo di cifratura selezionato non � valido\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "l'algoritmo di digest selezionato non � valido\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "l'algoritmo di cifratura selezionato non � valido\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
msgid "selected certification digest algorithm is invalid\n"
msgstr "l'algoritmo di digest selezionato non � valido\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve essere maggiore di 0\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve essere maggiore di 1\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth deve essere tra 1 e 255\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "default-cert-level non valido; deve essere 0, 1, 2 o 3\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "min-cert-level non valido; deve essere 1, 2 o 3\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
msgid "invalid default preferences\n"
msgstr "preferenze predefinite non valide\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
msgid "invalid personal cipher preferences\n"
msgstr "preferenze personali del cifrario non valide\n"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
msgid "invalid personal digest preferences\n"
msgstr "preferenze personali del digest non valide\n"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
msgid "invalid personal compress preferences\n"
msgstr "preferenze personali di compressione non valide\n"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s non funziona ancora con %s\n"
-#: g10/g10.c:2680
-#, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2797
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "non � possibile usare l'algoritmo di cifratura \"%s\" in modalit� %s\n"
-#: g10/g10.c:2685
-#, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2802
+#, fuzzy, c-format
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "non � possibile usare l'algoritmo di digest \"%s\" in modalit� %s\n"
-#: g10/g10.c:2690
-#, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2807
+#, fuzzy, c-format
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr ""
"non � possibile usare l'algoritmo di compressione \"%s\" in modalit� %s\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"ATTENZIONE: sono stati indicati dei destinatari (-r) senza usare la\n"
"crittografia a chiave pubblica\n"
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [nomefile]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [nomefile]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [nomefile]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nomefile]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "non � possibile usare %s in modalit� %s\n"
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [nomefile]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nomefile]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nomefile]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "non � possibile usare %s in modalit� %s\n"
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nomefile]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [nomefile]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [nomefile]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrsign-key user-id"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key user-id"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [comandi]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "impossibile aprire `%s': %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "invio al keyserver fallito: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "ricezione dal keyserver fallita: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, c-format
msgid "key export failed: %s\n"
msgstr "esportazione della chiave fallita: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "ricerca nel keyserver fallita: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "aggiornamento del keyserver fallito: %s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "rimozione dell'armatura fallita: %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo di hash non valido `%s'\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[nomefile]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "Vai avanti e scrivi il messaggio...\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "impossibile aprire `%s'\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@ -1122,48 +1122,48 @@ msgstr ""
"il nome di una nota deve essere formato solo da caratteri stampabili o\n"
"spazi e terminare con un '='\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
msgid "a user notation name must contain the '@' character\n"
msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "il valore di una nota non deve usare caratteri di controllo\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr "l'URL della politica di certificazione indicato non � valido\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr "l'URL della politica di firma indicato non � valido\n"
-#: g10/g10.c:3747
+#: g10/g10.c:3863
#, fuzzy
-msgid "the given signature preferred keyserver URL is invalid\n"
+msgid "the given preferred keyserver URL is invalid\n"
msgstr "l'URL della politica di firma indicato non � valido\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "meno prolisso"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
msgid "take the keys from this keyring"
msgstr "prende le chiavi da questo portachiavi"
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
msgid "make timestamp conflicts only a warning"
msgstr "segnala i conflitti di data solo con un avvertimento"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr "|FD|scrivi le informazioni di stato sul FD"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Uso: gpgv [opzioni] [file] (-h per l'aiuto)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1197,12 +1197,13 @@ msgid "invalid dash escaped line: "
msgstr "riga protetta con il trattino non valida: "
#: g10/armor.c:565
-msgid "unexpected armor:"
+#, fuzzy
+msgid "unexpected armor: "
msgstr "armatura inaspettata:"
-#: g10/armor.c:695 g10/armor.c:1276
-#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+#: g10/armor.c:695 g10/armor.c:1280
+#, fuzzy, c-format
+msgid "invalid radix64 character %02X skipped\n"
msgstr "Carattere radix64 non valido %02x saltato\n"
#: g10/armor.c:738
@@ -1213,33 +1214,34 @@ msgstr "eof prematura (nessun CRC)\n"
msgid "premature eof (in CRC)\n"
msgstr "eof prematura (nel CRC)\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "CRC malformato\n"
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "errore nel CRC; %06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+#, fuzzy
+msgid "premature eof (in trailer)\n"
msgstr "eof prematura (nella coda)\n"
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "errore nella riga della coda\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "Non sono stati trovati dati OpenPGP validi.\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "armatura non valida: linea pi� lunga di %d caratteri\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1295,7 +1297,7 @@ msgstr " alias \""
msgid " aka \""
msgstr " alias \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1548,96 +1550,116 @@ msgstr "%s: saltata: chiave pubblica disabilitata\n"
msgid "no valid addressees\n"
msgstr "nessun indirizzo valido\n"
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "la preferenza %c%lu � doppia\n"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "ci sono troppe preferenze `%c'\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
#, fuzzy
msgid "too many digest preferences\n"
msgstr "ci sono troppe preferenze `%c'\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
#, fuzzy
msgid "too many compression preferences\n"
msgstr "ci sono troppe preferenze `%c'\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "carattere non valido nella stringa delle preferenze\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
msgid "writing direct signature\n"
msgstr "scrittura della firma diretta\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "scrittura della autofirma\n"
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "scrittura della firma di collegamento alla chiave\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "dimensione della chiave non valida; uso %u bit\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "dimensioni della chiave arrotondate a %u bit\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "Per favore scegli che tipo di chiave vuoi:\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA e ElGamal (default)\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (firma solo)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (cifra solo)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (firma solo)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (cifra solo)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (firma e cifra)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, fuzzy, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) RSA (firma solo)\n"
+
+#: g10/keygen.c:1224
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) RSA (firma e cifra)\n"
+
+#: g10/keygen.c:1226
+#, fuzzy, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) RSA (cifra solo)\n"
+
+#: g10/keygen.c:1228
+#, fuzzy, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) RSA (firma e cifra)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "Cosa scegli? "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "Scelta non valida.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1650,28 +1672,28 @@ msgstr ""
" la dimensione predefinita � 1024 bit\n"
" la dimensione massima consigliata � 2048 bit\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "Di che dimensioni vuoi la chiave? (1024) "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
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:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "la chiave � troppo corta; 1024 � il minimo valore permesso per RSA.\n"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "la chiave � troppo corta; 768 � il minimo valore permesso.\n"
-#: g10/keygen.c:1255
+#: g10/keygen.c:1328
#, 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:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1679,11 +1701,11 @@ msgstr ""
"Chiavi pi� lunghe di 2048 non sono consigliate perch� i calcoli sono\n"
"VERAMENTE lunghi!\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1691,17 +1713,17 @@ 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:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "La dimensione richiesta della chiave � %u bit\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arrotondate a %u bit\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1717,7 +1739,7 @@ msgstr ""
" <n>m = la chiave scadr� dopo n mesi\n"
" <n>y = la chiave scadr� dopo n anni\n"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1733,29 +1755,29 @@ msgstr ""
" <n>m = la chiave scadr� dopo n mesi\n"
" <n>y = la chiave scadr� dopo n anni\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "Chiave valida per? (0) "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr "Firma valida per? (0) "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "valore non valido\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s non ha scadenza\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr "%s scadr� il %s\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1763,16 +1785,17 @@ msgstr ""
"Il tuo sistema non pu� mostrare date oltre il 2038.\n"
"Comunque, sar� gestita correttamente fino al 2106.\n"
-#: g10/keygen.c:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "� giusto (s/n)? "
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
+#, fuzzy
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
@@ -1783,44 +1806,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "Nome e Cognome: "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "Carattere non valido nel nome\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr "Il nome non pu� iniziare con una cifra\n"
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "Indirizzo di Email: "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "L'indirizzo di email non � valido\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "Commento: "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "Carattere non valido nel commento\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Stai usando il set di caratteri `%s'.\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1831,27 +1854,27 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
-#: g10/keygen.c:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
-#: g10/keygen.c:1542
+#: g10/keygen.c:1615
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:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr "Per favore correggi prima l'errore\n"
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1859,16 +1882,16 @@ msgstr ""
"Ti serve una passphrase per proteggere la tua chiave segreta.\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr "passphrase non ripetuta correttamente; prova ancora"
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1880,7 +1903,7 @@ msgstr ""
"programma con l'opzione \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1892,58 +1915,58 @@ 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:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr "mi dispiace, non � possibile fare questo in modo batch\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "La coppia DSA avr� 1024 bit.\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "Generazione della chiave annullata.\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr "scrittura della chiave pubblica in `%s'\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "scrittura della chiave segreta in `%s'\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "scrittura della chiave segreta in `%s'\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "non � stato trovato un portachiavi pubblico scrivibile: %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "non � stato trovato un portachiavi segreto scrivibile: %s\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "chiavi pubbliche e segrete create e firmate.\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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"
@@ -1952,12 +1975,12 @@ msgstr ""
"il comando \"--edit-key\" per generare una chiave secondaria per questo "
"scopo.\n"
-#: g10/keygen.c:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generazione della chiave fallita: %s\n"
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1965,7 +1988,7 @@ msgstr ""
"la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
-#: g10/keygen.c:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1973,14 +1996,43 @@ msgstr ""
"la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NB: la creazione di subchiavi per chiavi v3 non rispetta OpenPGP.\n"
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "Crea davvero? "
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "cancellazione del keyblock fallita: %s\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "impossibile creare `%s': %s\n"
+
+#: g10/keygen.c:3248
+#, fuzzy, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "NOTA: chiave %08lX scaduta il %s\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "--output non funziona con questo comando\n"
@@ -1991,7 +2043,7 @@ msgstr "--output non funziona con questo comando\n"
msgid "%s: can't open: %s\n"
msgstr "%s: impossibile aprire: %s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
@@ -2022,6 +2074,11 @@ msgstr ""
"in modalit� --pgp2 puoi cifrare solo per chiavi RSA non pi� lunghe di 2048 "
"bit\n"
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "impossibile aprire `%s': %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -2034,26 +2091,36 @@ msgstr ""
"impossibile usare il cifrario IDEA con tutti i tipi di chiavi per cui\n"
"stai cifrando.\n"
-#: g10/encode.c:526 g10/encode.c:721
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#: g10/encode.c:526
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
"del destinatario\n"
-#: g10/encode.c:634 g10/sign.c:863
-#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+#: g10/encode.c:634 g10/sign.c:864
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
msgstr ""
"forzare l'algoritmo di compressione %s (%d) viola le preferenze\n"
"del destinatario\n"
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
+"del destinatario\n"
+
#: g10/encode.c:818
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrato per: \"%s\"\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "chiave `%s' non trovata: %s\n"
@@ -2086,8 +2153,9 @@ msgstr "ATTENZIONE: non � stato esportato nulla\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "troppe voci nella pk cache - disabilitata\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+#, fuzzy
+msgid "[User ID not found]"
msgstr "[User ID non trovato]"
#: g10/getkey.c:1614
@@ -2241,7 +2309,7 @@ msgstr "chiave %08lX: riparati i danni di HKP alla subchiave\n"
#: g10/import.c:722
#, fuzzy, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "chiave %08lX: accettato l'user ID non autofirmato '%s'\n"
#: g10/import.c:728
@@ -2268,7 +2336,7 @@ msgstr "chiave %08lX: nuova chiave - saltata\n"
msgid "no writable keyring found: %s\n"
msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "scrittura in `%s'\n"
@@ -2382,13 +2450,13 @@ msgstr "chiave %08lX: nessun user ID per la firma\n"
#: g10/import.c:1299
#, fuzzy, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"chiave %08lX: algoritmo a chiave pubblica non gestito sull'user ID \"%s\"\n"
#: g10/import.c:1301
#, fuzzy, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "chiave %08lX: autofirma non valida sull'user ID \"%s\"\n"
#: g10/import.c:1319
@@ -2428,7 +2496,7 @@ msgstr "chiave %08lX: rimosse le revoche di subchiavi multiple\n"
#: g10/import.c:1439
#, fuzzy, c-format
-msgid "key %s: skipped user ID '%s'\n"
+msgid "key %s: skipped user ID \"%s\"\n"
msgstr "chiave %08lX: saltato l'user ID '"
#: g10/import.c:1460
@@ -2438,7 +2506,7 @@ msgstr "chiave %08lX: saltata la subchiave\n"
#: g10/import.c:1487
#, fuzzy, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n"
#: g10/import.c:1497
@@ -2473,114 +2541,114 @@ msgstr ""
"ATTENZIONE: la chiave %08lX pu� essere stata revocata: scarico la chiave\n"
"di revoca %08lX.\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"ATTENZIONE: la chiave %08lX pu� essere stata revocata: la chiave di\n"
"revoca %08lX non � presente.\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[revoca]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[autofirma]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "una firma non corretta\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d firme non corrette\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "una firma non controllata per mancanza della chiave\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d firme non controllate per mancanza delle chiavi\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "una firma non controllata a causa di un errore\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d firme non controllate a causa di errori\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "Trovato un user ID senza autofirma valida\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "Trovati %d user ID senza autofirme valide\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, fuzzy, c-format
msgid " (%d) I trust marginally\n"
msgstr " %d = Mi fido marginalmente\n"
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, fuzzy, c-format
msgid " (%d) I trust fully\n"
msgstr " %d = Mi fido completamente\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "L'user ID \"%s\" � stato revocato."
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr " Impossibile firmarla.\n"
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "L'user ID \"%s\" � scaduto."
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "L'user ID \"%s\" non � autofirmato."
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2589,11 +2657,11 @@ msgstr ""
"L'autofirma su \"%s\"\n"
"� una firma in stile PGP 2.x.\n"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Vuoi promuoverla in una autofirma di OpenPGP? (s/N) "
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2602,11 +2670,11 @@ msgstr ""
"La tua firma attuale su \"%s\"\n"
"� scaduta\n"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Vuoi fare una nuova firma per sostituire quella scaduta? (s/N) "
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2615,43 +2683,43 @@ msgstr ""
"La tua firma attuale su \"%s\"\n"
"� una firma locale.\n"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Vuoi trasformarla in una firma completa esportabile? (s/N) "
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" era gi� stato firmato localmente dalla chiave %08lX\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" era gi� stato firmato dalla chiave %08lX\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Sei ancora sicuro di volerla firmare di nuovo? (s/N) "
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Niente da firmare con la chiave %08lX\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "Questa chiave � scaduta!"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Questa chiave scadr� il %s.\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Vuoi che la tua firma scada nello stesso momento? (S/n) "
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
@@ -2659,11 +2727,11 @@ msgstr ""
"In modalit� -pgp2 non � possibile fare firme OpenPGP su chiavi in stile PGP "
"2.x.\n"
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "Questo renderebbe la chiave non utilizzabile da PGP 2.x.\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2673,31 +2741,31 @@ msgstr ""
"appartiene veramente alla persona indicata sopra?\n"
"Se non sai cosa rispondere digita \"0\".\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Preferisco non rispondere.%s\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Non l'ho controllata per niente.%s\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) L'ho controllata superficialmente.%s\n"
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) L'ho controllata molto attentamente.%s\n"
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr "Cosa scegli? (inserisci '?' per ulteriori informazioni): "
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2705,7 +2773,7 @@ msgstr ""
"Sei davvero sicuro di volere firmare questa chiave\n"
"con la tua chiave: \""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2713,7 +2781,7 @@ msgstr ""
"\n"
"Questa sar� una autofirma.\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2721,7 +2789,7 @@ msgstr ""
"\n"
"ATTENZIONE: la firma non sar� marcata come non esportabile.\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2729,7 +2797,7 @@ msgstr ""
"\n"
"ATTENZIONE: la firma sar� marcata come irrevocabile.\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2737,7 +2805,7 @@ msgstr ""
"\n"
"La firma sar� marcata come non esportabile.\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2745,7 +2813,7 @@ msgstr ""
"\n"
"La firma sar� marcata come irrevocabile.\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2753,7 +2821,7 @@ msgstr ""
"\n"
"Non ho controllato per niente questa chiave.\n"
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2761,7 +2829,7 @@ msgstr ""
"\n"
"Ho controllato questa chiave superficialmente.\n"
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2769,34 +2837,34 @@ msgstr ""
"\n"
"Ho controllato questa chiave molto attentamente.\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "Firmo davvero? "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "firma fallita: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "Questa chiave non � protetta.\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr "Parti della chiave segreta non sono disponibili.\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "La chiave � protetta.\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Impossibile modificare questa chiave: %s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2804,7 +2872,7 @@ msgstr ""
"Inserisci la nuova passphrase per questa chiave segreta.\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2812,544 +2880,566 @@ msgstr ""
"Non vuoi una passphrase - questa � probabilmente una *cattiva* idea!\n"
"\n"
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "Vuoi veramente farlo?"
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "spostamento della firma di una chiave nel posto corretto\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "abbandona questo men�"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "q"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "save"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "salva ed esci"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "help"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "mostra questo aiuto"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "mostra le impronte digitali"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "list"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "elenca le chiavi e gli user ID"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "scegli l'user ID N"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "key"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "scegli la chiave secondaria N"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "check"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "elenca le firme"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "c"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "firma la chiave"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "s"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "tsign"
msgstr "sign"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "make a trust signature"
msgstr "fai una firma separata"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "firma la chiave localmente"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr "firma la chiave irrevocabilmente"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "sign the key locally and non-revocably"
msgstr "firma la chiave localmente e irrevocabilmente"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "aggiungi un user ID"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr "addphoto"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr "aggiungi un ID fotografico"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "cancella un user ID"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr "delphoto"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "aggiungi una chiave secondaria"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+#, fuzzy
+msgid "addcardkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "cancella una chiave secondaria"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "addrevoker"
msgstr "addrevoker"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "add a revocation key"
msgstr "aggiungi una chiave di revoca"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "delsign"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "cancella le firme"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "cambia la data di scadenza"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr "primary"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr "imposta l'user ID come primario"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "t"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr "elenca le preferenze (per esperti)"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr "elenca le preferenze (prolisso)"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr "imposta la lista di preferenze"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr "preferenze aggiornate"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "keyserver"
msgstr "errore del keyserver"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "set preferred keyserver URL"
msgstr "impossibile fare il parsing dell'URI del keyserver\n"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "cambia la passphrase"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "cambia il valore di fiducia"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "revoca firme"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revuid"
msgstr "revuid"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revoke a user ID"
msgstr "revoca un user ID"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "revoca una chiave secondaria"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "disabilita una chiave"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "abilita"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "abilita una chiave"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr "showphoto"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr "mostra l'ID fotografico"
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "impossibile fare questo in modo batch\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "errore leggendo il keyblock segreto `%s': %s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "� disponibile una chiave segreta.\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "Comando> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "Per fare questo serve la chiave segreta.\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr "Per favore usa prima il comando \"toggle\".\n"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
msgid "Key is revoked."
msgstr "La chiave � stata revocata."
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "Firmo davvero tutti gli user ID? "
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "Suggerimento: seleziona gli user ID da firmare\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Questo comando non � permesso in modalit� %s.\n"
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "Devi selezionare almeno un user ID.\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "Non puoi cancellare l'ultimo user ID!\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "Tolgo davvero tutti gli user ID selezionati? "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "Tolgo davvero questo user ID? "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+#, fuzzy
+msgid "Really move the primary key? "
+msgstr "Tolgo davvero questo user ID? "
+
+#: g10/keyedit.c:1598
+#, fuzzy
+msgid "You must select exactly one key.\n"
+msgstr "Devi selezionare almeno una chiave.\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "Devi selezionare almeno una chiave.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "Vuoi davvero cancellare le chiavi selezionate? "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "Vuoi davvero cancellare questa chiave? "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
msgid "Really revoke all selected user IDs? "
msgstr "Revoco davvero tutti gli user ID selezionati? "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
msgid "Really revoke this user ID? "
msgstr "Revoco davvero questo user ID? "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "Vuoi davvero revocare le chiavi selezionate? "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "Vuoi davvero revocare questa chiave? "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
#, fuzzy
msgid "Set preference list to:\n"
msgstr "imposta la lista di preferenze"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr "Aggiorno davvero le preferenze? "
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "Salvo i cambiamenti? "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "Esco senza salvare? "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "aggiornamento della chiave segreta fallito: %s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "Comando non valido (prova \"help\")\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr "Digest: "
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr "Caratteristiche: "
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keyedit.c:2219
#, c-format
msgid "This key may be revoked by %s key "
msgstr "Questa chiave pu� essere revocata dalla chiave %s "
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr " (sensibile)"
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "impossibile creare %s: %s\n"
-#: g10/keyedit.c:2084
-#, fuzzy, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
msgstr "[revocata]"
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
-msgstr "[scadenza: %s]"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
+msgstr "expire"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2246
#, fuzzy, c-format
-msgid "expires: %s"
-msgstr "[scadenza: %s]"
+msgid "usage: %s"
+msgstr " fiducia: %c/%c"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, fuzzy, c-format
msgid "trust: %s"
msgstr " fiducia: %c/%c"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "Questa chiave � stata disabilitata"
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! la subchiave � stata revocata: %s\n"
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
-msgstr "rev- trovata una revoca falsificata\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? problema controllando la revoca: %s\n"
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-#, fuzzy
-msgid "revoked"
-msgstr "[revocata]"
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-#, fuzzy
-msgid "expired"
-msgstr "expire"
+#: g10/keyedit.c:2300
+msgid "card-no: "
+msgstr ""
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Non esistono preferense su un user ID in stile PGP 2.x\n"
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3358,15 +3448,7 @@ msgstr ""
"corretta\n"
"finch� non eseguirai di nuovo il programma.\n"
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-msgid "[revoked] "
-msgstr "[revocata]"
-
-#: g10/keyedit.c:2274
-msgid "[expired] "
-msgstr "[scaduta]"
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@ -3375,7 +3457,7 @@ msgstr ""
" potrebbe fare diventare un altro user ID il primario "
"predefinito.\n"
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3384,46 +3466,46 @@ msgstr ""
"ATTENZIONE: Questa � una chiave in stile PGP2. Aggiungere un ID fotografico\n"
" pu� causarne il rifiuto da parte di alcune versioni di PGP.\n"
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr ""
"Non � possibile aggiungere un ID fotografico a una chiave in stile PGP2.\n"
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "Cancellare questa firma corretta? (s/N/q)"
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Cancellare questa firma non valida? (s/N/q)"
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "Cancellare davvero questa autofirma? (s/N)"
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Cancellata %d firma.\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Cancellate %d firme.\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "Non � stato cancellato nulla.\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3433,96 +3515,106 @@ msgstr ""
" designato pu� causarne il rifiuto da parte di alcune versioni\n"
" di PGP.\n"
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"Non � possibile aggiungere un revocatore designato a una chiave in stile\n"
"PGP 2.x.\n"
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
msgid "Enter the user ID of the designated revoker: "
msgstr "Inserisci l'user ID del revocatore designato: "
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n"
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
"impossibile nominare una chiave come revocatore designato di s� stessa\n"
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr ""
"ATTENZIONE: questa chiave � stata revocata dal suo revocatore designato!\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"ATTENZIONE: la nomina di una chiave a revocatrice designata non pu� essere\n"
"annullata.\n"
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr ""
"Sei sicuro di volere nominare questa chiave revocatrice designata? (s/N):"
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "Togli le selezioni dalle chiavi segrete.\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "Seleziona al massimo una chiave secondaria.\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "Cambio la data di scadenza per la chiave primaria.\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
msgid "Please select exactly one user ID.\n"
msgstr "Devi selezionare esattamente un user ID.\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
-#, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "salto una autofirma v3 sull'user ID \"%s\"\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+#, fuzzy
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "Sei sicuro di volerla usare? (s/N) "
+
+#: g10/keyedit.c:3480
+#, fuzzy
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "Sei sicuro di volerla usare? (s/N) "
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nessun user ID con l'indice %d\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Nessuna chiave secondaria con l'indice %d\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "user ID: \""
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3532,7 +3624,7 @@ msgstr ""
"firmata con la tua chiave %08lX il %s\n"
"\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3542,144 +3634,128 @@ msgstr ""
"firmata localmente con la tua chiave %08lX il %s\n"
"\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Questa chiave � scaduta il %s.\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Creare un certificato di revoca per questa firma? (s/N) "
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "Non puoi cancellare l'ultimo user ID!\n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid " signed by %s on %s%s%s\n"
msgstr " firmata da %08lX il %s%s%s\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid " revoked by %s on %s\n"
msgstr " revocata da %08lX il %s\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "Stai per revocare queste firme:\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, fuzzy, c-format
msgid " signed by %s on %s%s\n"
msgstr " firmata da %08lX il %s%s\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr " (non esportabile)"
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
msgid "Really create the revocation certificates? (y/N) "
msgstr "Creare davvero i certificati di revoca? (s/N) "
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "manca la chiave segreta\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "l'user ID \"%s\" � gi� stato revocato\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"ATTENZIONE: una firma dell'user ID ha la data di %d secondi nel futuro\n"
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Mostro %s ID fotografici di dimensioni %ld per la chaive 0x%08lX (uid %d)\n"
-#: g10/keylist.c:179
+#: g10/keylist.c:180
msgid "Critical signature policy: "
msgstr "Politica critica di firma: "
-#: g10/keylist.c:181
+#: g10/keylist.c:182
msgid "Signature policy: "
msgstr "Politica di firma: "
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
msgid "Critical signature notation: "
msgstr "Annotazione critica della firma: "
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr "Annotazione della firma: "
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr "non leggibile"
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr "Portachiavi"
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr "[scadenza: %s]"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr "[scadenza: %s]"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, fuzzy, c-format
-msgid " [revoked: %s]"
-msgstr "[revocata]"
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
msgid "Primary key fingerprint:"
msgstr "Impronta digitale della chiave primaria:"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
msgid " Subkey fingerprint:"
msgstr " Impronta digitale della subchiave:"
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
msgid " Primary key fingerprint:"
msgstr " Impronta digitale della chiave primaria:"
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
msgid " Subkey fingerprint:"
msgstr " Impronta digitale della subchiave:"
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr " Impronta digitale ="
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3884,81 +3960,81 @@ msgstr "firma vecchio stile (PGP 2.x)\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "impossibile disabilitare i core dump: %s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "Gli algoritmi sperimentali non dovrebbero essere usati!\n"
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr "questo algoritmo di cifratura � deprecato; usane uno pi� standard!\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr "il plugin per il cifrario IDEA non � presente\n"
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr ""
"per ulteriori informazioni si veda http://www.gnupg.org/it/why-not-idea."
"html\n"
-#: g10/misc.c:491
+#: g10/misc.c:517
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d \"%s\" � una opzione deprecata\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "usa al suo posto \"%s%s\"\n"
-#: g10/misc.c:508
+#: g10/misc.c:534
msgid "Uncompressed"
msgstr "Non compresso"
-#: g10/misc.c:533
+#: g10/misc.c:559
#, fuzzy
msgid "uncompressed|none"
msgstr "Non compresso"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "questo messaggio pu� non essere utilizzabile da %s\n"
-#: g10/misc.c:777
+#: g10/misc.c:826
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "lettura delle opzioni da `%s'\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "destinatario predefinito `%s' sconosciuto\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"ATTENZIONE: la chiave di sessione cifrata simmetricamente � potenzialmente\n"
"non sicura\n"
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
@@ -3997,7 +4073,7 @@ msgstr "impossibile connettersi a `%s': %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "problema di comunicazione con gpg-agent\n"
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr "problema con l'agent - uso dell'agent disattivato\n"
@@ -4033,24 +4109,24 @@ msgstr "passphrase troppo lunga\n"
msgid "invalid response from agent\n"
msgstr "risposta non valida dall'agent\n"
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "interrotto dall'utente\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "problema con l'agent: ha restituito 0x%lx\n"
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "impossibile chiedere la password in modo batch\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "Inserisci la passphrase: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4060,22 +4136,22 @@ msgstr ""
"Ti serve una passphrase per sbloccare la chiave segreta\n"
"dell'utente: \""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (key ID principale %08lX)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "Ripeti la passphrase: "
@@ -4315,27 +4391,38 @@ msgstr ""
"nella modalit� --pgp2 puoi fare firme separate solo con chiavi in stile PGP "
"2.x\n"
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
-msgstr "impossibile creare %s: %s\n"
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
+msgstr "impossibile creare `%s': %s\n"
-#: g10/sign.c:794
-#, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+#: g10/sign.c:771 g10/sign.c:1008
+#, fuzzy, c-format
+msgid "writing to file `%s'\n"
+msgstr "scrittura in `%s'\n"
+
+#: g10/sign.c:795
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr "firma:"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "impossibile aprire il file: %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
"In modalit� -pgp2 puoi firmare in chiaro solo con chiavi in stile PGP 2.x\n"
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr "sar� usato il cifrario %s\n"
@@ -4737,7 +4824,7 @@ msgstr ""
"Impossibile evitare una chiave debole per il cifrario simmetrico;\n"
"ho provato %d volte!\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA richiede l'uso di un algoritmo di hashing con almeno 160 bit\n"
@@ -5111,17 +5198,17 @@ msgstr "Non � disponibile un aiuto"
msgid "No help available for `%s'"
msgstr "Non � disponibile un aiuto per `%s'"
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "errore creando il portachiavi `%s': %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr "portachiavi `%s' creato\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "rebuild della cache del portachiavi fallito: %s\n"
@@ -5164,8 +5251,7 @@ msgstr "Sono state controllate %lu chiavi (%lu firme)\n"
msgid "%s: keyring created\n"
msgstr "%s: portachiavi creato\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5182,29 +5268,34 @@ msgstr ""
"molto\n"
"grande! Dimensioni vicine a 240x288 sono una buona scelta.\n"
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr "Inserisci il nome del file JPEG per l'ID fotografico: "
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "Impossibile aprire la foto \"%s\": %s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
msgid "Are you sure you want to use it (y/N)? "
msgstr "Sei sicuro di volerla usare? (s/N) "
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr "\"%s\": non � un file JPEG\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Is this photo correct (y/N/q)? "
msgstr "Questa foto � giusta? (s/N/q) "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
msgid "unable to display photo ID!\n"
msgstr "impossibile mostrare l'ID fotografico\n"
@@ -5225,45 +5316,51 @@ msgstr ""
"sicuri del file delle opzioni\n"
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
+#, fuzzy
+msgid "this platform requires temporary files when calling external programs\n"
msgstr ""
"questa piattaforma richiede file temporanei quando si chiamano programmi "
"esterni\n"
-#: g10/exec.c:432
-#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
msgstr "impossibile eseguire %s \"%s\": %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:436
+#, fuzzy, c-format
+msgid "unable to execute shell `%s': %s\n"
+msgstr "impossibile eseguire %s \"%s\": %s\n"
+
+#: g10/exec.c:515
#, c-format
msgid "system error while calling external program: %s\n"
msgstr "errore di sistema chiamando il programma esterno: %s\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr "uscita anormale del programma esterno\n"
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr "impossibile eseguire il programma esterno\n"
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr "impossibile leggere la risposta del programma esterno: %s\n"
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "ATTENZIONE: impossibile rimuovere la directory temporanea `%s': %s\n"
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr "mai "
@@ -5420,6 +5517,47 @@ msgstr "errore cercando il record della fiducia: %s\n"
msgid "read error: %s\n"
msgstr "errore di lettura: %s\n"
+#, fuzzy
+#~ msgid "revoked: %s"
+#~ msgstr "[revocata]"
+
+#, fuzzy
+#~ msgid "expired: %s"
+#~ msgstr "[scadenza: %s]"
+
+#, fuzzy
+#~ msgid "expires: %s"
+#~ msgstr "[scadenza: %s]"
+
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "rev! la subchiave � stata revocata: %s\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "rev- trovata una revoca falsificata\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "rev? problema controllando la revoca: %s\n"
+
+#~ msgid "[revoked] "
+#~ msgstr "[revocata]"
+
+#~ msgid "[expired] "
+#~ msgstr "[scaduta]"
+
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr "[scadenza: %s]"
+
+#~ msgid " [expires: %s]"
+#~ msgstr "[scadenza: %s]"
+
+#, fuzzy
+#~ msgid " [revoked: %s]"
+#~ msgstr "[revocata]"
+
+#~ msgid "can't create %s: %s\n"
+#~ msgstr "impossibile creare %s: %s\n"
+
#~ msgid ""
#~ "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n"
#~ msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 31b39439b..1e987c73f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.1\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
"PO-Revision-Date: 2003-12-06 00:44+0900\n"
"Last-Translator: IIDA Yosiaki <[email protected]>\n"
"Language-Team: Japanese <[email protected]>\n"
@@ -49,7 +49,7 @@ msgstr "no"
msgid "nN"
msgstr "nN"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "quit"
@@ -282,6 +282,16 @@ msgstr "���ѤǤ��ʤ���̩���Ǥ�"
msgid "keyserver error"
msgstr "�������С��Υ��顼"
+#: util/errors.c:108
+#, fuzzy
+msgid "canceled"
+msgstr "����󥻥�"
+
+#: util/errors.c:109
+#, fuzzy
+msgid "no card"
+msgstr "�Ź沽����Ƥ��ޤ���"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr ""
@@ -304,7 +314,7 @@ msgstr "�Х��򸫤Ĥ����褦�Ǥ� ... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "����ȥ��ԡ������⥸�塼�뤬�����Ф���Ƥ��ޤ���\n"
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "��%s�פ������ޤ���: %s\n"
@@ -336,7 +346,7 @@ msgstr "��%s�פ��ɤ�ޤ���: %s\n"
msgid "note: random_seed file not updated\n"
msgstr "����: random_seed �ե�����ι����򤷤ޤ���\n"
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr "��%s�פ��Ǥ��ޤ���: %s\n"
@@ -404,7 +414,7 @@ msgstr "%d �ӥå�̤�����ǿ��������Ǥ��ޤ���\n"
msgid "can't generate a prime with less than %d bits\n"
msgstr "%d �ӥå�̤�����ǿ��������Ǥ��ޤ���\n"
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -412,128 +422,128 @@ msgstr ""
"@���ޥ��:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[�ե�����]|��̾�����"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[�ե�����]|���ꥢ��̾�����"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "ʬΥ��̾�����"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "�ǡ�����Ź沽"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "�ǡ��������� (����)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "��̾�򸡾�"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "�����"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "���Ƚ�̾�ΰ���"
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "���ν�̾�򸡺�"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "���Ȼ���ΰ���"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "��̩���ΰ���"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "��������������"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "�������ؤ��鸰������"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "��̩���ؤ��鸰������"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "���˽�̾"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "��������Ū�˽�̾"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "���ؤν�̾���Խ�"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "���������������"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "����񤭽Ф�"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "�������С��˸���񤭽Ф�"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "�������С����鸰���ɤ߹���"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "�������С��θ��򸡺�����"
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "�������С����鸰��������������"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "�����ɹ���/ʻ��"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "���ѥǡ����١����򹹿�"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|���르�ꥺ�� [�ե�����]|��å�������������"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -543,59 +553,55 @@ msgstr ""
"���ץ����:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "ASCII���������������"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|̾��|��̾�����Ѥ˰Ź沽"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr ""
"��̾������ˤ��Υ桼����id\n"
"�����"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr ""
"|N|���̥�٥��N������\n"
"(0���󰵽�)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "����ƥ����ȡ��⡼�ɤ����"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "���ϥե�����Ȥ��ƻ���"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "��Ĺ"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "̵�ѹ�"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "������˳�ǧ"
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -604,7 +610,7 @@ msgstr ""
"(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
"�ޥ˥奢�롦�ڡ���������������)\n"
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -624,15 +630,15 @@ msgstr ""
" --list-keys [̾��] ����ɽ��\n"
" --fingerprint [̾��] �����ɽ��\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -642,7 +648,7 @@ msgstr ""
"��̾���������Ź沽������\n"
"�����ư��ϡ����ϥǡ����˰�¸\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -650,518 +656,512 @@ msgstr ""
"\n"
"���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr "������: "
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr "��: "
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr "�ϥå���: "
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
msgid "Compression: "
msgstr "����: "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "�Ȥ���: gpg [���ץ����] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "��Ω���륳�ޥ��\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "=���椬�����롼�������%s����˸��Ĥ���ޤ���\n"
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���ͭ��\n"
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���ͭ��\n"
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���ͭ��\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ�����\n"
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ�����\n"
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ�����\n"
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
-#: g10/g10.c:1205
+#: g10/g10.c:1210
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
-#: g10/g10.c:1334
+#: g10/g10.c:1354
#, fuzzy, c-format
-msgid "unknown configuration item \"%s\"\n"
+msgid "unknown configuration item `%s'\n"
msgstr "�����������ե�����`%s'���Ǥ��ޤ���\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "���ץ���󡦥ե������%s��: %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "��%s�פ��饪�ץ������ɤ߹��ߤޤ�\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "����: ����%s���Ѥ��ޤ���!\n"
-#: g10/g10.c:1887
-#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+#: g10/g10.c:2021
+#, fuzzy, c-format
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr "�����Ǥʤ����ĤΤ��ᡢ�Ź��ĥ��%s�פ�����ɤ��ޤ���\n"
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "%s�ϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "�������С���URI�������ǽ\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ̵���ʽ�Ф����ץ����\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
msgid "invalid import options\n"
msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ̵���ʽ�Ф����ץ����\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
msgid "invalid export options\n"
msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ̵���ʽ�Ф����ץ����\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-path��%s��������ǽ\n"
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "�ٹ�: %s��%s���ͥ��\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s��%s�ȤȤ���Ѥ��뤳�ȤϤǤ��ޤ���!\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s��%s�ȤȤ���Ѥ��Ƥ�̵��̣�Ǥ�!\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ��Ʊ���ˤǤ��ޤ���\n"
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź椬ɬ�פǤ� \n"
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "���򤵤줿�Ź楢�르�ꥺ���̵���Ǥ�\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "���򤵤줿�Ź楢�르�ꥺ���̵���Ǥ�\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
msgid "selected certification digest algorithm is invalid\n"
msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
#, fuzzy
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "̵����default-check-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
#, fuzzy
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "̵����default-check-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
msgid "invalid default preferences\n"
msgstr "̵���ʴ��������\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
msgid "invalid personal cipher preferences\n"
msgstr "̵���ʸĿ��ѰŹ������\n"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
msgid "invalid personal digest preferences\n"
msgstr "̵���ʸĿ������������\n"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
msgid "invalid personal compress preferences\n"
msgstr "̵���ʸĿ��Ѱ��̤�����\n"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
-#: g10/g10.c:2680
-#, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2797
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
-#: g10/g10.c:2685
-#, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2802
+#, fuzzy, c-format
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
-#: g10/g10.c:2690
-#, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2807
+#, fuzzy, c-format
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [�ե�����̾]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [�ե�����̾]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [�ե�����̾]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [�ե�����̾]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "%s��%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [�ե�����̾]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [�ե�����̾]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [�ե�����̾]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "%s��%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [�ե�����̾]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [�ե�����̾]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [�ե�����̾]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key �桼����id"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key �桼����id"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrsign-key �桼����id"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key �桼����id"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key �桼����id [���ޥ��]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "%s�������ޤ���: %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [�桼����id] [����]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, c-format
msgid "key export failed: %s\n"
msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "��������˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "�����˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "̵���ʥϥå��塦���르�ꥺ��`%s'�Ǥ�\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[�ե�����̾]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "���Ϥ��ޤ�����å������򥿥��פ��Ƥ������� ...\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "��%s�פ������ޤ���\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
msgstr ""
"����̾�ˤϰ�����ǽ��ʸ��������Τߤ��Ѥ���'='�ǽ����ʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
msgid "a user notation name must contain the '@' character\n"
msgstr "�桼��������̾�ϡ�'@'ʸ����ޤޤʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "����̾���ͤ�����ʸ�����Ѥ��ƤϤ����ޤ���\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
-#: g10/g10.c:3747
+#: g10/g10.c:3863
#, fuzzy
-msgid "the given signature preferred keyserver URL is invalid\n"
+msgid "the given preferred keyserver URL is invalid\n"
msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "����Ť�"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
msgid "take the keys from this keyring"
msgstr "���θ����ؤ��������ޤ�"
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
msgid "make timestamp conflicts only a warning"
msgstr "������̷���ٹ�����ˤ��ޤ�"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr ""
"|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
"�񤭽Ф�"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "�Ȥ���: gpgv [���ץ����] [�ե�����] (�إ�פ� -h)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1195,12 +1195,13 @@ msgid "invalid dash escaped line: "
msgstr "̵���ʥ��å���ǥ��������פ��줿��: "
#: g10/armor.c:565
-msgid "unexpected armor:"
+#, fuzzy
+msgid "unexpected armor: "
msgstr "ͽ����������:"
-#: g10/armor.c:695 g10/armor.c:1276
-#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+#: g10/armor.c:695 g10/armor.c:1280
+#, fuzzy, c-format
+msgid "invalid radix64 character %02X skipped\n"
msgstr "̵����64��ʸ��%02x��ȤФ��ޤ�\n"
#: g10/armor.c:738
@@ -1211,33 +1212,34 @@ msgstr "�ե������������᤹���ޤ� (CRC������ޤ���)\n"
msgid "premature eof (in CRC)\n"
msgstr "�ե������������᤹���ޤ� (CRC������)\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "CRC�ν񼰤�����������ޤ���\n"
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC���顼��%06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+#, fuzzy
+msgid "premature eof (in trailer)\n"
msgstr "�ե������������᤹���ޤ� (����������ˤ���ޤ�)\n"
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "�����ιԤ˥��顼������ޤ�\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "ͭ����OpenPGP�ǡ��������Ĥ���ޤ���\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "̵��������: �Ԥ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1293,7 +1295,7 @@ msgstr " ��̾ \""
msgid " aka \""
msgstr " ��̾ \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1540,96 +1542,116 @@ msgstr "%s: �����å�: �������ϻ��ѶػߤǤ�\n"
msgid "no valid addressees\n"
msgstr "ͭ���ʥ��ɥ쥹������ޤ���\n"
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "����%c%lu�ν�ʣ\n"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "¿�������%c������\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
#, fuzzy
msgid "too many digest preferences\n"
msgstr "¿�������%c������\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
#, fuzzy
msgid "too many compression preferences\n"
msgstr "¿�������%c������\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "����ʸ�����̵����ʸ��������ޤ�\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
msgid "writing direct signature\n"
msgstr "ľ�ܽ�̾��񤭹��ߤޤ�\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "���ʽ�̾��񤭹��ߤޤ�\n"
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "���б��ؤν�̾��񤭹��ߤޤ�\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "̵���ʸ���������%u�ӥåȤˤ��ޤ�\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "����������%u�ӥåȤ˴ݤ�ޤ�\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "�����ʸ��μ�������򤷤Ƥ�������:\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA��ElGamal (����)\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (��̾�Τ�)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (�Ź沽�Τ�)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (��̾�Τ�)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (�Ź沽�Τ�)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (��̾�ȰŹ沽)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, fuzzy, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) RSA (��̾�Τ�)\n"
+
+#: g10/keygen.c:1224
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) RSA (��̾�ȰŹ沽)\n"
+
+#: g10/keygen.c:1226
+#, fuzzy, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) RSA (�Ź沽�Τ�)\n"
+
+#: g10/keygen.c:1228
+#, fuzzy, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) RSA (��̾�ȰŹ沽)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "�ɤ�ˤ��ޤ���? "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "̵��������Ǥ���\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1642,28 +1664,28 @@ msgstr ""
" ����θ�Ĺ�� 1024 �ӥå�\n"
" ����ο侩��Ĺ�� 2048 �ӥå�\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "�ɤθ�Ĺ�ˤ��ޤ���? (1024) "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA�θ�Ĺ��512����1024�ޤǤǤ�\n"
-#: g10/keygen.c:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "��Ĺ�����������ޤ���RSA�ϺǾ��Ǥ�1024�Ǥ���\n"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "��Ĺ�����������ޤ����Ǿ��Ǥ�768�Ǥ���\n"
-#: g10/keygen.c:1255
+#: g10/keygen.c:1328
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "��Ĺ���礭�����ޤ���%d������Ǥ���\n"
-#: g10/keygen.c:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1671,11 +1693,11 @@ msgstr ""
"2048����礭�ʸ�Ĺ�ϡ��׻����֤� ���� Ĺ���ʤ�Τ�\n"
"�侩���ޤ���!\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "���θ�Ĺ�������ˤ����Ǥ���? "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1683,17 +1705,17 @@ msgstr ""
"�狼��ޤ����������������ʤ��Υ�˥����䥭���ܡ������Ϥϡ�\n"
"����ˤ��������ȼ�Ǥ��뤳�Ȥ򿴤�α��Ƥ����Ƥ�������!\n"
-#: g10/keygen.c:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "�׵ᤵ�줿��Ĺ��%u�ӥå�\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "%u�ӥåȤ˴ݤ�ޤ�\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1709,7 +1731,7 @@ msgstr ""
" <n>m = ͭ������ n �����\n"
" <n>y = ͭ������ n ǯ��\n"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1725,29 +1747,29 @@ msgstr ""
" <n>m = ͭ������ n �����\n"
" <n>y = ͭ������ n ǯ��\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "����ͭ�����֤�? (0)"
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr "��̾��ͭ�����֤�? (0)"
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "̵������\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s��̵���¤Ǥ�\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr "%s��%s�ˤƴ����ڤ�ˤʤ�ޤ�\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1755,16 +1777,17 @@ msgstr ""
"���Υ����ƥ�Ǥϡ�2038ǯ�ʹߤ����դ�ɽ���Ǥ��ޤ��󤬡�\n"
"2106ǯ�ޤǤʤ������������Ǥ��ޤ���\n"
-#: g10/keygen.c:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "����Ǥ����Ǥ��� (y/n)? "
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
+#, fuzzy
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
@@ -1775,44 +1798,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "��̾: "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "̾����̵����ʸ��������ޤ�\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr "̾��������ǻϤ�ƤϤ����ޤ���\n"
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr "̾����5ʸ���ʾ�Ǥʤ���Фʤ�ޤ���\n"
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "�Żҥ᡼�롦���ɥ쥹: "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "ͭ�����Żҥ᡼�롦���ɥ쥹�ǤϤ���ޤ���\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "������: "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "�����Ȥ�̵����ʸ��������ޤ�\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "���ʤ���ʸ������`%s'��ȤäƤ��ޤ���\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1823,27 +1846,27 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
-#: g10/keygen.c:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ��Ͻ�λ(Q)? "
-#: g10/keygen.c:1542
+#: g10/keygen.c:1615
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ���OK(O)����λ(Q)? "
-#: g10/keygen.c:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr "�ޤ����顼�������Ƥ�������\n"
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1851,16 +1874,16 @@ msgstr ""
"��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr "�ѥ��ե졼��������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1872,7 +1895,7 @@ msgstr ""
"�Ρ�--edit-key�ץ��ץ����Ǥ��ĤǤ��ѹ��Ǥ��ޤ���\n"
"\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1883,58 +1906,58 @@ msgstr ""
"�Ȥ����ǥ������˥�����������Ȥ���¾�Τ��Ȥ򤹤�ȡ���������Ҥ�\n"
"�𻨤����礭�ʤ���������������䤹���ʤ�Τǡ������ᤷ�ޤ���\n"
-#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr "��ǰ�ʤ��顢�Хå��⡼�ɤǤϤǤ��ޤ���\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA���Ф�1024�ӥåȤˤʤ�ޤ���\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "������������ߤ���ޤ�����\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr "��%s�פظ�������񤭹��ߤޤ�\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "����߲�ǽ�ʸ������ؤ����Ĥ���ޤ���: %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "����߲�ǽ����̩���ؤ����Ĥ���ޤ���: %s\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "��������`%s'�ν���ߥ��顼: %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "��̩���ء�%s�פν���ߥ��顼: %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "����������̩�����ꡢ��̾���ޤ�����\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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"
@@ -1942,31 +1965,60 @@ msgstr ""
"���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
"��--edit-key�ץ��ޥ�ɤ��Ѥ����������������Ƥ���������\n"
-#: g10/keygen.c:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr "���������˼��Ԥ��ޤ���: %s\n"
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
-#: g10/keygen.c:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "����: v3���������κ����ϡ�OpenPGP��Ŭ�礷�ޤ���\n"
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "�����˺��ޤ���? "
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "��%s�פ��Ǥ��ޤ���: %s\n"
+
+#: g10/keygen.c:3248
+#, fuzzy, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "����: ��̩��%08lX��%s�Ǵ����ڤ�Ǥ�\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
@@ -1977,7 +2029,7 @@ msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
msgid "%s: can't open: %s\n"
msgstr "%s: �����ޤ���: %s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "�ѥ��ե졼���κ������顼: %s\n"
@@ -2005,6 +2057,11 @@ msgstr "%s: �ٹ�: ���Υե�����Ǥ�\n"
msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
msgstr "--pgp2�⡼�ɤǤ�2048�ӥåȰʲ���RSA���ǰŹ沽�����Ǥ��ޤ���\n"
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "%s�������ޤ���: %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -2015,22 +2072,30 @@ msgid ""
"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
msgstr "�Ź沽���褦�Ȥ��Ƥ��븰������IDEA�Ź��Ȥ��ޤ���\n"
-#: g10/encode.c:526 g10/encode.c:721
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#: g10/encode.c:526
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "�оΰŹ楢�르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
-#: g10/encode.c:634 g10/sign.c:863
-#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+#: g10/encode.c:634 g10/sign.c:864
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
msgstr "���̥��르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "�оΰŹ楢�르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
+
#: g10/encode.c:818
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s�Ź沽 ������: \"%s\"\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "����%s�פ����Ĥ���ޤ���: %s\n"
@@ -2063,8 +2128,9 @@ msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "pk����å���Υ���ȥ꡼��¿�����ޤ� - ���Ѷػ�\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+#, fuzzy
+msgid "[User ID not found]"
msgstr "[�桼����id�����Ĥ���ޤ���]"
#: g10/getkey.c:1614
@@ -2217,7 +2283,7 @@ msgstr "��%08lX: HKP��������¤����\n"
#: g10/import.c:722
#, fuzzy, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "��%08lX: ��������̤���ʽ�̾�Υ桼����ID '%s'\n"
#: g10/import.c:728
@@ -2244,7 +2310,7 @@ msgstr "�� %08lX: ���������Ǥ� - �����å�\n"
msgid "no writable keyring found: %s\n"
msgstr "����߲�ǽ�ʸ��ؤ����Ĥ���ޤ���: %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "��%s�פؤν�Ф�\n"
@@ -2356,12 +2422,12 @@ msgstr "��%08lX: ��̾���б�����桼����ID������ޤ���\n"
#: g10/import.c:1299
#, fuzzy, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "��%08lX: �桼����id��%s�פΥ��ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
#: g10/import.c:1301
#, fuzzy, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "��%08lX: �桼����id��%s�פμ��ʽ�̾����̵���Ǥ�\n"
#: g10/import.c:1319
@@ -2401,7 +2467,7 @@ msgstr "��%08lX: ̵���������μ����������ޤ�\n"
#: g10/import.c:1439
#, fuzzy, c-format
-msgid "key %s: skipped user ID '%s'\n"
+msgid "key %s: skipped user ID \"%s\"\n"
msgstr "��%08lX: �����åפ����桼����ID '"
#: g10/import.c:1460
@@ -2411,7 +2477,7 @@ msgstr "��%08lX: �����åפ�������\n"
#: g10/import.c:1487
#, fuzzy, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "��%08lX: ��Ф��ԲĤʽ�̾ (���饹%02x) - �����å�\n"
#: g10/import.c:1497
@@ -2444,112 +2510,112 @@ msgstr "��%08lX: ��ʣ�����桼����ID�θ��� - ʻ��\n"
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "�ٹ�: ��%08lX�ϼ������줿�褦�Ǥ�: ������%08lX�ΰ����Ф�\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "�ٹ�: ��%08lX�ϼ������줿�褦�Ǥ�: ������%08lX���Ժߡ�\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "��%08lX: ��%s�׼�����������ɲ�\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "��%08lX: ľ�ܸ���̾���ɲ�\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[����]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[���ʽ�̾]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "̵���ʽ�̾1��\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "̵���ʽ�̾%d��\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "�����ʤ�����1�Ĥν�̾�򸡺����ޤ���\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "�����ʤ�����%d�Ĥν�̾�򸡺����ޤ���\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "���顼�Τ���1�Ĥν�̾�򸡺����ޤ���\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "���顼�Τ���%d�Ĥν�̾�򸡺����ޤ���\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��1�ĸ���\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��%d�ĸ���\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, fuzzy, c-format
msgid " (%d) I trust marginally\n"
msgstr " %d = �������ٿ��Ѥ���\n"
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, fuzzy, c-format
msgid " (%d) I trust fully\n"
msgstr " %d = �����˿��Ѥ���\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "�桼����ID��%s�פϡ���������Ƥ��ޤ���"
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "����Ǥ⤳�θ��˽�̾�������Ǥ���? (y/N) "
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr " ��̾��ǽ��\n"
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "�桼����ID��%s�פϡ������ڤ�Ǥ���"
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "�桼����ID��%s�פϡ����ʽ�̾����Ƥ��ޤ���"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2558,11 +2624,11 @@ msgstr ""
"\"%s\" �ˤ������뼫�ʽ�̾�ϡ�\n"
"PGP 2.x�����ν�̾�Ǥ���\n"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "OpenPGP�μ��ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2571,11 +2637,11 @@ msgstr ""
"��%s�פˤ������뺣�Τ��ʤ��ν�̾��\n"
"�����ڤ�Ǥ���\n"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "�����ڤ��̾�򿷤�����̾�ȸ򴹤������Ǥ���? (y/N) "
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2584,53 +2650,53 @@ msgstr ""
"\"%s\" �ˤ������뺣�Τ��ʤ��ν�̾��\n"
"������̾�Ǥ���\n"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "��Ф���ǽ�ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" �ϸ�%08lX�Ǥ⤦������̾���Ƥ���ޤ�\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" �ϸ�%08lX�Ǥ⤦��̾���Ƥ���ޤ�\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "����Ǥ��̾�������Ǥ���? (y/N) "
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "��%08lX�ǽ�̾�����ΤϤ���ޤ���\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "���θ��ϴ����ڤ�Ǥ�!"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "���θ���%s�Ǵ��¤��ڤ�ޤ���\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Ʊ���˽�̾������ڤ�ˤ������Ǥ���? (Y/n) "
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
msgstr "--pgp2�⡼�ɤǤ�PGP 2.x����OpenPGP��̾���Ǥ��ʤ����⤷��ޤ���\n"
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "���θ���PGP 2.x�ǻ��ѤǤ��ʤ��ʤ�ޤ���\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2639,37 +2705,37 @@ msgstr ""
"��̾���褦�Ȥ��Ƥ��븰���ºݤ˾嵭��̾���οͤΤ�Τ��ɤ������ɤ�����\n"
"���դ��Ƹ��ڤ��ޤ�����? �����狼��ʤ���С���0�פ����Ϥ��Ƥ���������\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) �����ޤ���%s\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) �������������Ƥ��ޤ���%s\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) ������������ޤ�����%s\n"
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) ���ʤ����դ��Ƹ������ޤ�����%s\n"
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr "�����? (�ܺ٤ϡ�?�פ�): "
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
msgstr "�����ˤ��θ��ˤ��ʤ��θ��ǽ�̾���Ƥ褤�Ǥ���: \""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2677,7 +2743,7 @@ msgstr ""
"\n"
"���ʽ�̾�ˤʤ�Ǥ��礦��\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2685,7 +2751,7 @@ msgstr ""
"\n"
"�ٹ�: ��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2693,7 +2759,7 @@ msgstr ""
"\n"
"�ٹ�: ��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2701,7 +2767,7 @@ msgstr ""
"\n"
"��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2709,7 +2775,7 @@ msgstr ""
"\n"
"��̾�ϼ����ԲĤ����ꤵ��ޤ���\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2717,7 +2783,7 @@ msgstr ""
"\n"
"���θ����������������Ƥ��ޤ���\n"
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2725,7 +2791,7 @@ msgstr ""
"\n"
"���θ��ϰ�����������ޤ�����\n"
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2733,34 +2799,34 @@ msgstr ""
"\n"
"���θ��ϡ����ʤ����դ��Ƹ������ޤ�����\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "�����˽�̾���ޤ���? "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "���θ����ݸ��Ƥ��ޤ���\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr "�縰����̩��ʬ�������ޤ���\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "�����ݸ��Ƥ��ޤ���\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "���θ����Խ��Ǥ��ޤ���: %s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2768,7 +2834,7 @@ msgstr ""
"������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2777,544 +2843,566 @@ msgstr ""
"�����餯����Ϥ����ʹͤ��ǤϤ���ޤ���!\n"
"\n"
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "�����˼¹Ԥ��ޤ���? "
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "���ν�̾�����������˰�ư���ޤ�\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "���Υ�˥塼��λ"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "q"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "save"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "��¸���ƽ�λ"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "help"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "���Υإ�פ�ɽ��"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "�����ɽ��"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "list"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "���ȥ桼����ID�ΰ���"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "�桼����ID N������"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "key"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "����N������"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "check"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "��̾�ΰ���"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "c"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "���ؽ�̾"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "s"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "tsign"
msgstr "sign"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "make a trust signature"
msgstr "ʬΥ��̾�����"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "��������Ū�˽�̾"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr "�����Ǥ��ʤ��褦���ؽ�̾"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "sign the key locally and non-revocably"
msgstr "�����Ǥ��ʤ��褦��������Ū�˽�̾"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "�桼����ID���ɲ�"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr "addphoto"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr "�ե���ID���ɲ�"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "�桼����ID�κ��"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr "delphoto"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "�������ɲ�"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+#, fuzzy
+msgid "addcardkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "������"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "addrevoker"
msgstr "addrevoker"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "add a revocation key"
msgstr "���������ɲ�"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "��̾�κ��"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "ͭ�����¤��ѹ�"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr "primary"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr "�桼����ID���ˤ���"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "��̩���ȸ������ΰ��������ؤ�"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "t"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr "�����ΰ��� (�������ѡ���)"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr "�����ΰ��� (��Ĺ)"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr "�������������"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr "�����ΰ����򹹿�"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "keyserver"
msgstr "�������С��Υ��顼"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "set preferred keyserver URL"
msgstr "�������С���URI�������ǽ\n"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "�ѥ��ե졼�����ѹ�"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "��ͭ�Կ��Ѥ��ѹ�"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "��̾�μ���"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revuid"
msgstr "revuid"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revoke a user ID"
msgstr "�桼����ID�μ���"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "�������"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "���λ��Ѥ�ػߤ���"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "���λ��Ѥ���Ĥ���"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr "showphoto"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr "�ե���ID��ɽ��"
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "����ϥХå��⡼�ɤǤϤǤ��ޤ���\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "��̩���֥��å���%s�פ��ɹ��ߥ��顼: %s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "��̩�������ѤǤ��ޤ���\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "���ޥ��> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr "�ޤ���toggle�ץ��ޥ�ɤ�ȤäƤ�������\n"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
msgid "Key is revoked."
msgstr "���ϡ���������Ƥ��ޤ���"
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "���������桼����ID�˽�̾���ޤ���? "
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "�Ǹ�Υ桼����ID�Ϻ���Ǥ��ޤ���!\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "���򤷤����桼����ID�������˺�����ޤ���? "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "���Υ桼����ID�������˺�����ޤ���? "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+#, fuzzy
+msgid "Really move the primary key? "
+msgstr "���Υ桼����ID�������˺�����ޤ���? "
+
+#: g10/keyedit.c:1598
+#, fuzzy
+msgid "You must select exactly one key.\n"
+msgstr "���򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "���򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "���򤷤����������˺�����ޤ���? "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "���θ��������˺�����ޤ���? "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
msgid "Really revoke all selected user IDs? "
msgstr "���򤷤����桼����ID�������˼������ޤ���? "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
msgid "Really revoke this user ID? "
msgstr "���Υ桼����ID�������˼������ޤ���? "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "���򤷤����������˼������ޤ���? "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "���θ��������˼������ޤ���? "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
#, fuzzy
msgid "Set preference list to:\n"
msgstr "�������������"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr "���򤷤��桼����ID�������������˹������ޤ���? "
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr "�����������˹������ޤ���? "
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "�ѹ�����¸���ޤ���? "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "��¸�����˽�λ���ޤ���? "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "�����˼��Ԥ��ޤ���: %s\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "��̩���ι����˼��Ԥ��ޤ���: %s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "����̵�ѹ��ʤΤǹ����Ϥ���ޤ���\n"
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "̵���ʥ��ޥ�� (��help�פ򻲾�)\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr "����: "
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr "��ǽ: "
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keyedit.c:2219
#, c-format
msgid "This key may be revoked by %s key "
msgstr "���θ��ϡ�%s���ˤ�äƼ������줿�褦�Ǥ� "
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr " (�ǥꥱ����)"
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "%s������Ǥ��ޤ���: %s\n"
-#: g10/keyedit.c:2084
-#, fuzzy, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
msgstr "[����] "
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
-msgstr " [ͭ������: %s]"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
+msgstr "expire"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2246
#, fuzzy, c-format
-msgid "expires: %s"
-msgstr " [ͭ������: %s]"
+msgid "usage: %s"
+msgstr " trust: %c/%c"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, fuzzy, c-format
msgid "trust: %s"
msgstr " trust: %c/%c"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! �����ϼ����ѤߤǤ�: %s\n"
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
-msgstr "rev- �Ǥä������μ�����ȯ��\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? ���������㳲: %s\n"
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-#, fuzzy
-msgid "revoked"
-msgstr "[����] "
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-#, fuzzy
-msgid "expired"
-msgstr "expire"
+#: g10/keyedit.c:2300
+msgid "card-no: "
+msgstr ""
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x�����桼����ID��������������ޤ���\n"
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3322,15 +3410,7 @@ msgstr ""
"�ץ�������Ƶ�ư����ޤǡ�ɽ�����줿����ͭ�������������ʤ����⤷��ʤ���\n"
"�Ȥ������Ȥ�ǰƬ���֤��Ƥ���������\n"
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-msgid "[revoked] "
-msgstr "[����] "
-
-#: g10/keyedit.c:2274
-msgid "[expired] "
-msgstr "[��λ] "
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@ -3338,7 +3418,7 @@ msgstr ""
"�ٹ�: ��Ȥʤ�桼����ID������ޤ��󡣤��Υ��ޥ�ɤϡ��̤�\n"
" �桼����ID����ˤʤ�Ȳ��ꤹ���礬����ޤ���\n"
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3347,45 +3427,45 @@ msgstr ""
"�ٹ�: �����PGP2�����θ��Ǥ����ե���ID���ɲäǡ��������Ǥ�PGP�ϡ�\n"
" ���θ�����ݤ��뤫�⤷��ޤ���\n"
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
msgid "Are you sure you still want to add it? (y/N) "
msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "PGP2�����θ��ˤϥե���ID���ɲäǤ��ʤ����⤷��ޤ���\n"
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "������������̾�������ޤ���? (y/N/q)"
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d�Ĥν�̾�������ޤ�����\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d�Ĥν�̾�������ޤ�����\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "���������Ƥ��ޤ���\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3394,88 +3474,98 @@ msgstr ""
"�ٹ�: �����PGP 2.x�����θ��Ǥ�����̾�����Ԥ��ɲäǡ��������Ǥ�PGP�ϡ�\n"
" ���θ�����ݤ��뤫�⤷��ޤ���\n"
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "PGP 2.x�����θ��ˤϻ�̾�����Ԥ��ɲäǤ��ʤ����⤷��ޤ���\n"
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
msgid "Enter the user ID of the designated revoker: "
msgstr "��̾�����ԤΥ桼����ID�����Ϥ��Ƥ�������: "
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "PGP 2.x�����θ��ϡ���̾�����Ԥ�Ǥ̿�Ǥ��ޤ���\n"
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "��̾�����Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "�ٹ�: ���θ����ܿͤˤ�äƼ�������Ƥ��ޤ�!\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "�ٹ�: ���븰���̾�����Ԥ����ꤹ��ȡ������᤻�ޤ���!\n"
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr "�����ˤ��θ����̾�����Ԥ����ꤷ�ޤ���? (y/N): "
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "��̩���������Ȥ��Ƥ���������\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "������ͭ�����¤��ѹ����ޤ���\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "��̩���ؤ��б������̾������ޤ���\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
msgid "Please select exactly one user ID.\n"
msgstr "�桼����ID�򤭤ä���ҤȤ����򤷤Ƥ���������\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
-#, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "�桼����id��%s�פ�v3���ʽ�̾��ȤФ��ޤ�\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+#, fuzzy
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "����Ǥ������˻��Ѥ������Ǥ��� (y/N)? "
+
+#: g10/keyedit.c:3480
+#, fuzzy
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "����Ǥ������˻��Ѥ������Ǥ��� (y/N)? "
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "%d�֤������Ϥ���ޤ���\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "�桼����ID: \""
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3484,7 +3574,7 @@ msgstr ""
"\"\n"
"���ʤ��θ�%08lX��%s�˽�̾����Ƥ��ޤ�\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3493,142 +3583,126 @@ msgstr ""
"\"\n"
"���ʤ��θ�%08lX��%s������Ū�˽�̾����Ƥ��ޤ�\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, c-format
msgid "This signature expired on %s.\n"
msgstr "���ν�̾��%s�Ǵ����ڤ�Ǥ���\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "����Ǥ������˼����������Ǥ���? (y/N) "
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "���ν�̾�ˤ������뼺�����������ޤ���? (y/N) "
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "�����Υ桼����ID�˽�̾���ޤ���:\n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid " signed by %s on %s%s%s\n"
msgstr " %08lX��%s%s%s�˽�̾����Ƥ��ޤ�\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid " revoked by %s on %s\n"
msgstr " %08lX��%s�˼�������Ƥ��ޤ�\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "�����ν�̾�򼺸����褦�Ȥ��Ƥ��ޤ�:\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, fuzzy, c-format
msgid " signed by %s on %s%s\n"
msgstr " %08lX��%s%s�˽�̾����Ƥ��ޤ�\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr " (��Ф��Բ�)"
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
msgid "Really create the revocation certificates? (y/N) "
msgstr "����������������˺��ޤ���? (y/N) "
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "��̩��������ޤ���\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "�桼����ID��%s�פϡ��⤦��������Ƥ��ޤ�\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "�ٹ�: �桼����ID��̾����%d��̤��Ǥ�\n"
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "%s�򥵥���%ld�θ�0x%08lX (uid %d) �Υե���ID�Ȥ���ɽ��\n"
-#: g10/keylist.c:179
+#: g10/keylist.c:180
msgid "Critical signature policy: "
msgstr "����ƥ�����ʽ�̾�ݥꥷ��: "
-#: g10/keylist.c:181
+#: g10/keylist.c:182
msgid "Signature policy: "
msgstr "��̾�ݥꥷ��: "
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "�ٹ�: ̵��������ǡ���������ޤ�\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
msgid "Critical signature notation: "
msgstr "����ƥ�����ʽ�̾����: "
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr "��̾����: "
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr "�ͤˤ��ɤ�ޤ���"
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr "����"
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr " [ͭ������: %s]"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr " [ͭ������: %s]"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, fuzzy, c-format
-msgid " [revoked: %s]"
-msgstr "[����] "
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
msgid "Primary key fingerprint:"
msgstr "�縰�λ���:"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
msgid " Subkey fingerprint:"
msgstr "�������:"
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
msgid " Primary key fingerprint:"
msgstr " �縰�λ���:"
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
msgid " Subkey fingerprint:"
msgstr " �������:"
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr " ���� ="
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3833,79 +3907,79 @@ msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "proc_tree() �����̵���ʥѥ��åȤ򸡽Ф��ޤ���\n"
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "����������פ�̵���ˤǤ��ޤ���: %s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "�¸���Υ��르�ꥺ��ϻ��Ѥ��٤��ǤϤ���ޤ���!\n"
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"���ΰŹ楢�르�ꥺ��ϡ�����뤵��Ƥ��ޤ���\n"
"��ä�ɸ��Ū�ʥ��르�ꥺ����Ѥ��Ƥ�������!\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr "IDEA�Ź�Υץ饰���󤬤���ޤ���\n"
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr "�ܺ٤ϡ�http://www.gnupg.org/why-not-idea.html������������\n"
-#: g10/misc.c:491
+#: g10/misc.c:517
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: ����뤵��Ƥ��륪�ץ�����%s��\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "�ٹ�: ��%s�פϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "��%s%s�פ�����˻ȤäƤ�������\n"
-#: g10/misc.c:508
+#: g10/misc.c:534
msgid "Uncompressed"
msgstr "̤����"
-#: g10/misc.c:533
+#: g10/misc.c:559
#, fuzzy
msgid "uncompressed|none"
msgstr "̤����"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "���Υ�å������ϡ�%s�Ǥϻ��ѤǤ��ʤ����⤷��ޤ���\n"
-#: g10/misc.c:777
+#: g10/misc.c:826
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "��%s�פ��饪�ץ������ɤ߹��ߤޤ�\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "����μ���͡�%s�פ����Ĥ���ޤ���\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "�������Υ��르�ꥺ��%d�ϻ��ѤǤ��ޤ���\n"
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "�ٹ�: ����Ū�˷��ݤ��оΰŹ楻�å���󸰤Ǥ�\n"
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "������%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
@@ -3944,7 +4018,7 @@ msgstr "`%s'����³�Ǥ��ޤ���: %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "gpg-agent�Ȥ��̿��㳲\n"
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr "����������Ȥ˾㳲: ��������������Ѷػ�\n"
@@ -3980,24 +4054,24 @@ msgstr "�ѥ��ե졼����Ĺ�᤮�ޤ�\n"
msgid "invalid response from agent\n"
msgstr "����������Ȥ����̵���ʱ���\n"
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "�桼�����ˤ���ä�\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "�Хå��⡼�ɤǤϥѥ���ɤ���礻���Ǥ��ޤ���\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "�ѥ��ե졼��������: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4007,22 +4081,22 @@ msgstr ""
"���Υ桼��������̩���Υ��å���������ˤ�\n"
"�ѥ��ե졼��������ޤ�: \""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u�ӥå�%s��, ID %08lX�������դ�%s"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (�縰ID %08lX)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "�ѥ��ե졼���������: "
@@ -4230,25 +4304,36 @@ msgstr "�ٹ�: `%s'�϶��Υե�����Ǥ�\n"
msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "--pgp2�⡼�ɤǤϡ�PGP 2.x�����θ���ʬΥ��̾�Ǥ�������Ǥ�\n"
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
-msgstr "%s������Ǥ��ޤ���: %s\n"
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
+msgstr "��%s�פ��Ǥ��ޤ���: %s\n"
-#: g10/sign.c:794
-#, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+#: g10/sign.c:771 g10/sign.c:1008
+#, fuzzy, c-format
+msgid "writing to file `%s'\n"
+msgstr "��%s�פؤν�Ф�\n"
+
+#: g10/sign.c:795
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr "��̾:"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "�ե����뤬�����ޤ���: %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "--pgp2�⡼�ɤǤ�PGP 2.x�����θ��ǥ��ꥢ��̾�����Ǥ��ޤ���\n"
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s�Ź沽����Ѥ��ޤ�\n"
@@ -4644,7 +4729,7 @@ msgstr "�夤�����Ǥ��ޤ��� - �Ƽ¹�\n"
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr "�оΰŹ�ˡ�μ夤������򤹤뤳�Ȥ��Ǥ��ޤ���%d���ߤޤ���!\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA�Ǥ�160�ӥåȤΥϥå��塦���르�ꥺ��λ��Ѥ�ɬ�פǤ�\n"
@@ -5001,17 +5086,17 @@ msgstr "�إ�פϤ���ޤ���"
msgid "No help available for `%s'"
msgstr "��%s�פΥإ�פϤ���ޤ���"
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "���ء�%s�פκ������顼: %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr "���ء�%s�פ��Ǥ��ޤ���\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "���إ���å���κƹ��ۤ˼��Ԥ��ޤ���: %s\n"
@@ -5054,8 +5139,7 @@ msgstr "%lu�Ĥθ��ޤǸ��� (%lu�Ĥν�̾)\n"
msgid "%s: keyring created\n"
msgstr "%s: ���ؤ��Ǥ��ޤ���\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5069,29 +5153,34 @@ msgstr ""
"���Ƥ����ޤ��礦���⤷�礭�ʼ̿���Ȥ��ȡ����ʤ��θ���Ʊ�ͤ��礭���ʤ�\n"
"�ޤ�! ���餤�ˤ����ޤ��礭���β����ϡ��Ȥ��褤�Ǥ��礦��\n"
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr "�ե���ID�Ѥ�JPEG�ե�����̾�����Ϥ��Ƥ�������: "
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "�̿����%s�פ򳫤����Ȥ��Ǥ��ޤ���: %s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
msgid "Are you sure you want to use it (y/N)? "
msgstr "����Ǥ������˻��Ѥ������Ǥ��� (y/N)? "
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr "��%s�פϡ�JPEG�ե�����ǤϤ���ޤ���\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Is this photo correct (y/N/q)? "
msgstr "���μ̿����������Ǥ��� (y/N/q)? "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
msgid "unable to display photo ID!\n"
msgstr "�ե���ID��ɽ����ǽ!\n"
@@ -5112,44 +5201,50 @@ msgstr ""
"�����ץ������θƽФ��ϡ����ѶػߤǤ���\n"
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
+#, fuzzy
+msgid "this platform requires temporary files when calling external programs\n"
msgstr ""
"���Υץ�åȥۡ�����ȡ������ץ������θƽФ��ˤϡ�����ե����뤬ɬ�פǤ�\n"
-#: g10/exec.c:432
-#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
msgstr "�¹ԤǤ��ޤ��� %s \"%s\": %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:436
+#, fuzzy, c-format
+msgid "unable to execute shell `%s': %s\n"
+msgstr "�¹ԤǤ��ޤ��� %s \"%s\": %s\n"
+
+#: g10/exec.c:515
#, c-format
msgid "system error while calling external program: %s\n"
msgstr "�����ץ������θƽФ��ǥ����ƥࡦ���顼: %s\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr "�����ץ�����ब���Լ����˽�λ\n"
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr "�����ץ�������¹ԤǤ��ޤ���\n"
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr "�����ץ������α������ɤ߹���ޤ���: %s\n"
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr "�ٹ�: ����ե���������Ǥ��ޤ��� (%s) `%s': %s\n"
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "�ٹ�: ����ǥ��쥯�ȥ꡼��%s�פ����Ǥ��ޤ���: %s\n"
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr "̵���� "
@@ -5304,6 +5399,47 @@ msgstr "���ѥ쥳���ɤθ������顼: %s\n"
msgid "read error: %s\n"
msgstr "�ɹ��ߥ��顼: %s\n"
+#, fuzzy
+#~ msgid "revoked: %s"
+#~ msgstr "[����] "
+
+#, fuzzy
+#~ msgid "expired: %s"
+#~ msgstr " [ͭ������: %s]"
+
+#, fuzzy
+#~ msgid "expires: %s"
+#~ msgstr " [ͭ������: %s]"
+
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "rev! �����ϼ����ѤߤǤ�: %s\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "rev- �Ǥä������μ�����ȯ��\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "rev? ���������㳲: %s\n"
+
+#~ msgid "[revoked] "
+#~ msgstr "[����] "
+
+#~ msgid "[expired] "
+#~ msgstr "[��λ] "
+
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr " [ͭ������: %s]"
+
+#~ msgid " [expires: %s]"
+#~ msgstr " [ͭ������: %s]"
+
+#, fuzzy
+#~ msgid " [revoked: %s]"
+#~ msgstr "[����] "
+
+#~ msgid "can't create %s: %s\n"
+#~ msgstr "%s������Ǥ��ޤ���: %s\n"
+
#~ msgid ""
#~ "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n"
#~ msgstr ""
diff --git a/po/nl.po b/po/nl.po
index be7376702..1fcbbf18b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
"PO-Revision-Date: 2004-05-10 19:23+0200\n"
"Last-Translator: Elros Cyriatan <[email protected]>\n"
"Language-Team: Dutch <[email protected]>\n"
@@ -48,7 +48,7 @@ msgstr "nee"
msgid "nN"
msgstr "nN"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "afsluiten"
@@ -281,6 +281,16 @@ msgstr "onbruikbare geheime sleutel"
msgid "keyserver error"
msgstr "sleutelserverfout"
+#: util/errors.c:108
+#, fuzzy
+msgid "canceled"
+msgstr "Annuleren"
+
+#: util/errors.c:109
+#, fuzzy
+msgid "no card"
+msgstr "niet gecodeerd"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr ""
@@ -303,7 +313,7 @@ msgstr "u heeft een softwarefout gevonden ... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "geen entropie verzamelende module gevonden\n"
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "kan `%s' niet openen: %s\n"
@@ -336,7 +346,7 @@ msgstr "kan `%s' niet lezen: %s\n"
msgid "note: random_seed file not updated\n"
msgstr "let op: random_seed bestand niet bijgewerkt\n"
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr "kan `%s' niet aanmaken: %s\n"
@@ -408,7 +418,7 @@ msgstr ""
msgid "can't generate a prime with less than %d bits\n"
msgstr ""
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -416,128 +426,128 @@ msgstr ""
"@Opdrachten:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[bestand]|een ondertekening maken"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[bestand]|een niet-gecodeerde ondertekening maken"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "een losse ondertekening maken"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "gegevens coderen"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "slechts met symmetrische codering coderen"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "gegevens decoderen (standaard)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "een ondertekening controleren"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "sleutels opsommen"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "sleutels en ondertekeningen opsommen"
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "sleutelondertekeningen controleren"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "sleutels en vingerafdrukken opsommen"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "geheime sleutels opsommen"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "een nieuw sleutelpaar genereren"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "sleutels uit de openbare sleutelbos verwijderen"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "sleutels uit de geheime sleutelbos verwijderen"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "een sleutel ondertekenen"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "een sleutel lokaal ondertekenen"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "een sleutel ondertekenen of bewerken"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "een herroepingscertificaat genereren"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "sleutels uitvoeren"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "sleutels uitvoeren naar een sleutelserver"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "sleutels invoeren van een sleutelserver"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "zoeken naar sleutels op een sleutelserver"
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "alle sleutels bijwerken vanaf een sleutelserver"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "sleutels invoeren/samenvoegen"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "de vertrouwensgegevensbank bijwerken"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|algoritme [bestanden]|berichtdigest weergeven"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -547,55 +557,51 @@ msgstr ""
"Opties:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "ASCII-bepantserde uitvoer maken"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|NAAM|coderen voor NAAM"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr "deze gebruikerscode gebruiken om te ondertekenen of decoderen"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr "|N|inpakniveau N instellen (0 zet dit uit)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "kanonieke tekstmodus gebruiken"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "gebruiken als uitvoerbestand"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "breedsprakig"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "geen wijzigingen maken"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "vragen alvorens te overschrijven"
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -604,7 +610,7 @@ msgstr ""
"(Zie de man-handleiding voor een volledige lijst met alle opdrachten en "
"opties)\n"
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -624,17 +630,17 @@ msgstr ""
" --list-keys [namen] sleutels weergeven\n"
" --fingerprint [namen] vingerafdrukken weergeven\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Rapporteer softwarefouten alstublieft aan <[email protected]>.\n"
"Rapporteer fouten in de vertaling alstublieft aan <[email protected]>.\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Gebruik: gpg [opties] [bestanden] (-h voor hulp)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -644,7 +650,7 @@ msgstr ""
"ondertekenen, controleren, coderen of decoderen\n"
"standaardbewerking hangt af van invoergegevens\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -652,472 +658,466 @@ msgstr ""
"\n"
"Ondersteunde algoritmes:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr "Openbare sleutel: "
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr "Codering: "
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr "Hash: "
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
msgid "Compression: "
msgstr "Compressie: "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "gebruik: gpg [opties] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "conflicterende opdrachten\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "geen =-teken gevonden in groepdefinitie \"%s\"\n"
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "WAARSCHUWING: onveilig eigendom op %s \"%s\"\n"
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "WAARSCHUWING: onveilig eigendom op %s \"%s\"\n"
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "WAARSCHUWING: onveilig eigendom op %s \"%s\"\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "WAARSCHUWING: onveilige toegangsrechten op %s \"%s\"\n"
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "WAARSCHUWING: onveilige toegangsrechten op %s \"%s\"\n"
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "WAARSCHUWING: onveilige toegangsrechten op %s \"%s\"\n"
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "WAARSCHUWING: onveilig omsluitend mapeigendom op %s \"%s\"\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "WAARSCHUWING: onveilig omsluitend mapeigendom op %s \"%s\"\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "WAARSCHUWING: onveilig omsluitend mapeigendom op %s \"%s\"\n"
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "WAARSCHUWING: onveilige omsluitende maptoegangsrechten op %s \"%s\"\n"
-#: g10/g10.c:1205
+#: g10/g10.c:1210
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "WAARSCHUWING: onveilige omsluitende maptoegangsrechten op %s \"%s\"\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "WAARSCHUWING: onveilige omsluitende maptoegangsrechten op %s \"%s\"\n"
-#: g10/g10.c:1334
+#: g10/g10.c:1354
#, fuzzy, c-format
-msgid "unknown configuration item \"%s\"\n"
+msgid "unknown configuration item `%s'\n"
msgstr "nieuw configuratiebestand `%s' aangemaakt\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "LET OP: oude bestand voor standaard opties `%s' genegeerd\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "LET OP: geen bestand voor standaard opties `%s'\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "optiebestand `%s': %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "bezig met lezen opties uit `%s'\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "LET OP: %s is niet voor normaal gebruik!\n"
-#: g10/g10.c:1887
-#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+#: g10/g10.c:2021
+#, fuzzy, c-format
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr ""
"coderingsuitbreiding \"%s\" niet geladen vanwege onveilige toegangsrechten\n"
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "%s is geen geldige tekenset\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "kon sleutelserver URI niet inlezen\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ongeldige uitvoeropties\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "ongeldige uitvoeropties\n"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ongeldige invoeropties\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
msgid "invalid import options\n"
msgstr "ongeldige invoeropties\n"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ongeldige uitvoeropties\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
msgid "invalid export options\n"
msgstr "ongeldige uitvoeropties\n"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ongeldige invoeropties\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "ongeldige invoeropties\n"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ongeldige uitvoeropties\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "ongeldige uitvoeropties\n"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "kan exec-path niet instellen op %s\n"
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "WAARSCHUWING: programma maakt mogelijk een core-bestand aan!\n"
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "WAARSCHUWING: %s gaat boven %s\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s niet toegestaan met %s!\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s slaat nergens op met %s!\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"u kunt alleen losse of ongecodeerde ondertekeningen maken in --pgp2 modus\n"
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "u kunt niet tegelijkertijd ondertekenen en coderen in --pgp2 modus\n"
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "u dient bestanden te gebruiken (en niet een pijp) in --pgp2 modus.\n"
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "het coderen van een bericht in --pgp2 modus vereist de IDEA-codering\n"
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "het gekozen coderingsalgoritme is ongeldig\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "het gekozen digest-algoritme is ongeldig\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "het gekozen coderingsalgoritme is ongeldig\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
msgid "selected certification digest algorithm is invalid\n"
msgstr "het gekozen certificaat-digest-algoritme is ongeldig\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed moet groter zijn dan 0\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed moet groter zijn dan 1\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth moet binnen het bereik 1 tot 255 vallen\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
#, fuzzy
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "ongeldig standaard controleniveau; moet 0, 1, 2 of 3 zijn\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
#, fuzzy
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "ongeldig standaard controleniveau; moet 0, 1, 2 of 3 zijn\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "LET OP: eenvoudige S2K-modus (0) wordt sterk ontraden\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ongeldige S2K-modus; moet 0, 1 of 3 zijn\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
msgid "invalid default preferences\n"
msgstr "ongeldige standaardvoorkeuren\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
msgid "invalid personal cipher preferences\n"
msgstr "ongeldige persoonlijke coderingsvoorkeuren\n"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
msgid "invalid personal digest preferences\n"
msgstr "ongeldige persoonlijke digestvoorkeuren\n"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
msgid "invalid personal compress preferences\n"
msgstr "ongeldige persoonlijke inpakvoorkeuren\n"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s slaat nergens op met %s!\n"
-#: g10/g10.c:2680
+#: g10/g10.c:2797
#, fuzzy, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "u kunt %s niet gebruiken in %s modus\n"
-#: g10/g10.c:2685
+#: g10/g10.c:2802
#, fuzzy, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "u kunt %s niet gebruiken in %s modus\n"
-#: g10/g10.c:2690
+#: g10/g10.c:2807
#, fuzzy, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "u kunt %s niet gebruiken in %s modus\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "initialiseren van vertrouwensgegevensbank mislukt: %s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"WAARSCHUWING: ontvangers (-r) gegeven zonder gebruik te maken van openbare "
"sleutel codering\n"
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [bestandsnaam]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [bestandsnaam]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [bestandsnaam]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [bestandsnaam]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "u kunt %s niet gebruiken in %s modus\n"
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [bestandsnaam]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [bestandsnaam]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [bestandsnaam]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "u kunt %s niet gebruiken in %s modus\n"
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [bestandsnaam]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [bestandsnaam]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [bestandsnaam]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key gebruikerscode"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key gebruikerscode"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrsign-key gebruikerscode"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key gebruikerscode"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key gebruikerscode [opdrachten]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "kan %s niet openen: %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [gebruikerscode] [sleutelbos]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "Sleutelaanmaak mislukt: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "Sleutelaanmaak mislukt: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "Sleutelaanmaak mislukt: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "Sleutelaanmaak mislukt: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "bijwerken geheim mislukt: %s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "ontpantseren mislukt: %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "bepantseren mislukt: %s\n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "ongeldig hash-algoritme `%s'\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[bestandsnaam]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "Ga uw gang en typ uw bericht...\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "kan `%s' niet openen\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@ -1125,48 +1125,48 @@ msgstr ""
"een notatienaam mag slechts afdrukbare tekens of spaties bevatten, en moet "
"eindigen met een '='\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
msgid "a user notation name must contain the '@' character\n"
msgstr "een gebruikersnotatienaam moet het '@'-teken bevatten\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "een notatiewaarde mag geen stuurtekens bevatten\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr "de gegeven certificatiebeleid URL is ongeldig\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr "de gegeven ondertekeningbeleid URL is ongeldig\n"
-#: g10/g10.c:3747
+#: g10/g10.c:3863
#, fuzzy
-msgid "the given signature preferred keyserver URL is invalid\n"
+msgid "the given preferred keyserver URL is invalid\n"
msgstr "de gegeven ondertekeningbeleid URL is ongeldig\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "iets stiller zijn"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
msgid "take the keys from this keyring"
msgstr "de sleutels uit deze sleutelbos nemen"
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
msgid "make timestamp conflicts only a warning"
msgstr "geeft alleen waarschuwing bij tijdsstempel conflicten"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr ""
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Gebruik: gpgv [opties] [bestanden] (-h voor hulp)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1200,12 +1200,13 @@ msgid "invalid dash escaped line: "
msgstr ""
#: g10/armor.c:565
-msgid "unexpected armor:"
+#, fuzzy
+msgid "unexpected armor: "
msgstr "onverwachte bepantsering:"
-#: g10/armor.c:695 g10/armor.c:1276
-#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+#: g10/armor.c:695 g10/armor.c:1280
+#, fuzzy, c-format
+msgid "invalid radix64 character %02X skipped\n"
msgstr "ongeldig grondtal64-teken %02x overgeslagen\n"
#: g10/armor.c:738
@@ -1216,33 +1217,34 @@ msgstr "vroegtijdig einde bestand (geen CRC)\n"
msgid "premature eof (in CRC)\n"
msgstr "vroegtijdig einde bestand (in CRC)\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "misvormde CRC\n"
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC-fout; %06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+#, fuzzy
+msgid "premature eof (in trailer)\n"
msgstr "vroegtijdig einde bestand (in afsluitend deel)\n"
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "fout in afsluitende regel\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "geen geldige OpenPGP-gegevens gevonden.\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "ongeldige bepantsering: regel langer dan %d tekens\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1296,7 +1298,7 @@ msgstr " alias \""
msgid " aka \""
msgstr " alias \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1555,96 +1557,116 @@ msgstr "%s: overgeslagen: openbare sleutel is uit gezet\n"
msgid "no valid addressees\n"
msgstr "geen geldige geadresseerden\n"
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "voorkeur %c%lu komt dubbel voor\n"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "teveel `%c' voorkeuren\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
#, fuzzy
msgid "too many digest preferences\n"
msgstr "teveel `%c' voorkeuren\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
#, fuzzy
msgid "too many compression preferences\n"
msgstr "teveel `%c' voorkeuren\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "ongeldig teken in voorkeurtekenreeks\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
msgid "writing direct signature\n"
msgstr "bezig met schrijven directe ondertekening\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "bezig met schrijven zelf-ondertekening\n"
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "bezig met schrijven sleutelbindende ondertekening\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "sleutelgrootte ongeldig; %u bits worden gebruikt\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "sleutelgrootte naar boven afgerond tot %u bits\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "Kies alstublieft wat voor sleutel u wilt hebben:\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA en ElGamal (standaard)\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (alleen ondertekenen)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (alleen coderen)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (alleen ondertekenen)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (alleen coderen)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (ondertekenen en coderen)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, fuzzy, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) RSA (alleen ondertekenen)\n"
+
+#: g10/keygen.c:1224
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) RSA (ondertekenen en coderen)\n"
+
+#: g10/keygen.c:1226
+#, fuzzy, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) RSA (alleen coderen)\n"
+
+#: g10/keygen.c:1228
+#, fuzzy, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) RSA (ondertekenen en coderen)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "Uw keuze? "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "Ongeldige keuze.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1657,29 +1679,29 @@ msgstr ""
" standaard sleutelgrootte is 1024 bits\n"
" hoogst aangeraden sleutelgrootte is 2048 bits\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "Welke sleutelgrootte wilt u? (1024) "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA staat alleen sleutelgroottes toe van 512 tot 1024\n"
-#: g10/keygen.c:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr ""
"sleutelgrootte te klein; 1024 is de kleinste toegestane waarde voor RSA.\n"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "sleutelgrootte te klein; 768 is de kleinste toegestane waarde.\n"
-#: g10/keygen.c:1255
+#: g10/keygen.c:1328
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "sleutelgrootte te groot; %d is de grootste toegestane waarde.\n"
-#: g10/keygen.c:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1687,11 +1709,11 @@ msgstr ""
"Sleutelgroottes boven de 2048 worden niet aangeraden\n"
"omdat berekeningen daarmee ERG lang duren!\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "Weet u zeker dat u deze sleutelgrootte wilt? "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1699,17 +1721,17 @@ msgstr ""
"Goed, maar houd er rekening mee dat de straling van uw beeldscherm en "
"toetsenbord ook erg gevoelig zijn voor aanvallen!\n"
-#: g10/keygen.c:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Gevraagde sleutelgrootte is %u bits\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "afgerond naar boven tot %u bits\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1725,7 +1747,7 @@ msgstr ""
" <n>m = sleutel verloopt na n maanden\n"
" <n>y = sleutel verloopt na n jaren\n"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1741,29 +1763,29 @@ msgstr ""
" <n>m = ondertekening verloopt na n maanden\n"
" <n>y = ondertekening verloopt na n jaren\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "Hoe lang is de sleutel geldig? (0) "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr "Hoe lang is de ondertekening geldig? (0) "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "ongeldige waarde\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s verloopt nooit\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr "%s verloopt op %s\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1771,16 +1793,17 @@ msgstr ""
"Uw systeem kan geen data weergeven na 2038.\n"
"Het zal data echter correct verwerken tot 2106.\n"
-#: g10/keygen.c:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "Is dit juist (j/n)? "
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
+#, fuzzy
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
@@ -1791,44 +1814,44 @@ msgstr ""
" \"Heinrich Heine (De dichter) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "Echte naam: "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "Ongeldig teken in naam\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr "Naam mag niet met een cijfer beginnen\n"
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr "Naam moet tenminste 5 tekens lang zijn\n"
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "E-mail adres: "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "Geen geldig e-mail adres\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "Opmerking: "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "Ongeldig teken in opmerking\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "U gebruikt de `%s' tekenset.\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1839,29 +1862,29 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Stop het e-mail adres alstublieft niet in de echte naam of de opmerking\n"
-#: g10/keygen.c:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "NnOoEeAaFf"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "(N)aam, (C) opmerking, (E)-mail wijzigen of (Q) afsluiten? "
-#: g10/keygen.c:1542
+#: g10/keygen.c:1615
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"(N)aam, (C) opmerking, (E)-mail wijzigen of (O) accepteren/(Q) afsluiten? "
-#: g10/keygen.c:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr "Verbeter de fout alstublieft eerst\n"
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1869,16 +1892,16 @@ msgstr ""
"U heeft een wachtwoord nodig om uw geheime sleutel mee te beschermen.\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr "wachtwoord niet juist herhaald; probeer opnieuw"
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1890,7 +1913,7 @@ msgstr ""
"met dit programma met de optie \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1903,58 +1926,58 @@ msgstr ""
"dit geeft de willekeurige getallen generator een betere kans om genoeg\n"
"entropie te verzamelen.\n"
-#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr "sorry, dat kan niet in batch-modus\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA sleutelpaar zal 1024 bits hebben.\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "Sleutelaanmaak geannuleerd.\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr "bezig met schrijven openbare sleutel naar `%s'\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "bezig met schrijven geheime sleutel naar `%s'\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "bezig met schrijven geheime sleutel naar `%s'\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "geen schrijfbare openbare sleutelbos gevonden: %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "geen schrijfbare geheime sleutelbos gevonden: %s\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "fout bij schrijven openbare sleutelbos `%s': %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "fout bij schrijven geheime sleutelbos `%s': %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "openbare en geheime sleutel aangemaakt en ondertekend.\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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"
@@ -1962,12 +1985,12 @@ msgstr ""
"Let op dat deze sleutel niet gebruikt kan worden voor coderen. Mogelijk\n"
"wilt u daarvoor met de opdracht \"--edit-key\" een tweede sleutel aanmaken.\n"
-#: g10/keygen.c:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Sleutelaanmaak mislukt: %s\n"
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1975,7 +1998,7 @@ msgstr ""
"sleutel is %lu seconde in de toekomst aangemaakt (tijdsreis of "
"klokprobleem)\n"
-#: g10/keygen.c:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1983,16 +2006,45 @@ msgstr ""
"sleutel is %lu seconden in de toekomst aangemaakt (tijdsreis of "
"klokprobleem)\n"
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"LET OP: het aanmaken van deelsleutels voor v3-sleutels komt niet overeen met "
"OpenPGP\n"
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "Echt aanmaken? "
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "verwijderen sleutelblok mislukt: %s\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "kan `%s' niet aanmaken: %s\n"
+
+#: g10/keygen.c:3248
+#, fuzzy, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "LET OP: geheime sleutel %08lX verlopen op %s\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "--uitvoer werkt niet voor deze opdracht\n"
@@ -2003,7 +2055,7 @@ msgstr "--uitvoer werkt niet voor deze opdracht\n"
msgid "%s: can't open: %s\n"
msgstr "%s: kan niet openen: %s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "fout bij maken wachtwoord: %s\n"
@@ -2033,6 +2085,11 @@ msgstr ""
"u kunt slechts coderen naar RSA-sleutels van 2048 bits of minder in --pgp2 "
"modus\n"
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "kan %s niet openen: %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -2044,26 +2101,36 @@ msgid ""
msgstr ""
"kan de IDEA-codering niet gebruiken voor alle sleutels waarnaar u codeert.\n"
-#: g10/encode.c:526 g10/encode.c:721
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#: g10/encode.c:526
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"het afdwingen van symmetrische codering %s (%d) gaat tegen de voorkeuren van "
"de ontvanger in\n"
-#: g10/encode.c:634 g10/sign.c:863
-#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+#: g10/encode.c:634 g10/sign.c:864
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
msgstr ""
"het afdwingen van inpakalgoritme %s (%d) gaat tegen de voorkeuren van de "
"ontvanger in\n"
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"het afdwingen van symmetrische codering %s (%d) gaat tegen de voorkeuren van "
+"de ontvanger in\n"
+
#: g10/encode.c:818
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s gecodeerd voor: \"%s\"\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "sleutel `%s' niet gevonden: %s\n"
@@ -2097,8 +2164,9 @@ msgstr "WAARSCHUWING: niets uitgevoerd\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "teveel ingangen in pk buffer - uit gezet\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+#, fuzzy
+msgid "[User ID not found]"
msgstr "[Gebruikerscode niet gevonden]"
#: g10/getkey.c:1614
@@ -2255,7 +2323,7 @@ msgstr "sleutel %08lX: HKP-deelsleutel beschadiging gerepareerd\n"
#: g10/import.c:722
#, fuzzy, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr ""
"sleutel %08lX: niet-zelfondertekende gebruikerscode '%s' geaccepteerd\n"
@@ -2283,7 +2351,7 @@ msgstr "sleutel %08lX: nieuwe sleutel - overgeslagen\n"
msgid "no writable keyring found: %s\n"
msgstr "geen schrijfbare sleutelbos gevonden: %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "bezig met schrijven naar `%s'\n"
@@ -2398,14 +2466,14 @@ msgstr "sleutel %08lX: geen gebruikerscode voor ondertekening\n"
#: g10/import.c:1299
#, fuzzy, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"sleutel %08lX: niet-ondersteund openbare sleutel algoritme bij "
"gebruikerscode \"%s\"\n"
#: g10/import.c:1301
#, fuzzy, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "sleutel %08lX: ongeldige zelfondertekening bij gebruikerscode \"%s\"\n"
#: g10/import.c:1319
@@ -2445,7 +2513,7 @@ msgstr "sleutel %08lX: meervoudige deelsleutel herroeping verwijderd\n"
#: g10/import.c:1439
#, fuzzy, c-format
-msgid "key %s: skipped user ID '%s'\n"
+msgid "key %s: skipped user ID \"%s\"\n"
msgstr "sleutel %08lX: gebruikerscode overgeslagen '"
#: g10/import.c:1460
@@ -2455,7 +2523,7 @@ msgstr "sleutel %08lX: deelsleutel overgeslagen\n"
#: g10/import.c:1487
#, fuzzy, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr ""
"sleutel %08lX: niet-uitvoerbare ondertekening (klasse %02x) - overgeslagen\n"
@@ -2494,114 +2562,114 @@ msgstr ""
"WAARSCHUWING: sleutel %08lX kan herroepen zijn: herroepingssleutel %08lX "
"wordt opgehaald\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"WAARSCHUWING: sleutel %08lX kan herroepen zijn: herroepingssleutel %08lX "
"niet aanwezig.\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "sleutel %08lX: \"%s\" herroepingscertificaat toegevoegd\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "sleutel %08lX: directe sleutelondertekening toegevoegd\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[herroeping]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[zelfondertekening]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "1 slechte ondertekening\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d slechte ondertekeningen\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "1 ondertekening niet gecontroleerd vanwege een ontbrekende sleutel\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d ondertekeningen niet gecontroleerd vanwege ontbrekende sleutels\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "1 ondertekening niet gecontroleerd vanwege een fout\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d ondertekeningen niet gecontroleerd vanwege fouten\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "1 gebruikerscode zonder geldige zelfondertekening gevonden\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "%d gebruikerscodes zonder geldige zelfondertekening gevonden\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, fuzzy, c-format
msgid " (%d) I trust marginally\n"
msgstr " %d = Ik vertrouw een beetje\n"
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, fuzzy, c-format
msgid " (%d) I trust fully\n"
msgstr " %d = Ik vertrouw volledig\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Gebruikerscode \"%s\" is herroepen."
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Weet u zeker dat u deze toch wilt ondertekenen? (j/N) "
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr " Kan niet ondertekenen.\n"
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, fuzzy, c-format
msgid "User ID \"%s\" is expired."
msgstr "Gebruikerscode \"%s\" is herroepen."
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, fuzzy, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "WAARSCHUWING: gebruikerscode \"%s\" is niet zelfondertekend.\n"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2610,11 +2678,11 @@ msgstr ""
"De zelfondertekening op \"%s\"\n"
"is een PGP 2.x-stijl ondertekening.\n"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Wilt u deze promoveren tot een OpenPGP zelfondertekening? (j/N) "
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2623,12 +2691,12 @@ msgstr ""
"Uw huidige ondertekening van \"%s\"\n"
"is verlopen.\n"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Wilt u een nieuwe ondertekening plaatsen om de oude te vervangen? (j/N) "
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2637,44 +2705,44 @@ msgstr ""
"Uw huidige ondertekening van \"%s\"\n"
"is een lokale ondertekening.\n"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
"WIlt u deze promoveren tot een volledig uitvoerbare ondertekening? (j/N) "
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" was al lokaal ondertekend met sleutel %08lX\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" was al ondertekend met sleutel %08lX\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Wilt u deze toch ondertekenen? (j/N) "
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Niets te ondertekenen bij sleutel %08lX\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "Deze sleutel is verlopen!"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Deze sleutel zal verlopen op %s.\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Wilt u dat uw ondertekening op hetzelfde moment verloopt? (J/n) "
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
@@ -2682,11 +2750,11 @@ msgstr ""
"U kunt geen OpenPGP-ondertekening maken van een PGP 2.x sleutel in --pgp2 "
"modus.\n"
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "Dit zou de sleutel onbruikbaar maken in PGP 2.x.\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2696,31 +2764,31 @@ msgstr ""
"echt\n"
"is van de bovengenoemde persoon? Als u geen antwoord weet, kies \"0\".\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Ik geef geen antwoord.%s\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Ik heb helemaal niet gecontroleerd.%s\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Ik heb nonchalant gecontroleerd.%s\n"
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Ik heb heel nauwkeurig gecontroleerd.%s\n"
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr ""
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2728,7 +2796,7 @@ msgstr ""
"Weet u zeker dat u deze sleutel wilt ondertekenen\n"
"met uw sleutel: \""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2736,7 +2804,7 @@ msgstr ""
"\n"
"Dit zal een zelfondertekening zijn.\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2745,7 +2813,7 @@ msgstr ""
"WAARSCHUWING: de ondertekening zal niet worden gemarkeerd als niet-"
"uitvoerbaar.\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2754,7 +2822,7 @@ msgstr ""
"WAARSCHUWING: de ondertekening zal niet worden gemarkeerd als niet-"
"herroepbaar.\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2762,7 +2830,7 @@ msgstr ""
"\n"
"De ondertekening zal worden gemarkeerd als niet-uitvoerbaar.\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2770,7 +2838,7 @@ msgstr ""
"\n"
"De ondertekening zal worden gemarkeerd als niet-herroepbaar.\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2778,7 +2846,7 @@ msgstr ""
"\n"
"Ik heb deze sleutel helemaal niet gecontroleerd.\n"
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2786,7 +2854,7 @@ msgstr ""
"\n"
"Ik heb deze sleutel nonchalant gecontroleerd.\n"
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2794,34 +2862,34 @@ msgstr ""
"\n"
"Ik heb deze sleutel heel nauwkeurig gecontroleerd.\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "Echt ondertekenen? "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "ondertekenen mislukt: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "Deze sleutel is niet beschermd.\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr "Geheime delen van primaire sleutel zijn niet beschikbaar.\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "Sleutel is beschermd.\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Kan deze sleutel niet bewerken: %s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2829,7 +2897,7 @@ msgstr ""
"Geef het nieuwe wachtwoord voor deze geheime sleutel.\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2837,544 +2905,566 @@ msgstr ""
"U wilt geen wachtwoord - dit is waarschijnlijk een *slecht* idee!\n"
"\n"
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "Wilt u dit echt doen? "
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "een sleutelondertekening wordt naar de juiste plek verplaatst\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "dit menu verlaten"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "q"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "save"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "opslaan en afsluiten"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "help"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "deze hulp weergeven"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "vingerafdruk weergeven"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "list"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "sleutel en gebruikerscodes opsommen"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "gebruikerscode N selecteren"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "key"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "secundaire sleutel N kiezen"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "check"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "ondertekeningen opsommen"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "c"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "de sleutel ondertekenen"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "s"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "tsign"
msgstr "sign"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "make a trust signature"
msgstr "een losse ondertekening maken"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "de sleutel lokaal ondertekenen"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr "de sleutel niet-herroepbaar ondertekenen"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "sign the key locally and non-revocably"
msgstr "de sleutel lokaal en niet-herroepbaar ondertekenen"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "een gebruikerscode toevoegen"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr "addphoto"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr "een foto ID toevoegen"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "gebruikerscode verwijderen"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr "delphoto"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "een secundaire sleutel toevoegen"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+#, fuzzy
+msgid "addcardkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "een secundaire sleutel verwijderen"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "addrevoker"
msgstr "addrevoker"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "add a revocation key"
msgstr "een herroepingssleutel toevoegen"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "ondertekeningen verwijderen"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "de verloopdatum wijzigen"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr "primary"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr "gebruikerscode als primair markeren"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "overschakelen tussen geheime en openbare sleutellijst"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "t"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr "lijst voorkeuren (ervaren gebruiker)"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr "lijst voorkeuren (breedsprakig)"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr "voorkeurenlijst instellen"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr "voorkeuren bijgewerkt"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "keyserver"
msgstr "sleutelserverfout"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "set preferred keyserver URL"
msgstr "kon sleutelserver URI niet inlezen\n"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "het wachtwoord wijzigen"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "het eigenaarsvertrouwen wijzigen"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "ondertekeningen herroepen"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revuid"
msgstr "revuid"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revoke a user ID"
msgstr "een gebruikerscode herroepen"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "een secundaire sleutel herroepen"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "een sleutel uit zetten"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "een sleutel aan zetten"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr "showphoto"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr "foto ID weergeven"
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "dat kan niet in batch-modus\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "fout bij lezen geheim sleutelblok `%s': %s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "Geheime sleutel is beschikbaar.\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "Opdracht> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "De geheime sleutel is nodig om dit te doen.\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr "Gebruik alstublieft eerst de \"toggle\" opdracht.\n"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
msgid "Key is revoked."
msgstr "Sleutel is herroepen."
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "Echt alle gebruikerscodes ondertekenen? "
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "Tip: Selecteer de gebruikerscodes om te ondertekenen\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Deze opdracht is niet toegestaan in %s modus.\n"
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "U dient tenminste één gebruikerscode te selecteren.\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "U kunt niet de laatste gebruikerscode verwijderen!\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "Echt alle geselecteerde gebruikerscodes verwijderen? "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "Echt deze gebruikerscode verwijderen? "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+#, fuzzy
+msgid "Really move the primary key? "
+msgstr "Echt deze gebruikerscode verwijderen? "
+
+#: g10/keyedit.c:1598
+#, fuzzy
+msgid "You must select exactly one key.\n"
+msgstr "U dient tenminste één sleutel te selecteren.\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "U dient tenminste één sleutel te selecteren.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "Wilt u echt de geselecteerde sleutels verwijderen? "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "Wilt u echt deze sleutel verwijderen? "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
msgid "Really revoke all selected user IDs? "
msgstr "Echt alle geselecteerde gebruikerscodes herroepen? "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
msgid "Really revoke this user ID? "
msgstr "Echt deze gebruikerscode herroepen? "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "Wilt u echt de geselecteerde sleutels herroepen? "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "Wilt u echt deze sleutel herroepen? "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
#, fuzzy
msgid "Set preference list to:\n"
msgstr "voorkeurenlijst instellen"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr "Echt de voorkeuren bijwerken voor de geselecteerde gebruikerscodes? "
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr "Echt de voorkeuren bijwerken? "
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "Wijzigingen opslaan? "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "Afsluiten zonder op te slaan? "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "bijwerken mislukt: %s\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "bijwerken geheim mislukt: %s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "Sleutel niet gewijzigd dus bijwerken niet nodig.\n"
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "Ongeldige opdracht (probeer \"hulp\")\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr "Samenvatting: "
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr "Mogelijkheden: "
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keyedit.c:2219
#, c-format
msgid "This key may be revoked by %s key "
msgstr "Deze sleutel is mogelijk herroepen door sleutel %s "
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr " (gevoelig)"
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "kan %s niet aanmaken: %s\n"
-#: g10/keyedit.c:2084
-#, fuzzy, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
msgstr "[herroepen] "
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
-msgstr " [verloopt: %s]"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
+msgstr "expire"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2246
#, fuzzy, c-format
-msgid "expires: %s"
-msgstr " [verloopt: %s]"
+msgid "usage: %s"
+msgstr " vertrouwen: %c/%c"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, fuzzy, c-format
msgid "trust: %s"
msgstr " vertrouwen: %c/%c"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "Deze sleutel is uit gezet"
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "herroepen! deelsleutel is herroepen: %s\n"
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
-msgstr "herroepen- vervalste herroeping gevonden\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr "herroepen? probleem bij controleren herroeping: %s\n"
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-#, fuzzy
-msgid "revoked"
-msgstr "[herroepen] "
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-#, fuzzy
-msgid "expired"
-msgstr "expire"
+#: g10/keyedit.c:2300
+msgid "card-no: "
+msgstr ""
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Er zijn geen voorkeuren op een PGP 2.x stijl gebruikerscode.\n"
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3383,21 +3473,13 @@ msgstr ""
"juist\n"
"is tenzij u het programma opnieuw start.\n"
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-msgid "[revoked] "
-msgstr "[herroepen] "
-
-#: g10/keyedit.c:2274
-msgid "[expired] "
-msgstr "[verlopen] "
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
msgstr ""
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3407,45 +3489,45 @@ msgstr ""
"kan\n"
" zorgen dat sommige versies van PGP deze sleutel verwerpen.\n"
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Weet u zeker dat u deze toch wilt toevoegen? (j/N) "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "U kunt geen foto ID toevoegen aan een PGP2 stijl sleutel.\n"
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "Deze goede ondertekening verwijderen? (j/N/q)"
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Deze ongeldige ondertekening verwijderen? (j/N/q)"
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Deze onbekende ondertekening verwijderen? (j/N/q)"
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "Echt deze zelfondertekening verwijderen? (j/N)"
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d ondertekening verwijderd.\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d ondertekeningen verwijderd.\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "Niets verwijderd.\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3455,93 +3537,103 @@ msgstr ""
" toevoegen kan zorgen dat sommige versies van PGP deze sleutel "
"verwerpen.\n"
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"U kunt geen aangestelde herroeper toevoegen aan een PGP 2.x stijl sleutel.\n"
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
msgid "Enter the user ID of the designated revoker: "
msgstr "Geef de gebruikerscode van de aangestelde herroeper: "
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"kan een PGP 2.x stijl sleutel niet aanwijzen als een aangestelde herroeper\n"
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "u kunt geen sleutel aanwijzen als zijn eigen aangestelde herroeper\n"
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "WAARSCHUWING: Deze sleutel is herroepen door zijn eigenaar!\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"WAARSCHUWING: het aanwijzen van een sleutel als een aangestelde herroeper "
"kan niet ongedaan gemaakt worden!\n"
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr ""
"Wilt u echt deze sleutel aanwijzen als een aangestelde herroeper? (j/N): "
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "Verwijder alstublieft selecties van de geheime sleutels.\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "Selecteer alstublieft ten hoogste één secundaire sleutel.\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "De verlooptijd voor een secundaire sleutel wordt gewijzigd.\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "De verlooptijd voor de primaire sleutel wordt gewijzigd.\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "U kunt de verlooptijd van een v3-sleutel niet wijzigen\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "Geen geassocieerde ondertekening in geheime sleutelbos\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
msgid "Please select exactly one user ID.\n"
msgstr "Selecteer alstublieft precies één gebruikerscode.\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
-#, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "v3-zelfondertekening op gebruikerscode \"%s\" wordt overgeslagen\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+#, fuzzy
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "Weet u zeker dat u deze wilt gebruiken (j/N)? "
+
+#: g10/keyedit.c:3480
+#, fuzzy
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "Weet u zeker dat u deze wilt gebruiken (j/N)? "
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "Geen gebruikerscode met index %d\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Geen secundaire sleutel met index %d\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "gebruikerscode: \""
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3550,7 +3642,7 @@ msgstr ""
"\"\n"
"ondertekend met uw sleutel %08lX op %s\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3559,146 +3651,130 @@ msgstr ""
"\"\n"
"lokaal ondertekend met uw sleutel %08lX op %s\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Deze ondertekening is verlopen op %s.\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Weet u zeker dat u deze nog steeds wilt herroepen? (j/N) "
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Een herroepingscertificaat maken voor deze ondertekening? (j/N) "
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "U heeft deze gebruikerscodes ondertekend:\n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid " signed by %s on %s%s%s\n"
msgstr " ondertekend door %08lX op %s%s%s\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid " revoked by %s on %s\n"
msgstr " herroepen door %08lX op %s\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "U staat op het punt deze ondertekeningen te herroepen:\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, fuzzy, c-format
msgid " signed by %s on %s%s\n"
msgstr " ondertekend door %08lX op %s%s\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr " (niet-uitvoerbaar)"
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
msgid "Really create the revocation certificates? (y/N) "
msgstr "Echt de herroepingscertificaten maken? (j/N) "
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "geen geheime sleutel\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "gebruikerscode \"%s\" is al herroepen\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"WAARSCHUWING: een gebruikerscode ondertekening is van %d seconden in de "
"toekomst\n"
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Foto ID %s van grootte %ld voor sleutel 0x%08lX (gebruiker %d) wordt "
"weergegeven\n"
-#: g10/keylist.c:179
+#: g10/keylist.c:180
msgid "Critical signature policy: "
msgstr "Kritisch ondertekenbeleid: "
-#: g10/keylist.c:181
+#: g10/keylist.c:182
msgid "Signature policy: "
msgstr "Ondertekenbeleid: "
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "WAARSCHUWING: ongeldige notatiegegevens gevonden\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
msgid "Critical signature notation: "
msgstr "Kritische ondertekennotatie: "
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr "Ondertekennotatie: "
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr "niet leesbaar voor mensen"
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr "Sleutelbos"
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr " [verloopt: %s]"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr " [verloopt: %s]"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, fuzzy, c-format
-msgid " [revoked: %s]"
-msgstr "[herroepen] "
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
msgid "Primary key fingerprint:"
msgstr "Vingerafdruk primaire sleutel:"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
msgid " Subkey fingerprint:"
msgstr " Vingerafdruk deelsleutel:"
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
msgid " Primary key fingerprint:"
msgstr " Vingerafdruk primaire sleutel:"
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
msgid " Subkey fingerprint:"
msgstr " Vingerafdruk deelsleutel:"
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr " Vingerafdruk sleutel ="
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3909,81 +3985,81 @@ msgstr "oude stijl (PGP 2.x) ondertekening\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "ongeldig root-pakket gevonden in proc_tree()\n"
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "kan geheugendumps niet uit zetten: %s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "Experimentele algoritme moeten niet worden gebruikt!\n"
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"dit coderingsalgoritme wordt afgeraden; gebruik alstublieft een wat "
"normalere!\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr "de IDEA-coderingsplug-in is niet aanwezig\n"
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr ""
"zie alstublieft http://www.gnupg.org/why-not-idea.html voor meer informatie\n"
-#: g10/misc.c:491
+#: g10/misc.c:517
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: afgeraden optie \"%s\"\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "WAARSCHUWING: \"%s\" is een afgeraden optie\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "gebruik alstublieft \"%s%s\"\n"
-#: g10/misc.c:508
+#: g10/misc.c:534
#, fuzzy
msgid "Uncompressed"
msgstr "niet verwerkt"
-#: g10/misc.c:533
+#: g10/misc.c:559
#, fuzzy
msgid "uncompressed|none"
msgstr "niet verwerkt"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "dit bericht is mogelijk niet bruikbaar voor %s\n"
-#: g10/misc.c:777
+#: g10/misc.c:826
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "bezig met lezen opties uit `%s'\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "onbekende standaard ontvanger `%s'\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "kan openbare sleutel algoritme %d niet behandelen\n"
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "deelpakket van soort %d heeft kritische bit ingesteld\n"
@@ -4022,7 +4098,7 @@ msgstr "kan niet verbinden met `%s': %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "communicatieprobleem met gpg-agent\n"
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr "probleem met de agent - gebruik van agent uit gezet\n"
@@ -4059,24 +4135,24 @@ msgstr "wachtwoord te lang\n"
msgid "invalid response from agent\n"
msgstr "ongeldig antwoord van agent\n"
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "geannuleerd door gebruiker\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "probleem met agent: agent geeft 0x%lx terug\n"
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "kan niet vragen om wachtwoord in batch-modus\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "Geef wachtwoord: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4086,22 +4162,22 @@ msgstr ""
"U heeft een wachtwoord nodig om de geheime sleutel\n"
"voor de gebruiker te ontgrendelen: \""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bit %s sleutel, ID %08lX, gemaakt op %s"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (hoofdsleutel ID %08lX)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "Herhaal wachtwoord: "
@@ -4332,28 +4408,39 @@ msgstr ""
"u kunt alleen losgekoppeld ondertekenen met PGP 2.x stijl sleutels in in --"
"pgp2 modus\n"
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
-msgstr "kan %s niet aanmaken: %s\n"
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
+msgstr "kan `%s' niet aanmaken: %s\n"
-#: g10/sign.c:794
-#, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+#: g10/sign.c:771 g10/sign.c:1008
+#, fuzzy, c-format
+msgid "writing to file `%s'\n"
+msgstr "bezig met schrijven naar `%s'\n"
+
+#: g10/sign.c:795
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"afdwingen van digest-algoritme %s (%d) overtreedt voorkeuren ontvanger\n"
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr "bezig met ondertekenen:"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "kan bestand niet openen: %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
"u kunt alleen niet-gecodeerde ondertekeningen maken met PGP 2.x stijl "
"sleutels in --pgp2 modus\n"
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s codering zal worden gebruikt\n"
@@ -4755,7 +4842,7 @@ msgstr ""
"kan zwakke sleutel voor symmetrische codering niet vermijden; %d keer "
"geprobeerd!\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA vereist het gebruik van een 160-bits hash-algoritme\n"
@@ -5139,17 +5226,17 @@ msgstr "Geen hulp beschikbaar"
msgid "No help available for `%s'"
msgstr "Geen hulp beschikbaar voor `%s'"
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "fout bij aanmaken sleutelbos `%s': %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr "sleutelbos `%s' aangemaakt\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "opnieuw opbouwen sleutelbos buffer mislukt: %s\n"
@@ -5192,8 +5279,7 @@ msgstr "%lu sleutels gecontroleerd (%lu ondertekeningen)\n"
msgid "%s: keyring created\n"
msgstr "%s: sleutelbos aangemaakt\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5208,29 +5294,34 @@ msgstr ""
"erg\n"
"groot! Een afbeeldingsgrootte dichtbij 240x288 is het best.\n"
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr "Geef JPEG-bestandsnaam voor foto ID: "
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "Kan foto \"%s\" niet openen: %s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
msgid "Are you sure you want to use it (y/N)? "
msgstr "Weet u zeker dat u deze wilt gebruiken (j/N)? "
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr "\"%s\" is geen JPEG-bestand\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Is this photo correct (y/N/q)? "
msgstr "Is deze foto goed (j/N/q)? "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
msgid "unable to display photo ID!\n"
msgstr "kan foto ID niet weergeven!\n"
@@ -5251,45 +5342,51 @@ msgstr ""
"bestandstoegangsrechten\n"
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
+#, fuzzy
+msgid "this platform requires temporary files when calling external programs\n"
msgstr ""
"dit platform vereist het maken van tijdelijke bestanden bij het aanroepen "
"van externe programma's\n"
-#: g10/exec.c:432
-#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
+msgstr "kan %s \"%s\" niet uitvoeren: %s\n"
+
+#: g10/exec.c:436
+#, fuzzy, c-format
+msgid "unable to execute shell `%s': %s\n"
msgstr "kan %s \"%s\" niet uitvoeren: %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:515
#, c-format
msgid "system error while calling external program: %s\n"
msgstr "systeemfout bij aanroepen van extern programma: %s\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr "ongewone afsluiting van extern programma\n"
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr "kan extern programma niet uitvoeren\n"
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr "kan antwoord van extern programma niet lezen: %s\n"
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr "WAARSCHUWING: kan tijdelijke bestand (%s) `%s' niet verwijderen: %s\n"
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "WAARSCHUWING: kan tijdelijke map `%s' niet verwijderen: %s\n"
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr "nooit"
@@ -5445,6 +5542,47 @@ msgstr "fout bij vinden vertrouwensgegevens: %s\n"
msgid "read error: %s\n"
msgstr "leesfout: %s\n"
+#, fuzzy
+#~ msgid "revoked: %s"
+#~ msgstr "[herroepen] "
+
+#, fuzzy
+#~ msgid "expired: %s"
+#~ msgstr " [verloopt: %s]"
+
+#, fuzzy
+#~ msgid "expires: %s"
+#~ msgstr " [verloopt: %s]"
+
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "herroepen! deelsleutel is herroepen: %s\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "herroepen- vervalste herroeping gevonden\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "herroepen? probleem bij controleren herroeping: %s\n"
+
+#~ msgid "[revoked] "
+#~ msgstr "[herroepen] "
+
+#~ msgid "[expired] "
+#~ msgstr "[verlopen] "
+
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr " [verloopt: %s]"
+
+#~ msgid " [expires: %s]"
+#~ msgstr " [verloopt: %s]"
+
+#, fuzzy
+#~ msgid " [revoked: %s]"
+#~ msgstr "[herroepen] "
+
+#~ msgid "can't create %s: %s\n"
+#~ msgstr "kan %s niet aanmaken: %s\n"
+
#~ msgid "|[files]|encrypt files"
#~ msgstr "|[bestanden]|bestanden coderen"
diff --git a/po/pl.po b/po/pl.po
index 195d3ed80..0149d4d78 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.2.2\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
"PO-Revision-Date: 2004-06-23 15:54+0200\n"
"Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
"Language-Team: Polish <[email protected]>\n"
@@ -56,7 +56,7 @@ msgstr "nie"
msgid "nN"
msgstr "nN"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "wyj�cie"
@@ -289,6 +289,16 @@ msgstr "bezu�yteczny klucz prywatny"
msgid "keyserver error"
msgstr "b��d serwera kluczy"
+#: util/errors.c:108
+#, fuzzy
+msgid "canceled"
+msgstr "Anuluj"
+
+#: util/errors.c:109
+#, fuzzy
+msgid "no card"
+msgstr "nie zaszyfrowany"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr ""
@@ -311,7 +321,7 @@ msgstr "znalaz�e�(a�) b��d w programie ... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "modu� gromadzenia entropii nie zosta� wykryty\n"
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "nie mo�na otworzy� ,,%s'': %s\n"
@@ -344,7 +354,7 @@ msgstr "nie mo�na odczyta� ,,%s'': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "uwaga: plik random_seed nie jest uaktualniony\n"
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr "nie mo�na utworzy� ,,%s'': %s\n"
@@ -419,7 +429,7 @@ msgstr "nie mo�na wygenerowa� liczby pierwszej kr�tszej od %d bit�w\n"
msgid "can't generate a prime with less than %d bits\n"
msgstr "nie mo�na wygenerowa� liczby pierwszej kr�tszej od %d bit�w\n"
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -427,128 +437,128 @@ msgstr ""
"@Polecenia:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[plik]|z�o�enie podpisu"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[plik]|z�o�enie podpisu pod dokumentem"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "z�o�enie podpisu oddzielonego od dokumentu"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "szyfrowanie danych"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "szyfrowanie tylko szyfrem symetrycznym"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "odszyfrowywanie danych (domy�lne)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "sprawdzenie podpisu"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "lista kluczy"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "lista kluczy i podpis�w"
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "sprawdzenie podpis�w kluczy"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "lista kluczy i ich odcisk�w"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "lista kluczy prywatnych"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "generacja nowej pary kluczy"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "usuni�cie klucza ze zbioru kluczy prywatnych"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "z�o�enie podpisu na kluczu"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "z�o�enie prywatnego podpisu na kluczu"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "podpisanie lub modyfikacja klucza"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "tworzenie certyfikatu uniewa�nienia klucza"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "eksport kluczy do pliku"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "eksport kluczy do serwera kluczy"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "import kluczy z serwera kluczy"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "szukanie kluczy na serwerze"
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "od�wie�enie wszystkich kluczy z serwera"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "import/do��czenie kluczy"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "uaktualnienie bazy zaufania"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|algo [pliki]|skr�ty wiadomo�ci"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -558,55 +568,51 @@ msgstr ""
"Opcje:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "opakowanie ASCII pliku wynikowego"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr "identyfikator do podpisania lub odszyfrowania"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr "|N|poziom kompresji N (0 - bez)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "kanoniczny format tekstowy"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "plik wyj�ciowy"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "z dodatkowymi informacjami"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "pozostawienie bez zmian"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "pytanie przed nadpisaniem plik�w"
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -614,7 +620,7 @@ msgstr ""
"@\n"
"(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -635,15 +641,15 @@ msgstr ""
" --list-keys [nazwy] pokazuje klucze\n"
" --fingerprint [nazwy] pokazuje odciski kluczy\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -653,7 +659,7 @@ msgstr ""
"podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
"domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -661,484 +667,478 @@ msgstr ""
"\n"
"Obs�ugiwane algorytmy:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr "Asymetryczne: "
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr "Symetryczne: "
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr "Skr�t�w: "
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
msgid "Compression: "
msgstr "Kompresji: "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "wywo�anie: gpg [opcje]"
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "sprzeczne polecenia\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
" zawieraj�cego %s ,,%s''\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr ""
"OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
" zawieraj�cego %s ,,%s''\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
"OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
" zawieraj�cego %s ,,%s''\n"
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
" zawieraj�cego %s ,,%s''\n"
-#: g10/g10.c:1205
+#: g10/g10.c:1210
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr ""
"OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
" zawieraj�cego %s ,,%s''\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
"OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
" zawieraj�cego %s ,,%s''\n"
-#: g10/g10.c:1334
-#, c-format
-msgid "unknown configuration item \"%s\"\n"
+#: g10/g10.c:1354
+#, fuzzy, c-format
+msgid "unknown configuration item `%s'\n"
msgstr "nieznana opcja ,,%s''\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "UWAGA: stary domy�lny plik opcji ,,%s'' zosta� zignorowany\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "plik opcji ,,%s'': %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "odczyt opcji z ,,%s''\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
-#: g10/g10.c:1887
-#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+#: g10/g10.c:2021
+#, fuzzy, c-format
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr ""
"modu� szyfru ,,%s'' nie zosta� za�adowany z powodu niebezpiecznych praw "
"dost�pu\n"
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "niezrozuma�y URI serwera kluczy\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "niepoprawne opcje eksportu kluczy\n"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
msgid "invalid import options\n"
msgstr "niepoprawne opcje wczytania kluczy\n"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
msgid "invalid export options\n"
msgstr "niepoprawne opcje eksportu kluczy\n"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "niepoprawne opcje wczytania kluczy\n"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "niepoprawne opcje eksportu kluczy\n"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nie mo�na ustawi� �cie�ki program�w wykonywalnych na %s\n"
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Nie wolno u�ywa� %s z %s!\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nie ma sensu w po��czeniu z %s!\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"w trybie --pgp2 mo�na sk�ada� tylko podpisy oddzielne lub do��czone do "
"tekstu\n"
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "w trybie --pgp2 nie mo�na jednocze�nie szyfrowa� i podpisywa�\n"
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "w trybie --pgp2 trzeba u�ywa� plik�w a nie potok�w.\n"
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "szyfrowanie wiadomo�ci w trybie --pgp2 wymaga modu�u szyfru IDEA\n"
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
msgid "selected certification digest algorithm is invalid\n"
msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "warto�� max-cert-depth musi mie�ci� si� w zakresie od 1 do 255\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr ""
"niew�a�ciwy domy�lny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr ""
"niew�a�ciwy minimalny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
msgid "invalid default preferences\n"
msgstr "niew�a�ciwe domy�lne ustawienia\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
msgid "invalid personal cipher preferences\n"
msgstr "niew�a�ciwe ustawienia szyfr�w\n"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
msgid "invalid personal digest preferences\n"
msgstr "niew�a�ciwe ustawienia skr�t�w\n"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
msgid "invalid personal compress preferences\n"
msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s jeszcze nie dzia�a z %s!\n"
-#: g10/g10.c:2680
-#, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2797
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "szyfr ,,%s'' nie jest dost�pny w trybie %s\n"
-#: g10/g10.c:2685
-#, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2802
+#, fuzzy, c-format
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "skr�t ,,%s'' nie jest dost�pny w trybie %s\n"
-#: g10/g10.c:2690
-#, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2807
+#, fuzzy, c-format
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "kompresja ,,%s'' nie jest dost�pna w trybie %s\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "OSTRZE�ENIE: podano adresat�w (-r) w dzia�aniu kt�re ich nie dotyczy\n"
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [plik]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [plik]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [plik]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [plik]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "%s nie jest dost�pne w trybie %s\n"
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [plik]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [plik]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [plik]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "%s nie jest dost�pne w trybie %s\n"
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [plik]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [plik]\""
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [plik]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key nazwa u�ytkownika"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key nazwa u�ytkownika"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrsign-key nazwa u�ytkownika"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrsign-key nazwa u�ytkownika"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key nazwa u�ytkownika [polecenia]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "nie mo�na otworzy� %s: %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, c-format
msgid "key export failed: %s\n"
msgstr "eksport kluczy nie powi�d� si�: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[nazwa pliku]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "nie mo�na otworzy� ,,%s''\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@ -1146,48 +1146,48 @@ msgstr ""
"nazwa adnotacji mo�e zawiera� tylko litery, cyfry, kropki i podkre�lenia, \n"
"i musi ko�czy� si� ,,=''\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
msgid "a user notation name must contain the '@' character\n"
msgstr "adnotacja u�ytkownika musi zawiera� znak '@'\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "tre�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
-#: g10/g10.c:3747
+#: g10/g10.c:3863
#, fuzzy
-msgid "the given signature preferred keyserver URL is invalid\n"
+msgid "the given preferred keyserver URL is invalid\n"
msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "mniej komunikat�ww"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
msgid "take the keys from this keyring"
msgstr "pobieranie kluczy z tego zbioru"
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
msgid "make timestamp conflicts only a warning"
msgstr "nie traktowa� konfliktu datownik�w jako b��du"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr "|FD|pisanie opisu stanu do deskryptora FD"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Wywo�anie: gpgv [opcje] [pliki] (-h podaje pomoc)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1221,12 +1221,13 @@ msgid "invalid dash escaped line: "
msgstr "niepoprawne oznaczenie linii minusami: "
#: g10/armor.c:565
-msgid "unexpected armor:"
+#, fuzzy
+msgid "unexpected armor: "
msgstr "nieoczekiwane opakowanie:"
-#: g10/armor.c:695 g10/armor.c:1276
-#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+#: g10/armor.c:695 g10/armor.c:1280
+#, fuzzy, c-format
+msgid "invalid radix64 character %02X skipped\n"
msgstr "niew�a�ciwy znak formatu radix64: ,,%02x'', zosta� pomini�ty\n"
#: g10/armor.c:738
@@ -1237,33 +1238,34 @@ msgstr "przewczesny koniec pliku (brak CRC)\n"
msgid "premature eof (in CRC)\n"
msgstr "przedwczesny koniec pliku (w CRC)\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "b��d formatu CRC\n"
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "B��d sumy CRC; %06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+#, fuzzy
+msgid "premature eof (in trailer)\n"
msgstr "przedwczesny koniec pliku (w linii ko�cz�cej)\n"
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "b��d w linii ko�cz�cej\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "b��d opakowania: linia d�u�sza ni� %d znak�w\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1319,7 +1321,7 @@ msgstr " alias \""
msgid " aka \""
msgstr " alias \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1571,96 +1573,116 @@ msgstr "%s: pomini�ty: klucz publiczny wy��czony z u�ytku\n"
msgid "no valid addressees\n"
msgstr "brak poprawnych adresat�w\n"
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "ustawienie %c%lu powtarza si�\n"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "zbyt wiele `%c' ustawie�\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
#, fuzzy
msgid "too many digest preferences\n"
msgstr "zbyt wiele `%c' ustawie�\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
#, fuzzy
msgid "too many compression preferences\n"
msgstr "zbyt wiele `%c' ustawie�\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "niew�a�ciwy znak w tek�cie ustawie�\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
msgid "writing direct signature\n"
msgstr "zapis podpisu bezpo�redniego\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "zapis podpisu klucza nim samym\n"
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "zapis podpisu wi���cego klucz\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "niew�a�ciwa d�ugo�� klucza; wykorzystano %u bit�w\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "rozmair klucza zaokr�glony do %u bit�w\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "Prosz� wybra� rodzaj klucza:\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, fuzzy, 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:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (tylko do podpisywania)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowania)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (tylko do podpisywania)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (tylko do szyfrowania)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) Klucz dla algorytmu RSA (do szyfrowania i podpisywania)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, fuzzy, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) RSA (tylko do podpisywania)\n"
+
+#: g10/keygen.c:1224
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) Klucz dla algorytmu RSA (do szyfrowania i podpisywania)\n"
+
+#: g10/keygen.c:1226
+#, fuzzy, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) RSA (tylko do szyfrowania)\n"
+
+#: g10/keygen.c:1228
+#, fuzzy, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) Klucz dla algorytmu RSA (do szyfrowania i podpisywania)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "Tw�j wyb�r? "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "Niew�a�ciwy wyb�r.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1673,29 +1695,29 @@ msgstr ""
" domy�lny rozmiar klucza wynosi 1024 bity\n"
" najwi�kszy sugerowany rozmiar klucza wynosi 2048 bit�w\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "Jakiej d�ugo�ci klucz wygenerowa�? (1024) "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
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:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr ""
"D�ugo�� klucza zbyt ma�a; minimalna dopuszczalna dla RSA wynosi 1024 bity.\n"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
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:1255
+#: g10/keygen.c:1328
#, 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:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1703,11 +1725,11 @@ msgstr ""
"Klucze d�u�sze ni� 2048 bit�w s� odradzane, poniewa� potrzebne\n"
"obliczenia trwaj� wtedy BARDZO d�ugo!\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "Na pewno wygenerowa� klucz takiej d�ugo�ci? "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1715,17 +1737,17 @@ 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:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "��dana d�ugo�� klucza to %u bit�w.\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "zaokr�glono do %u bit�w\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1741,7 +1763,7 @@ 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:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1757,29 +1779,29 @@ msgstr ""
" <n>m = termin wa�no�ci podpisu up�ywa za n miesi�cy\n"
" <n>y = termin wa�no�ci podpisu up�ywa za n lat\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "Okres wa�no�ci klucza ? (0) "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr "Okres wa�no�ci podpisu? (0) "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "niepoprawna warto��\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s nie ma daty wa�no�ci\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr "%s traci wa�no��: %s\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1787,16 +1809,17 @@ msgstr ""
"Tw�j system nie potrafi pokaza� daty po roku 2038.\n"
"Niemniej daty do roku 2106 b�d� poprawnie obs�ugiwane.\n"
-#: g10/keygen.c:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "Czy wszystko si� zgadza (t/n)? "
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
+#, fuzzy
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
@@ -1807,44 +1830,44 @@ msgstr ""
" \"Tadeusz �ele�ski (Boy) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "Imi� i nazwisko: "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
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:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "Adres poczty elektronicznej: "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "To nie jest poprawny adres poczty elektronicznej\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "Komentarz: "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "Niew�a�ciwy znak w komentarzu\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "U�ywasz zestawu znak�w %s.\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1855,47 +1878,47 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Nie nalezy umieszcza� adresu poczty elektronicznej w polu nazwiska czy\n"
"komentarza.\n"
-#: g10/keygen.c:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "IiKkEeDdWw"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, czy (W)yj��? "
-#: g10/keygen.c:1542
+#: g10/keygen.c:1615
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, przej�� (D)alej,\n"
"czy (W)yj�� z programu ? "
-#: g10/keygen.c:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr "Najpierw trzeba poprawi� ten b��d\n"
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
msgstr ""
"Musisz poda� d�ugie, skomplikowane has�o aby ochroni� sw�j klucz tajny.\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1907,7 +1930,7 @@ msgstr ""
"\"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1923,58 +1946,58 @@ msgstr ""
"ilo�ci\n"
"entropii.\n"
-#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr "niestety, to nie dzia�a w trybie wsadowym\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
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:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "Procedura generacji klucza zosta�a anulowana.\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr "zapisuj� klucz publiczny w '%s'\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "zapisuj� klucz tajny w '%s'\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "zapisuj� klucz tajny w '%s'\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "b��d podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "klucz publiczny i prywatny (tajny) zosta�y utworzone i podpisane.\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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"
@@ -1982,12 +2005,12 @@ msgstr ""
"Ten klucz nie mo�e by� wykorzystany do szyfrowania. Komend� \"--edit-key\"\n"
"mo�na doda� do niego podklucz szyfruj�cy.\n"
-#: g10/keygen.c:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generacja klucza nie powiod�a si�: %s\n"
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1995,7 +2018,7 @@ msgstr ""
"klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
"czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
-#: g10/keygen.c:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -2003,15 +2026,44 @@ msgstr ""
"klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
"czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"UWAGA: tworzenie podkluczy dla kluczy wersji 3 jest niezgodne z OpenPGP.\n"
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "Czy na pewno utworzy�? "
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "nie mo�na utworzy� ,,%s'': %s\n"
+
+#: g10/keygen.c:3248
+#, fuzzy, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "UWAGA: wa�no�� klucza tajnego %08lX wygas�a %s\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "opcja --output nie dzia�a z tym poleceniem\n"
@@ -2022,7 +2074,7 @@ msgstr "opcja --output nie dzia�a z tym poleceniem\n"
msgid "%s: can't open: %s\n"
msgstr "%s: nie mo�na otworzy�: %s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "b��d podczas tworzenia has�a: %s\n"
@@ -2052,6 +2104,11 @@ msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
msgstr ""
"w trybie --pgp2 mo�na szyfrowa� dla kluczy RSA kr�tszych od 2048 bit�w\n"
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "nie mo�na otworzy� %s: %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -2063,22 +2120,30 @@ msgid ""
msgstr ""
"nie mo�na u�y� szyfru IDEA z wszystkimi kluczami dla kt�rych szyfrujesz.\n"
-#: g10/encode.c:526 g10/encode.c:721
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#: g10/encode.c:526
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami adresata\n"
-#: g10/encode.c:634 g10/sign.c:863
-#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+#: g10/encode.c:634 g10/sign.c:864
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
msgstr "wymuszone u�ycie kompresji %s (%d) k��ci si� z ustawieniami adresata\n"
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami adresata\n"
+
#: g10/encode.c:818
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s zaszyfrowany dla: ,,%s''\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
@@ -2111,8 +2176,9 @@ msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "zbyt wiele wpis�w w buforze kluczy publicznych - wy��czony\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+#, fuzzy
+msgid "[User ID not found]"
msgstr "[brak identyfikatora u�ytkownika]"
#: g10/getkey.c:1614
@@ -2266,7 +2332,7 @@ msgstr "klucz %08lX: podklucz uszkodzony przez serwer zosta� naprawiony\n"
#: g10/import.c:722
#, fuzzy, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "klucz %08lX: przyj�to identyfikator nie podpisany nim samym ,,%s''\n"
#: g10/import.c:728
@@ -2293,7 +2359,7 @@ msgstr "klucz %08lX: nowy klucz - pomini�ty\n"
msgid "no writable keyring found: %s\n"
msgstr "brak zapisywalnego zbioru kluczy: %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "zapis do '%s'\n"
@@ -2407,12 +2473,12 @@ msgstr "klucz %08lX: brak identyfikatora u�ytkownika do podpisu\n"
#: g10/import.c:1299
#, fuzzy, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "klucz %08lX: algorytm asymetryczny \"%s\" nie jest obs�ugiwany\n"
#: g10/import.c:1301
#, fuzzy, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "klucz %08lX: niepoprawny podpis na identyfikatorze \"%s\"\n"
#: g10/import.c:1319
@@ -2452,7 +2518,7 @@ msgstr "klucz %08lX: usuni�to wielokrotne uniewa�nienie podklucza\n"
#: g10/import.c:1439
#, fuzzy, c-format
-msgid "key %s: skipped user ID '%s'\n"
+msgid "key %s: skipped user ID \"%s\"\n"
msgstr "klucz %08lX: pomini�to identyfikator u�ytkownika '"
#: g10/import.c:1460
@@ -2462,7 +2528,7 @@ msgstr "klucz %08lX: podklucz pomini�ty\n"
#: g10/import.c:1487
#, fuzzy, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "klucz %08lX: podpis nieeksportowalny (klasy %02x) - pomini�ty\n"
#: g10/import.c:1497
@@ -2499,115 +2565,115 @@ msgstr ""
"OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewazniony:\n"
" zapytanie o uniewa�niaj�cy klucz %08lX w serwerze kluczy\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewa�niony:\n"
" brak uniewa�niaj�cego klucza %08lX.\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "klucz %08lX: ,,%s'' dodany certyfikat uniewa�nienia\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "klucz %08lX: dodano bezpo�redni podpis\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[uniewa�nienie]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[podpis klucza nim samym]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "1 niepoprawny podpis\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d niepoprawnych podpis�w\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "1 podpis nie zosta� sprawdzony z powodu braku klucza\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d podpis�w nie zosta�o sprawdzonych z powodu braku kluczy\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "1 podpis nie zosta� sprawdzony z powodu b��du\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d podpis�w nie sprawdzonych z powodu b��d�w\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "wykryto 1 identyfikator u�ytkownika niepodpisany tym samym kluczem\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr ""
"wykryto %d identyfikator�w u�ytkownika niepodpisanych tym samym kluczem\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, fuzzy, c-format
msgid " (%d) I trust marginally\n"
msgstr " %d = mam ograniczone zaufanie\n"
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, fuzzy, c-format
msgid " (%d) I trust fully\n"
msgstr " %d = mam pe�ne zaufanie\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Czy na pewno chcesz podpisa�? (t/N) "
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr " Nie da si� z�o�y� podpisu.\n"
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Identyfikator u�ytkownika ,,%s'' przekroczy� sw�j termin wa�no�ci."
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem."
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2616,11 +2682,11 @@ msgstr ""
"Podpis klucza nim samym na ,,%s''\n"
"jest podpisem z�o�onym przez PGP 2.x.\n"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Czy chcesz zamieni� go na podpis OpenPGP? (t/N) "
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2629,11 +2695,11 @@ msgstr ""
"Tw�j podpis na \"%s\"\n"
"przekroczy� dat� wa�no�ci.\n"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Czy chcesz zast�pi� przeterminowany podpis nowym? (t/N) "
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2642,56 +2708,56 @@ msgstr ""
"Tw�j podpis na \"%s\"\n"
"jest podpisem prywatnym (lokalnym).\n"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
"Czy chcesz zamieni� go na pe�ny, publiczny, eksportowalny podpis? (t/N) "
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" jest ju� lokalnie podpisany kluczem %08lX\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" jest ju� podpisany kluczem %08lX\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Czy na pewno chcesz to podpisa�? (t/N) "
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "Data wa�no�ci tego klucza up�yn�a!"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Wa�no�� tego klucza wygasa %s.\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr ""
"Czy chcesz �eby wa�no�� Twojego podpisu wygasa�a w tej samej chwili? (T/n) "
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
msgstr ""
"W trybie --pgp2 nie mo�na podpisywa� kluczy PGP 2.x podpisami OpenPGP.\n"
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "To uczyni ten klucz nieuzytecznym dla PGP 2.x.\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2700,31 +2766,31 @@ msgstr ""
"Jak dok�adnie zosta�a przez Ciebie sprawdzona to�samo�� tej osoby?\n"
"Je�li nie wiesz co odpowiedzie�, podaj ,,0''.\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Nie odpowiem na to pytanie. %s\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) W og�le nie.%s\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Pobie�nie.%s\n"
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Bardzo dok�adnie.%s\n"
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr "Tw�j wyb�r (,,?'' podaje wi�cej informacji): "
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2732,7 +2798,7 @@ msgstr ""
"Czy jeste� naprawd� pewien �e chcesz podpisa� ten klucz \n"
"swoim kluczem: \""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2740,7 +2806,7 @@ msgstr ""
"\n"
"To b�dzie podpis klucza nim samym.\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2748,7 +2814,7 @@ msgstr ""
"\n"
"OSTRZE�ENIE: podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2756,7 +2822,7 @@ msgstr ""
"\n"
"OSTRZE�ENIE: podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2764,7 +2830,7 @@ msgstr ""
"\n"
"Podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2772,7 +2838,7 @@ msgstr ""
"\n"
"Podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2780,7 +2846,7 @@ msgstr ""
"\n"
"To�samo�� u�ytkownika nie zosta�a w og�le sprawdzona.\n"
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2788,7 +2854,7 @@ msgstr ""
"\n"
"To�samo�� u�ytkownika zosta�a sprawdzona pobie�nie.\n"
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2796,34 +2862,34 @@ msgstr ""
"\n"
"To�samo�� u�ytkownika zosta�a dok�adnie sprawdzona.\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "Czy na pewno podpisa�? "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "Ten klucz nie jest chroniony.\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "Klucz jest chroniony.\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Tego klucza nie mo�na edytowa�: %s.\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2831,7 +2897,7 @@ msgstr ""
"Wprowad� nowe d�ugie, skomplikowane has�o dla tego klucza tajnego.\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2839,545 +2905,568 @@ msgstr ""
"Nie chcesz has�a - to *z�y* pomys�!\n"
"\n"
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "Czy na pewno chcesz to zrobi�? "
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "wyj�cie z tego menu"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "w"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "zapis"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "zapis zmian i wyj�cie"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "pomoc"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "ten tekst pomocy"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "odc"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "okazanie odcisku klucza"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "lista"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "lista kluczy i identyfikator�w u�ytkownik�w"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "id"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "wyb�r identyfikatora u�ytkownika N"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "klucz"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "wyb�r podklucza N"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "lista"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "lista podpis�w"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "l"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "podpis"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "z�o�enie podpisu na kluczu"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "p"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "tsign"
msgstr "podpis"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "make a trust signature"
msgstr "z�o�enie podpisu oddzielonego od dokumentu"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "lpodpis"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "z�o�enie prywatnego (lokalnego) podpisu na kluczu"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr "nupodpis"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr "z�o�enie na kluczu podpisu nie podlegaj�cego uniewa�nieniu"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr "nulpodpis"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "sign the key locally and non-revocably"
msgstr "z�o�enie na kluczu prywatnego podpisu nie podlegaj�cego uniewa�nieniu"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "�ledzenia"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "dodid"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr "dodfoto"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr "dodanie zdj�cia u�ytkownika do klucza"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "usid"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "usuni�cie identyfikatora u�ytkownika z klucza"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr "usfoto"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "dodkl"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "dodanie podklucza"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+#, fuzzy
+msgid "addcardkey"
+msgstr "dodkl"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+#, fuzzy
+msgid "keytocard"
+msgstr "Podaj \"help\" aby zobaczy� list� polece�."
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "uskl"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "usuni�cie podklucza"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "addrevoker"
msgstr "dodun"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "add a revocation key"
msgstr "wyznaczenie klucza uniewa�niaj�cego"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "uspod"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "usuni�cie podpis�w"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "data"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "zmiana daty wa�no�ci klucza"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr "g��wny"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr "oznaczenie identyfikatora u�ytkownika jako g��wnego"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "prze�"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "prze��czenie pomi�dzy list� kluczy publicznych i prywatnych"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "p"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "opcje"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr "ustawienia (zaawansowane)"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr "opcje"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr "rozbudowana lista ustawie�"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr "ustaw"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr "ustawienie opcji klucza"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr "aktopc"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr "aktualizacja ustawie� klucza"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "keyserver"
msgstr "b��d serwera kluczy"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "set preferred keyserver URL"
msgstr "niezrozuma�y URI serwera kluczy\n"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "has�o"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "zmiana has�a klucza"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "zaufanie"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "zmiana zaufania w�a�ciciela"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "unpod"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "uniewa�nienie podpisu"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revuid"
msgstr "unpod"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revoke a user ID"
msgstr "uniewa�nienie identyfikatora u�ytkownika"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "unpkl"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "uniewa�nienie podklucza"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "wy�kl"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "wy��czy� klucz z u�ycia"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "w�kl"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "w��czy� klucz do u�ycia"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr "foto"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr "okazanie identyfikatora - zdj�cia"
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "nie dzia�a w trybie wsadowym\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "b��d odczytu bloku klucza tajnego '%s': %s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "Dost�pny jest klucz tajny.\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "Polecenie> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr "Najpierw trzeba u�y� polecenia \"prze�\".\n"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
msgid "Key is revoked."
msgstr "Klucz uniewa�niony."
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "Podpisa� wszystkie identyfikatory u�ytkownika na tym kluczu? "
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "To polecenie nie jest dost�pne w trybie %s.\n"
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+#, fuzzy
+msgid "Really move the primary key? "
+msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
+
+#: g10/keyedit.c:1598
+#, fuzzy
+msgid "You must select exactly one key.\n"
+msgstr "Musisz wybra� co najmniej jeden klucz.\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "Musisz wybra� co najmniej jeden klucz.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "Czy na pewno chcesz usun�� ten klucz? "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
msgid "Really revoke all selected user IDs? "
msgstr "Czy na pewno uniewa�ni� wszystkie wybrane identyfikatory u�ytkownika? "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
msgid "Really revoke this user ID? "
msgstr "Czy na pewno uniewa�ni� ten identyfikator u�ytkownika? "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "Czy na pewno chcesz uniewa�ni� wybrane klucze? "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
#, fuzzy
msgid "Set preference list to:\n"
msgstr "ustawienie opcji klucza"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr ""
"Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr "Czy na pewno usaktualni� ustawienia? "
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "Zapisa� zmiany? "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "Wyj�� bez zapisania zmian? "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "zapis zmian nie powi�d� si�: %s\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "zapis zmian na kluczu prywatnym nie powi�d� si�: %s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "Klucz nie zosta� zmieniony wi�c zapis zmian nie jest konieczny.\n"
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "Niepoprawna komenda (spr�buj \"help\")\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr "Skr�t: "
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr "Ustawienia: "
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keyedit.c:2219
#, c-format
msgid "This key may be revoked by %s key "
msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s "
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr " (poufne)"
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "nie mo�na utworzy� %s: %s\n"
-#: g10/keyedit.c:2084
-#, fuzzy, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
msgstr "[uniewa�niony]"
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
-msgstr " [wygasa :%s]"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "data"
+
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
+msgstr "data"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2246
#, fuzzy, c-format
-msgid "expires: %s"
-msgstr " [wygasa :%s]"
+msgid "usage: %s"
+msgstr " zaufanie: %c/%c"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, fuzzy, c-format
msgid "trust: %s"
msgstr " zaufanie: %c/%c"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "Ten klucz zosta� wy��czony z u�ytku"
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "un! podklucz zosta� uniewa�niony: %s\n"
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
-msgstr "un- fa�szywy certyfikat uniewa�nienia\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr "un? problem przy sprawdzaniu uniewa�nienia: %s\n"
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-#, fuzzy
-msgid "revoked"
-msgstr "[uniewa�niony]"
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-#, fuzzy
-msgid "expired"
-msgstr "data"
+#: g10/keyedit.c:2300
+msgid "card-no: "
+msgstr ""
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Klucze PGP 2.x nie zawieraj� opisu ustawie�.\n"
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3385,15 +3474,7 @@ msgstr ""
"Pokazana warto�� wiarygodno�ci klucza mo�e by� niepoprawna,\n"
"dop�ki program nie zostanie uruchomiony ponownie.\n"
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-msgid "[revoked] "
-msgstr "[uniewa�niony]"
-
-#: g10/keyedit.c:2274
-msgid "[expired] "
-msgstr "[przeterminowany]"
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@ -3402,7 +3483,7 @@ msgstr ""
" jako g��wny. Wykonanie tego polecenie mo�e wi�c spowodowa�\n"
" wy�wietlanie innego identyfikatora jako domy�lnego g��wnego.\n"
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3411,45 +3492,45 @@ msgstr ""
"OSTRZE�ENIE: To jest klucz PGP wersji 2. Dodanie zdj�cia spowoduje, �e\n"
" niekt�re wersje przestan� go rozumie�.\n"
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Czy dalej chcesz je doda�? (t/N) "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Do klucza dla PGP 2.x nie mo�na doda� zdj�cia.\n"
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "Usun�� ten poprawny podpis? (t/N/w) "
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Usun�� ten niepoprawny podpis? (t/N/w) "
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Usun�� ten nieznany podpis? (t/N/w) "
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N) "
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d podpis usuni�ty.\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d podpis�w usuni�tych.\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "Nic nie zosta�o usuni�te.\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3459,89 +3540,99 @@ msgstr ""
" uniewa�niaj�cego, spowoduje, �e niekt�re wersje PGP przestan�\n"
" go rozumie�.\n"
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Do klucza dla PGP 2.x nie mo�na wyznaczy� klucza uniewa�niaj�cego.\n"
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
msgid "Enter the user ID of the designated revoker: "
msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "klucza PGP 2.x nie mo�na wyznaczy� jako uniewa�niaj�cego\n"
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "nie mo�na wyznaczu� klucza do uniewa�niania jego samego\n"
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony kluczem uniewa�niaj�cym!\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"OSTRZE�ENIE: nie mo�na cofn�� wyznaczenia klucza jako uniewa�niaj�cego!\n"
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr "Czy na pewno chcesz wyznaczy� ten klucz jako uniewa�niaj�cy? (t/N): "
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "Prosz� usun�� znacznik wyboru z kluczy prywatnych.\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "Prosz� wybra� tylko jeden podklucz.\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "Zmiana daty wa�no�ci podklucza.\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Nie mo�na zmieni� daty wa�no�ci klucza w wersji 3.\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
msgid "Please select exactly one user ID.\n"
msgstr "Prosz� wybra� dok�adnie jeden identyfikator u�ytkownika.\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
-#, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "podpis w wersji 3 na identyfikatorze ,,%s'' zostaje pomini�ty\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+#, fuzzy
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "Czy na pewno chcesz tego u�y�? (t/N) "
+
+#: g10/keyedit.c:3480
+#, fuzzy
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "Czy na pewno chcesz tego u�y�? (t/N) "
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Brak podklucza o numerze %d\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "Identyfikator u�ytkownika: "
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3550,7 +3641,7 @@ msgstr ""
"\"\n"
"podpisano Twoim kluczem %08lX w %s\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3559,144 +3650,128 @@ msgstr ""
"\"\n"
"lokalnie podpisano Twoim kluczem %08lX w %s\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Wa�no�� tego klucza wygas�a %s.\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Czy dalej chcesz go uniewa�ni�? (t/N) "
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N) "
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "Te identyfikatory s� podpisane przez Ciebie:\n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid " signed by %s on %s%s%s\n"
msgstr "podpisany przez %08lX w %s%s%s\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid " revoked by %s on %s\n"
msgstr "uniewa�niony przez %08lX w %s\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, fuzzy, c-format
msgid " signed by %s on %s%s\n"
msgstr "podpisany przez %08lX w %s%s\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr " (podpis nieeksportowalny) "
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
msgid "Really create the revocation certificates? (y/N) "
msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N) "
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "brak klucza tajnego\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"OSTRZE�ENIE: identyfikator u�ytkownika podpisany za %d sekund (w "
"przysz�o�ci)\n"
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Zdj�cie w formacie %s, rozmiar %ld bajt�w, klucz 0x%08lX (id %d).\n"
-#: g10/keylist.c:179
+#: g10/keylist.c:180
msgid "Critical signature policy: "
msgstr "Krytyczny regulamin podpisu: "
-#: g10/keylist.c:181
+#: g10/keylist.c:182
msgid "Signature policy: "
msgstr "Regulamin podpisu: "
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "OSTRZE�ENIE: niepoprawne dane w adnotacji\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
msgid "Critical signature notation: "
msgstr "Krytyczne adnotacje podpisu: "
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr "Adnotacje podpisu: "
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr "nieczytelne dla cz�owieka"
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr "Zbi�r kluczy"
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr " [wygasa :%s]"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr " [wygasa :%s]"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, fuzzy, c-format
-msgid " [revoked: %s]"
-msgstr "[uniewa�niony]"
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
msgid "Primary key fingerprint:"
msgstr "Odcisk klucza g��wnego:"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
msgid " Subkey fingerprint:"
msgstr " Odcisk podklucza:"
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
msgid " Primary key fingerprint:"
msgstr " Odcisk klucza g��wnego:"
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
msgid " Subkey fingerprint:"
msgstr " Odcisk podklucza:"
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr " Odcisk klucza ="
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3903,80 +3978,80 @@ msgstr "podpis starego typu (PGP 2.x).\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "nie mo�na wy��czy� zrzut�w pami�ci: %s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "Nie nale�y u�ywa� algorytm�w do�wiadczalnych!\n"
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"u�ywanie tego szyfru jest odradzane; nale�y u�ywa� standardowych szyfr�w!\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr "modu� szyfru IDEA nie jest dost�pny\n"
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr "wi�cej informacji jest tutaj: http://www.gnupg.org/why-not-idea.html\n"
-#: g10/misc.c:491
+#: g10/misc.c:517
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d jest przestarza�� opcj� ,,%s''\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "w jej miejsce nale�y u�y� ,,%s%s''\"\n"
-#: g10/misc.c:508
+#: g10/misc.c:534
msgid "Uncompressed"
msgstr "Nieskompresowany"
-#: g10/misc.c:533
+#: g10/misc.c:559
#, fuzzy
msgid "uncompressed|none"
msgstr "Nieskompresowany"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "ta wiadomo�� mo�e nie da� si� odczyta� za pomoc� %s\n"
-#: g10/misc.c:777
+#: g10/misc.c:826
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "odczyt opcji z ,,%s''\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "nieznany domy�lny adresat ,,%s''\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "nie mo�na obs�u�y� tego algorytmu klucza publicznego: %d\n"
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"OSTRZE�ENIE: symetrycznie zaszyfrowany klucz sesyjny mo�e nie by� "
"bezpieczny\n"
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
@@ -4015,7 +4090,7 @@ msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "problem z porozumiewaniem si� z agentem\n"
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr "problem z agentem - zostaje wy��czony\n"
@@ -4051,24 +4126,24 @@ msgstr "has�o zbyt d�ugie\n"
msgid "invalid response from agent\n"
msgstr "b��dna odpowied� agenta\n"
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "anulowano przez u�ytkownika\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "problem agenta: zwr�ci� 0x%lx\n"
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "pytanie o has�o nie dzia�a w trybie wsadowym\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "Podaj has�o: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4078,22 +4153,22 @@ msgstr ""
"Musisz poda� has�o aby odbezpieczy� klucz prywatny u�ytkownika:\n"
"\""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "d�ugo�� %u bit�w, typ %s, numer %08lX, stworzony %s"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (podklucz %08lX)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "Powt�rz has�o: "
@@ -4321,25 +4396,36 @@ msgstr ""
"kluczami PGP 2 w trybie --pgp2 mo�na podpisywa� tylko do oddzielonych "
"podpis�w\n"
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
-msgstr "nie mo�na utworzy� %s: %s\n"
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
+msgstr "nie mo�na utworzy� ,,%s'': %s\n"
-#: g10/sign.c:794
-#, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+#: g10/sign.c:771 g10/sign.c:1008
+#, fuzzy, c-format
+msgid "writing to file `%s'\n"
+msgstr "zapis do '%s'\n"
+
+#: g10/sign.c:795
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami adresata\n"
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr "podpis:"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "nie mo�na otworzy� pliku: %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "w trybie --pgp2 mo�na podpisywa� tylko za pomoc� kluczy z wersji 2.x\n"
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr "zostanie u�yty szyfr %s\n"
@@ -4739,7 +4825,7 @@ msgstr ""
"brak mo�liwo�ci generacji dobrego klucza dla szyfru symetrycznego;\n"
"operacja by�a powtarzana %d razy!\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr ""
"Algorytm DSA wymaga u�ycia algorytmu skr�tu daj�cego 160-bitowy wynik.\n"
@@ -5104,17 +5190,17 @@ msgstr "Pomoc niedost�pna"
msgid "No help available for `%s'"
msgstr "Brak pomocy o ,,%s''"
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr "zbi�r kluczy ,,%s'' zosta� utworzony\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "nie powiod�a si� odbudowa bufora bazy: %s\n"
@@ -5157,8 +5243,7 @@ msgstr "%lu kluczy (%lu podpis�w)\n"
msgid "%s: keyring created\n"
msgstr "%s: zbi�r kluczy utworzony\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5172,29 +5257,34 @@ msgstr ""
"publicznym. Je�li b�dzie du�y, powi�kszy to tak�e rozmiar Twojego klucza!\n"
"Dobry rozmiar to oko�o 240 na 288 pikseli.\n"
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr "Nazwa pliku ze zdj�ciem w formacie JPEG: "
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "Nie mo�na otworzy� zdj�cia ,,%s'': %s.\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
msgid "Are you sure you want to use it (y/N)? "
msgstr "Czy na pewno chcesz tego u�y�? (t/N) "
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr ",,%s'' nie jest plikiem JPEG\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Is this photo correct (y/N/q)? "
msgstr "Czy zdj�cie jest w porz�dku? (t/N/w) "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
msgid "unable to display photo ID!\n"
msgstr "nie mo�na wy�wietli� zdj�cia!\n"
@@ -5214,45 +5304,51 @@ msgstr ""
"nieszczelne uprawnienia ustawie� - wo�anie zewn�trznych program�w wy��czone\n"
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
+#, fuzzy
+msgid "this platform requires temporary files when calling external programs\n"
msgstr ""
"platforma wymaga u�ycia plik�w tymczasowych do wo�ania zewn�trznych "
"program�w\n"
-#: g10/exec.c:432
-#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
+msgstr "nie mo�na wykona� %s ,,%s'': %s\n"
+
+#: g10/exec.c:436
+#, fuzzy, c-format
+msgid "unable to execute shell `%s': %s\n"
msgstr "nie mo�na wykona� %s ,,%s'': %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:515
#, c-format
msgid "system error while calling external program: %s\n"
msgstr "b��d systemu podczas wo�ania programu zewn�trznego: %s\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr "nienaturalne zako�czenie pracy zewn�trznego programu\n"
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr "nie mo�na uruchomi� zewn�trznego programu\n"
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr "nie mo�na odczyta� odpowiedzi programu zewn�trznego: %s\n"
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "OSTRZE�ENIE: nie mo�na skasowa� tymczasowego katalogu ,,%s'': %s.\n"
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr "nigdy "
@@ -5413,6 +5509,47 @@ msgstr "b��d podczas odczytu zapisu warto�ci zaufania: %s\n"
msgid "read error: %s\n"
msgstr "b��d odczytu: %s\n"
+#, fuzzy
+#~ msgid "revoked: %s"
+#~ msgstr "[uniewa�niony]"
+
+#, fuzzy
+#~ msgid "expired: %s"
+#~ msgstr " [wygasa :%s]"
+
+#, fuzzy
+#~ msgid "expires: %s"
+#~ msgstr " [wygasa :%s]"
+
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "un! podklucz zosta� uniewa�niony: %s\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "un- fa�szywy certyfikat uniewa�nienia\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "un? problem przy sprawdzaniu uniewa�nienia: %s\n"
+
+#~ msgid "[revoked] "
+#~ msgstr "[uniewa�niony]"
+
+#~ msgid "[expired] "
+#~ msgstr "[przeterminowany]"
+
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr " [wygasa :%s]"
+
+#~ msgid " [expires: %s]"
+#~ msgstr " [wygasa :%s]"
+
+#, fuzzy
+#~ msgid " [revoked: %s]"
+#~ msgstr "[uniewa�niony]"
+
+#~ msgid "can't create %s: %s\n"
+#~ msgstr "nie mo�na utworzy� %s: %s\n"
+
#~ msgid ""
#~ "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n"
#~ msgstr ""
@@ -6283,9 +6420,6 @@ msgstr "b��d odczytu: %s\n"
#~ msgid "change_passwd.empty.okay"
#~ msgstr "Odpowiedz \"tak\" lub \"nie\""
-#~ msgid "keyedit.cmd"
-#~ msgstr "Podaj \"help\" aby zobaczy� list� polece�."
-
#~ msgid "keyedit.save.okay"
#~ msgstr "Odpowiedz \"tak\" lub \"nie\""
diff --git a/po/pt.po b/po/pt.po
index a125a4efc..e962c7542 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
"PO-Revision-Date: 2002-09-13 18:26+0100\n"
"Last-Translator: Pedro Morais <[email protected]>\n"
"Language-Team: pt <[email protected]>\n"
@@ -50,7 +50,7 @@ msgstr "n�o"
msgid "nN"
msgstr "nN"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "sair"
@@ -283,6 +283,16 @@ msgstr "chave secreta n�o utiliz�vel"
msgid "keyserver error"
msgstr "erro do servidor de chaves"
+#: util/errors.c:108
+#, fuzzy
+msgid "canceled"
+msgstr "cancelado pelo utilizador\n"
+
+#: util/errors.c:109
+#, fuzzy
+msgid "no card"
+msgstr "n�o cifrado"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr ""
@@ -305,7 +315,7 @@ msgstr "voc� encontrou um bug ... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "nenhum m�dulo de recolha de entropia detectado\n"
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "imposs�vel abrir `%s': %s\n"
@@ -338,7 +348,7 @@ msgstr "imposs�vel ler `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "nota: ficheiro random_seed n�o actualizado\n"
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr "imposs�vel criar `%s': %s\n"
@@ -404,7 +414,7 @@ msgstr ""
msgid "can't generate a prime with less than %d bits\n"
msgstr ""
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -412,128 +422,128 @@ msgstr ""
"@Comandos:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[ficheiro]|fazer uma assinatura"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "fazer uma assinatura separada"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "cifrar dados"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "cifrar apenas com cifra sim�trica"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "decifrar dados (ac��o por omiss�o)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "verificar uma assinatura"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "listar as chaves"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "listar as chaves e as assinaturas"
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "verificar as assinaturas das chaves"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "listar as chaves e as impress�es digitais"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "listar as chaves secretas"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "gerar um novo par de chaves"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "remover chaves do porta-chaves p�blico"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "remover chaves do porta-chaves secreto"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "assinar uma chave"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "assinar uma chave localmente"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "assinar ou editar uma chave"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "gerar um certificado de revoga��o"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "exportar chaves"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "exportar chaves para um servidor de chaves"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "importar chaves de um servidor de chaves"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "procurar chaves num servidor de chaves"
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "actualizar todas as chaves a partir de um servidor de chaves"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "importar/fundir chaves"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "actualizar a base de dados de confian�a"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -543,59 +553,55 @@ msgstr ""
"Op��es:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "criar sa�da com armadura ascii"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|NOME|cifrar para NOME"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr ""
"usar este identificador de utilizador para\n"
"assinar ou decifrar"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr ""
"|N|estabelecer n�vel de compress�o N\n"
"(0 desactiva)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "usar modo de texto can�nico"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "usar como ficheiro de sa�da"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "detalhado"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "n�o fazer altera��es"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "perguntar antes de sobrep�r"
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -603,7 +609,7 @@ msgstr ""
"@\n"
"(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -623,15 +629,15 @@ msgstr ""
" --list-keys [nomes] mostrar chaves\n"
" --fingerprint [nomes] mostrar impress�es digitais\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Por favor comunique bugs para <[email protected]>.\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -641,7 +647,7 @@ msgstr ""
"assina, verifica, cifra ou decifra\n"
"a opera��o por omiss�o depende dos dados de entrada\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -649,472 +655,466 @@ msgstr ""
"\n"
"Algoritmos suportados:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr "Chave p�blica: "
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr "Cifra: "
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr "Dispers�o: "
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
msgid "Compression: "
msgstr "Compress�o: "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "uso: gpg [op��es] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "comandos em conflito\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "nenhum sinal = encontrada na defini��o de grupo \"%s\"\n"
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
-#: g10/g10.c:1205
+#: g10/g10.c:1210
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
-#: g10/g10.c:1334
+#: g10/g10.c:1354
#, fuzzy, c-format
-msgid "unknown configuration item \"%s\"\n"
+msgid "unknown configuration item `%s'\n"
msgstr "criado um novo ficheiro de configura��o `%s'\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTA: o ficheiro antigo de op��es por omiss�o `%s' foi ignorado\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "ficheiro de op��es `%s': %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "a ler op��es de `%s'\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: %s n�o � para uso normal!\n"
-#: g10/g10.c:1887
-#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+#: g10/g10.c:2021
+#, fuzzy, c-format
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr ""
"a extens�o de cifra \"%s\" n�o foi carregada devido �s suas permiss�es "
"inseguras\n"
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "n�o consegui processar a URI do servidor de chaves\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "op��es de exporta��o inv�lidas\n"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: op��es de importa��o inv�lidas\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
msgid "invalid import options\n"
msgstr "op��es de importa��o inv�lidas\n"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
msgid "invalid export options\n"
msgstr "op��es de exporta��o inv�lidas\n"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: op��es de importa��o inv�lidas\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "op��es de importa��o inv�lidas\n"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "op��es de exporta��o inv�lidas\n"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: O programa pode criar um ficheiro core!\n"
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s sobrep�e %s\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n�o � permitido com %s!\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n�o faz sentido com %s!\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "s� pode fazer assinaturas separadas ou em texto puro no modo --pgp2\n"
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "n�o pode assinar e cifrar ao mesmo tempo no modo --pgp2\n"
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"deve utilizar ficheiros (e n�o um 'pipe') quando trabalho no modo --pgp2.\n"
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "cifrar uma mensagem no modo --pgp2 necessita da cifra IDEA\n"
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
msgid "selected certification digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve ser maior que 0\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve ser maior que 1\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth deve estar na entre 1 e 255\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
#, fuzzy
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
#, fuzzy
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
msgid "invalid default preferences\n"
msgstr "prefer�ncias por omiss�o inv�lidas\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
msgid "invalid personal cipher preferences\n"
msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
msgid "invalid personal digest preferences\n"
msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
msgid "invalid personal compress preferences\n"
msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s n�o faz sentido com %s!\n"
-#: g10/g10.c:2680
+#: g10/g10.c:2797
#, fuzzy, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
-#: g10/g10.c:2685
+#: g10/g10.c:2802
#, fuzzy, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
-#: g10/g10.c:2690
+#: g10/g10.c:2807
#, fuzzy, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"AVISO: destinat�rios (-r) dados sem utilizar uma cifra de chave p�blica\n"
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [nome_do_ficheiro]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [nome_do_ficheiro]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [nome_do_ficheiro]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_ficheiro]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [nome_do_ficheiro]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_ficheiro]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_ficheiro]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nome_do_ficheiro]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [nome_do_ficheiro]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [nome_do_ficheiro]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key id-utilizador"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key id-utilizador"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrsign-key id-utilizador"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key id-utilizador"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-utilizador [comandos]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "imposs�vel abrir %s: %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "actualiza��o da chave secreta falhou: %s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "retirada de armadura falhou: %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de dispers�o inv�lido `%s'\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[nome_do_ficheiro]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "Digite a sua mensagem ...\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "imposs�vel abrir `%s'\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@ -1122,53 +1122,53 @@ msgstr ""
"um nome de nota��o deve ter apenas caracteres imprim�veis ou espa�os, e "
"terminar com um '='\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
msgid "a user notation name must contain the '@' character\n"
msgstr "um valor de nota��o de utilizador n�o deve conter o caracter '@'\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr "a URL de pol�tica de certifica��o dada � inv�lida\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
-#: g10/g10.c:3747
+#: g10/g10.c:3863
#, fuzzy
-msgid "the given signature preferred keyserver URL is invalid\n"
+msgid "the given preferred keyserver URL is invalid\n"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "ser mais silencioso"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
#, fuzzy
msgid "take the keys from this keyring"
msgstr "Remover esta chave do porta-chaves?"
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
#, fuzzy
msgid "make timestamp conflicts only a warning"
msgstr "conflito de \"timestamp\""
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr ""
"|DF|escrever informa��es de estado para o\n"
"descritor de ficheiro DF"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
#, fuzzy
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1200,12 +1200,13 @@ msgid "invalid dash escaped line: "
msgstr "linha com h�fen inv�lida: "
#: g10/armor.c:565
-msgid "unexpected armor:"
+#, fuzzy
+msgid "unexpected armor: "
msgstr "armadura inesperada:"
-#: g10/armor.c:695 g10/armor.c:1276
-#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+#: g10/armor.c:695 g10/armor.c:1280
+#, fuzzy, c-format
+msgid "invalid radix64 character %02X skipped\n"
msgstr "caracter radix64 inv�lido %02x ignorado\n"
#: g10/armor.c:738
@@ -1216,33 +1217,34 @@ msgstr "fim de ficheiro prematuro (sem CRC)\n"
msgid "premature eof (in CRC)\n"
msgstr "fim de ficheiro prematuro (no CRC)\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "CRC malformado\n"
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "erro de CRC; %06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+#, fuzzy
+msgid "premature eof (in trailer)\n"
msgstr "fim de ficheiro prematuro (no \"Trailer\")\n"
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "erro na �ltima linha\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "armadura inv�lida: linha maior que %d caracteres\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1298,7 +1300,7 @@ msgstr " ou \""
msgid " aka \""
msgstr " ou \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1552,96 +1554,116 @@ 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:207
+#: g10/keygen.c:249
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "prefer�ncia %c%lu duplicada\n"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "demasiadas prefer�ncias `%c'\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
#, fuzzy
msgid "too many digest preferences\n"
msgstr "demasiadas prefer�ncias `%c'\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
#, fuzzy
msgid "too many compression preferences\n"
msgstr "demasiadas prefer�ncias `%c'\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
msgid "writing direct signature\n"
msgstr "a escrever a assinatura directa\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "a escrever a auto-assinatura\n"
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "a escrever a assinatura ligada a uma chave\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "tamanho de chave inv�lido; a utilizar %u bits\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "tamanho da chave arredondado para %u bits\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "Por favor selecione o tipo de chave desejado:\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA e ElGamal (por omiss�o)\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (apenas assinatura)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (apenas cifragem)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (apenas assinatura)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (apenas cifragem)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (assinatura e cifragem)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, fuzzy, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) RSA (apenas assinatura)\n"
+
+#: g10/keygen.c:1224
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) RSA (assinatura e cifragem)\n"
+
+#: g10/keygen.c:1226
+#, fuzzy, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) RSA (apenas cifragem)\n"
+
+#: g10/keygen.c:1228
+#, fuzzy, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) RSA (assinatura e cifragem)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "Op��o? "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "Op��o inv�lida.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1654,28 +1676,28 @@ msgstr ""
" tamanho por omiss�o � 1024 bits\n"
" tamanho m�ximo sugerido � 2048 bits\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "Qual o tamanho de chave desejado? (1024) "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
-#: g10/keygen.c:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "tamanho muito pequeno; 1024 � o valor m�nimo permitido para RSA.\n"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
-#: g10/keygen.c:1255
+#: g10/keygen.c:1328
#, 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:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1683,11 +1705,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:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "Voc� tem certeza de que quer este tamanho de chave? "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1695,17 +1717,17 @@ 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:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "O tamanho de chave pedido � %u bits\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arredondado para %u bits\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1721,7 +1743,7 @@ msgstr ""
" <n>m = chave expira em n meses\n"
" <n>y = chave expira em n anos\n"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1737,29 +1759,29 @@ msgstr ""
" <n>m = assinatura expira em n meses\n"
" <n>y = assinatura expira em n anos\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "A chave � valida por? (0) "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr "A assinatura � valida por? (0) "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "valor inv�lido\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr "A %s n�o expira nunca\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr "%s expira em %s\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1767,16 +1789,17 @@ 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:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "Est� correto (s/n)? "
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
+#, fuzzy
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
@@ -1788,44 +1811,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "Nome completo: "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "Caracter inv�lido no nome\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
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:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr "O nome deve ter pelo menos 5 caracteres\n"
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "Endere�o de correio eletr�nico: "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "Endere�o eletr�nico inv�lido\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "Coment�rio: "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "Caracter inv�lido no coment�rio\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1836,29 +1859,29 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Por favor n�o coloque o endere�o de email no nome verdadeiro ou no "
"coment�rio\n"
-#: g10/keygen.c:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoSs"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Mudar (N)ome, (C)oment�rio, (E)mail ou (S)air? "
-#: g10/keygen.c:1542
+#: g10/keygen.c:1615
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:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr "Por favor corrija primeiro o erro\n"
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1866,16 +1889,16 @@ msgstr ""
"Voc� precisa de uma frase secreta para proteger a sua chave.\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1887,7 +1910,7 @@ msgstr ""
"qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1899,59 +1922,59 @@ 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:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
#, fuzzy
msgid "sorry, can't do this in batch mode\n"
msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "O par de chaves DSA ter� 1024 bits.\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "Gera��o de chave cancelada.\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr "a escrever chave p�blica para `%s'\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "a escrever chave privada para `%s'\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "a escrever chave privada para `%s'\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nenhum porta-chaves p�blico com permiss�es de escrita encontrado: %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "nenhum porta-chaves secreto com permiss�es de escrita encontrado: %s\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "erro ao escrever no porta-chaves p�blico `%s': %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "chaves p�blica e privada criadas e assinadas.\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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"
@@ -1959,12 +1982,12 @@ msgstr ""
"Note que esta chave n�o pode ser usada para cifragem. Voc� pode usar\n"
"o comando \"--edit-key\" para gerar uma chave secund�ria para esse fim.\n"
-#: g10/keygen.c:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1972,7 +1995,7 @@ msgstr ""
"a chave foi criada %lu segundo no futuro\n"
"(viagem no tempo ou problema no rel�gio)\n"
-#: g10/keygen.c:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1980,14 +2003,43 @@ msgstr ""
"a chave foi criada %lu segundos no futuro\n"
"(viagem no tempo ou problema no rel�gio)\n"
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOTA: a cria��o de sub-chave para chaves v3 n�o respeito o OpenPGP\n"
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "Realmente criar? "
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "remo��o do bloco de chave falhou: %s\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "imposs�vel criar `%s': %s\n"
+
+#: g10/keygen.c:3248
+#, fuzzy, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "NOTA: chave secreta %08lX expirou em %s\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "--output n�o funciona para este comando\n"
@@ -1998,7 +2050,7 @@ msgstr "--output n�o funciona para este comando\n"
msgid "%s: can't open: %s\n"
msgstr "%s: imposs�vel abrir: %s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
@@ -2026,6 +2078,11 @@ msgstr "%s: AVISO: ficheiro vazio\n"
msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
msgstr "no modo --pgp2 s� pode cifrar com chaves RSA de 2048 bits ou menos\n"
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "imposs�vel abrir %s: %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -2038,25 +2095,34 @@ msgstr ""
"imposs�vel utilizar a cifra IDEA para todas as chaves para que est� a "
"cifrar.\n"
-#: g10/encode.c:526 g10/encode.c:721
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#: g10/encode.c:526
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
-#: g10/encode.c:634 g10/sign.c:863
-#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+#: g10/encode.c:634 g10/sign.c:864
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
msgstr ""
"ao for�ar o algoritmo de compress�o %s (%d) viola as prefer�ncias do "
"destinat�rio\n"
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
+
#: g10/encode.c:818
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrado para: \"%s\"\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "chave `%s' n�o encontrada: %s\n"
@@ -2089,8 +2155,9 @@ msgstr "AVISO: nada exportado\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "entradas demais no cache pk - desactivado\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+#, fuzzy
+msgid "[User ID not found]"
msgstr "[Utilizador n�o encontrado]"
#: g10/getkey.c:1614
@@ -2243,7 +2310,7 @@ msgstr "chave %08lX: subchave HKP corrompida foi reparada\n"
#: g10/import.c:722
#, fuzzy, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '%s'\n"
#: g10/import.c:728
@@ -2270,7 +2337,7 @@ msgstr "chave %08lX: chave nova - ignorada\n"
msgid "no writable keyring found: %s\n"
msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "a escrever para `%s'\n"
@@ -2384,13 +2451,13 @@ msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n"
#: g10/import.c:1299
#, fuzzy, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"chave %08lX: algoritmo de chave p�blica n�o suportado no utilizador \"%s\"\n"
#: g10/import.c:1301
#, fuzzy, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "chave %08lX: auto-assinatura inv�lida do utilizador \"%s\"\n"
#: g10/import.c:1319
@@ -2430,7 +2497,7 @@ msgstr "chave %08lX: removida revoga��o m�ltiplace de subchaves\n"
#: g10/import.c:1439
#, fuzzy, c-format
-msgid "key %s: skipped user ID '%s'\n"
+msgid "key %s: skipped user ID \"%s\"\n"
msgstr "chave %08lX: ignorado ID de utilizador '"
#: g10/import.c:1460
@@ -2440,7 +2507,7 @@ msgstr "chave %08lX: subchave ignorada\n"
#: g10/import.c:1487
#, fuzzy, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
#: g10/import.c:1497
@@ -2475,114 +2542,114 @@ msgstr ""
"AVISO: a chave %08lX pode estar revocada: a transferir a chave de revoca��o %"
"08lX\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"AVISO: a chave %08lX pode estar revocada: chave de revoca��o %08lX n�o "
"presente.\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chave %08lX: assinatura directa de chave adicionada\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[revoga��o]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[auto-assinatura]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "1 assinatura incorrecta\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d assinaturas incorrectas\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "1 assinatura n�o verificada por falta de chave\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d assinaturas n�o verificadas por falta de chaves\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "1 assinatura n�o verificada devido a um erro\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d assinaturas n�o verificadas devido a erros\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "1 ID de utilizador sem auto-assinatura v�lida detectado\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "%d IDs de utilizadores sem auto-assinaturas v�lidas detectados\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, fuzzy, c-format
msgid " (%d) I trust marginally\n"
msgstr " %d = Confio moderadamente\n"
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, fuzzy, c-format
msgid " (%d) I trust fully\n"
msgstr " %d = Confio plenamente\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Utilizador \"%s\" est� revocado."
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr " N�o foi poss�vel assinar.\n"
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, fuzzy, c-format
msgid "User ID \"%s\" is expired."
msgstr "Utilizador \"%s\" est� revocado."
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, fuzzy, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "AVISO: o ID do utilizador \"%s\" n�o � auto-assinado.\n"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2591,11 +2658,11 @@ msgstr ""
"A sua auto-assinatura em \"%s\"\n"
"� uma assinatura do tipo PGP 2.x.\n"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Quer promov�-la a uma auto-assinatura OpenPGP? (s/N) "
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, fuzzy, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2604,12 +2671,12 @@ msgstr ""
"A sua assinatura actual em \"%s\"\n"
"� uma assinatura local.\n"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
#, fuzzy
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2618,55 +2685,55 @@ msgstr ""
"A sua assinatura actual em \"%s\"\n"
"� uma assinatura local.\n"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Quer promov�-la a uma assinatura export�vel? (s/N)"
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" j� foi assinado localmente pela chave %08lX\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" j� foi assinado pela chave %08lX\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
#, fuzzy
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nada para assinar com a chave %08lX\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "Esta chave expirou!"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Esta chave vai expirar em %s.\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
msgstr ""
"N�o pode criar uma assinatura OpenPGP numa chave PGP 2.x no modo --pgp2.\n"
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "Isto tornaria a chave inutiliz�vel no PGP 2.x.\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2676,31 +2743,31 @@ msgstr ""
"pertence\n"
"� pessoa correcta? Se n�o sabe o que responder, escolha \"0\".\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) N�o vou responder.%s\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) N�o verifiquei.%s\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Verifiquei por alto.%s\n"
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Verifiquei com bastante cuidado.%s\n"
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr ""
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2708,7 +2775,7 @@ msgstr ""
"Voc� tem certeza de que quer assinar esta chave com\n"
"a sua chave: \""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2716,7 +2783,7 @@ msgstr ""
"\n"
"Isto ser� uma auto-assinatura.\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2724,7 +2791,7 @@ msgstr ""
"\n"
"AVISO: a assinatura n�o ser� marcada como n�o-export�vel.\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2732,7 +2799,7 @@ msgstr ""
"\n"
"AVISO: a assinatura n�o ser� marcada como n�o-revoc�vel.\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2740,7 +2807,7 @@ msgstr ""
"\n"
"A assinatura ser� marcada como n�o-export�vel.\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2748,7 +2815,7 @@ msgstr ""
"\n"
"A assinatura ser� marcada como n�o-revoc�vel.\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2756,7 +2823,7 @@ msgstr ""
"\n"
"N�o verifiquei esta chave.\n"
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2764,7 +2831,7 @@ msgstr ""
"\n"
"Verifiquei por alto esta chave.\n"
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2772,34 +2839,34 @@ msgstr ""
"\n"
"Verifiquei esta chave com muito cuidado.\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "Realmente assinar? "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "assinatura falhou: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "Esta chave n�o � protegida.\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "A chave � protegida.\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Imposs�vel editar esta chave: %s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2807,7 +2874,7 @@ msgstr ""
"Digite a nova frase para esta chave secreta.\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2815,545 +2882,567 @@ msgstr ""
"Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
"\n"
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "Voc� quer realmente fazer isso? "
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "a mover a assinatura da chave para o local correcto\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "sair deste menu"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "q"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "save"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "gravar e sair"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "help"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "mostra esta ajuda"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "mostra impress�o digital"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "list"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "lista chave e identificadores de utilizadores"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "seleciona ID de utilizador N"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "key"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "seleciona chave secund�ria N"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "check"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "lista assinaturas"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "c"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "assina a chave"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "s"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "tsign"
msgstr "sign"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "make a trust signature"
msgstr "fazer uma assinatura separada"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "assina a chave localmente"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr "assina a chave de forma n�o-revog�vel"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "sign the key locally and non-revocably"
msgstr "assinar a chave localmente e de forma n�o revog�vel"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "adiciona um novo ID de utilizador"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr "addphoto"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr "adiciona um identificador fotogr�fico"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "remove ID de utilizador"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr "delphoto"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "adiciona nova chave secund�ria"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+#, fuzzy
+msgid "addcardkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "remove uma chave secund�ria"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "addrevoker"
msgstr "addrevoker"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "add a revocation key"
msgstr "adiciona uma chave de revoca��o"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "remove assinaturas"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "muda a data de validade"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr "primary"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr "seleccionar o identificador do utilizador como prim�rio"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "alterna entre listagem de chave secreta e p�blica"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "t"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr "lista prefer�ncias (perito)"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr "lista prefer�ncias (detalhadamente)"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr "configurar lista de prefer�ncias"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr "prefer�ncias actualizadas"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "keyserver"
msgstr "erro do servidor de chaves"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "set preferred keyserver URL"
msgstr "n�o consegui processar a URI do servidor de chaves\n"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "muda a frase secreta"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "muda os valores de confian�a"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "revoga assinaturas"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revuid"
msgstr "revuid"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revoke a user ID"
msgstr "revocar um ID de utilizador"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "revoga uma chave secund�ria"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "desactiva uma chave"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "activa uma chave"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr "showphoto"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr "mostrar identificador fotogr�fico"
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "erro na leitura do bloco de chave secreto `%s': %s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "Chave secreta dispon�vel.\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "Comando> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "A chave secreta � necess�ria para fazer isto.\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr "Por favor utilize o comando \"toggle\" primeiro.\n"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
msgid "Key is revoked."
msgstr "A chave est� revogada."
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "Realmente assinar todos os IDs de utilizador? "
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Este comando n�o � permitido no modo %s.\n"
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "Voc� n�o pode remover o �ltimo ID de utilizador!\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "Realmente remover este ID de utilizador? "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+#, fuzzy
+msgid "Really move the primary key? "
+msgstr "Realmente remover este ID de utilizador? "
+
+#: g10/keyedit.c:1598
+#, fuzzy
+msgid "You must select exactly one key.\n"
+msgstr "Voc� deve selecionar pelo menos uma chave.\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "Voc� deve selecionar pelo menos uma chave.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "Voc� quer realmente remover as chaves selecionadas? "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "Voc� quer realmente remover esta chave? "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
msgid "Really revoke all selected user IDs? "
msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
msgid "Really revoke this user ID? "
msgstr "Realmente revocar este ID de utilizador? "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "Voc� quer realmente revogar as chaves selecionadas? "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "Voc� quer realmente revogar esta chave? "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
#, fuzzy
msgid "Set preference list to:\n"
msgstr "configurar lista de prefer�ncias"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr ""
"Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr "Realmente actualizar as prefer�ncias?"
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "Gravar altera��es? "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "Sair sem gravar? "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "actualiza��o falhou: %s\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "actualiza��o da chave secreta falhou: %s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "Comando inv�lido (tente \"help\")\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr "'Digest': "
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr "Caracter�sticas: "
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keyedit.c:2219
#, c-format
msgid "This key may be revoked by %s key "
msgstr "Esta chave pode ser revogada pela chave %s "
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr " (sens�vel)"
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "imposs�vel criar %s: %s\n"
-#: g10/keyedit.c:2084
-#, fuzzy, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
msgstr "revkey"
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
-msgstr "[expira: %s]"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
+msgstr "expire"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2246
#, fuzzy, c-format
-msgid "expires: %s"
-msgstr "[expira: %s]"
+msgid "usage: %s"
+msgstr " confian�a: %c/%c"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, fuzzy, c-format
msgid "trust: %s"
msgstr " confian�a: %c/%c"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "Esta chave foi desactivada"
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! subchave foi revogada: %s\n"
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
-msgstr "rev- revoga��o falsa encontrada\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? problema ao verificar revoga��o: %s\n"
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-#, fuzzy
-msgid "revoked"
-msgstr "revkey"
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-#, fuzzy
-msgid "expired"
-msgstr "expire"
+#: g10/keyedit.c:2300
+msgid "card-no: "
+msgstr ""
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "N�o h� prefer�ncias no ID de utilizador tipo PGP 2.x.\n"
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3361,23 +3450,13 @@ msgstr ""
"N�o se esque�a que a validade de chave mostrada n�o � necess�riamente a\n"
"correcta a n�o ser que reinicie o programa.\n"
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-#, fuzzy
-msgid "[revoked] "
-msgstr "revkey"
-
-#: g10/keyedit.c:2274
-#, fuzzy
-msgid "[expired] "
-msgstr "expire"
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
msgstr ""
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3386,46 +3465,46 @@ msgstr ""
"AVISO: Esta chave � do tipo PGP2. Se adicionar um identificador fotogr�fico\n"
" algumas vers�o do PGP podem rejeit�-la.\n"
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Tem a certeza de que quer adicion�-la de qualquer forma? (s/N) "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr ""
"N�o pode adicionar um identificador fotogr�fico a uma chave tipo PGP2.\n"
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "Apagar esta assinatura v�lida? (s/N/q)"
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "Realmente remover esta auto-assinatura? (s/N)"
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d assinatura removida.\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d assinaturas removidas.\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "Nada removido.\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3434,90 +3513,100 @@ msgstr ""
"AVISO: Esta chave � do tipo PGP 2.x. Se adicionar um revogador designado\n"
" algumas vers�o do PGP podem rejeit�-la.\n"
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "N�o pode adicionar um revogador designado a uma chave tipo PGP 2.x.\n"
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
msgid "Enter the user ID of the designated revoker: "
msgstr "Insira o ID de utilizador do revogador escolhido: "
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
#, fuzzy
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "Por favor remova as selec��es das chaves secretas.\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "A modificar a data de validade para uma chave secund�ria.\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "Modificar a data de validade para uma chave prim�ria.\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
msgid "Please select exactly one user ID.\n"
msgstr "Seleccione exactamente um identificador de utilizador.\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
-#, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "a ignorar auto-assinatura v3 no utilizar com o id \"%s\"\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+#, fuzzy
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
+
+#: g10/keyedit.c:3480
+#, fuzzy
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nenhum ID de utilizador com �ndice %d\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Nenhuma chave secund�ria com �ndice %d\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "ID de utilizador: \""
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3526,7 +3615,7 @@ msgstr ""
"\"\n"
"assinado com a sua chave %08lX em %s\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3535,144 +3624,128 @@ msgstr ""
"\"\n"
"assinada localmente com a sua chave %08lX em %s\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Esta assinatura expirou em %s.\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Tem a certeza de que quer revog�-la de qualquer forma? (s/N) "
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "Assinou estes identificadores de utilizadores:\n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid " signed by %s on %s%s%s\n"
msgstr " assinado por %08lX em %s%s%s\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid " revoked by %s on %s\n"
msgstr " revogado por %08lX em %s\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "Est� prestes a revogar estas assinaturas:\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, fuzzy, c-format
msgid " signed by %s on %s%s\n"
msgstr " assinado por %08lX em %s%s\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr " (n�o-export�vel)"
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
msgid "Really create the revocation certificates? (y/N) "
msgstr "Realmente criar os certificados de revoga��o? (s/N) "
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "nenhuma chave secreta\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"AVISO: a assintura do ID do utilizador tem data %d segundos no futuro\n"
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"A mostrar a fotografia %s com o tamanho %ld da chave 0x%08lX (uid %d)\n"
-#: g10/keylist.c:179
+#: g10/keylist.c:180
msgid "Critical signature policy: "
msgstr "Politica de assinatura cr�tica: "
-#: g10/keylist.c:181
+#: g10/keylist.c:182
msgid "Signature policy: "
msgstr "Politica de assinatura: "
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
msgid "Critical signature notation: "
msgstr "Nota��o de assinatura cr�tica: "
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr "Nota��o de assinatura: "
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr "n�o leg�vel por humanos"
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr "Porta-chaves"
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr "[expira: %s]"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr "[expira: %s]"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, fuzzy, c-format
-msgid " [revoked: %s]"
-msgstr "revkey"
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
msgid "Primary key fingerprint:"
msgstr "Impress�o da chave prim�ria:"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
msgid " Subkey fingerprint:"
msgstr " Impress�o da subchave:"
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
msgid " Primary key fingerprint:"
msgstr "Impress�o da chave prim�ria:"
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
msgid " Subkey fingerprint:"
msgstr " Impress�o da subchave:"
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr " Impress�o da chave ="
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3882,80 +3955,80 @@ msgstr "formato de assinatura antigo (PGP2.x)\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "imposs�vel desactivar core dumps: %s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "Algoritmos experimentais n�o devem ser usados!\n"
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"este algoritmo de criptografia est� desctualizado; por favor use um "
"algoritmo mais standard!x\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr "o 'plugin' com a cifra IDEA n�o est� presente\n"
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr "veja http://www.gnupg.org/why-not-idea.html para mais informa��es\n"
-#: g10/misc.c:491
+#: g10/misc.c:517
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: op��o depreciada \"%s\"\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "por favor utilize \"%s%s\" em vez dela\n"
-#: g10/misc.c:508
+#: g10/misc.c:534
#, fuzzy
msgid "Uncompressed"
msgstr "n�o processado"
-#: g10/misc.c:533
+#: g10/misc.c:559
#, fuzzy
msgid "uncompressed|none"
msgstr "n�o processado"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "esta mensagem poder� n�o ser utiliz�vel pelo %s\n"
-#: g10/misc.c:777
+#: g10/misc.c:826
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "a ler op��es de `%s'\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
@@ -3994,7 +4067,7 @@ msgstr "imposs�vel ligar a `%s': %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "problemas na comunica��o com o gpg-agent\n"
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr "problema com o agente - a desactivar a utiliza��o deste\n"
@@ -4032,24 +4105,24 @@ msgstr "frase secreta demasiado longa\n"
msgid "invalid response from agent\n"
msgstr "resposta do agente inv�lida\n"
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "cancelado pelo utilizador\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "problema com o agente: o agente returnou 0x%lx\n"
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "imposs�vel pedir senha em modo n�o-interactivo\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "Digite a frase secreta: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4059,22 +4132,22 @@ msgstr ""
"Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
"utilizador: \""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (ID principal da chave %08lX)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "Repita a frase secreta: "
@@ -4297,27 +4370,38 @@ msgstr "AVISO: `%s' � um ficheiro vazio\n"
msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "s� pode assinar-desligar com chaves do tipo PGP 2.x no modo --pgp2\n"
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
-msgstr "imposs�vel criar %s: %s\n"
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
+msgstr "imposs�vel criar `%s': %s\n"
-#: g10/sign.c:794
-#, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+#: g10/sign.c:771 g10/sign.c:1008
+#, fuzzy, c-format
+msgid "writing to file `%s'\n"
+msgstr "a escrever para `%s'\n"
+
+#: g10/sign.c:795
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
"destinat�rio\n"
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr "a assinar:"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "imposs�vel abrir %s: %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "s� pode assinar � vista com chaves do tipo PGP 2.x no modo --pgp2\n"
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr "ser� utilizada a cifragem %s\n"
@@ -4720,7 +4804,7 @@ msgstr ""
"imposs�vel evitar chave fraca para criptografia sim�trica;\n"
"tentei %d vezes!\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA necessita de utiliza��o de uma algoritmo de dispers�o de 160 bit\n"
@@ -5086,17 +5170,17 @@ msgstr "Nenhuma ajuda dispon�vel"
msgid "No help available for `%s'"
msgstr "Nenhuma ajuda dispon�vel para `%s'"
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "erro ao criar porta-chaves `%s': %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr "porta-chaves `%s' criado\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
@@ -5139,8 +5223,7 @@ msgstr "%lu chave verificadas (%lu assinaturas)\n"
msgid "%s: keyring created\n"
msgstr "%s: porta-chaves criado\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5149,31 +5232,36 @@ msgid ""
"Keeping the image close to 240x288 is a good size to use.\n"
msgstr ""
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr ""
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, fuzzy, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
#, fuzzy
msgid "Are you sure you want to use it (y/N)? "
msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, fuzzy, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr "%s: n�o � um base de dados de confian�a\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
#, fuzzy
msgid "Is this photo correct (y/N/q)? "
msgstr "Est� correto (s/n)? "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
#, fuzzy
msgid "unable to display photo ID!\n"
msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
@@ -5193,44 +5281,50 @@ msgid ""
msgstr ""
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
-msgstr ""
+#, fuzzy
+msgid "this platform requires temporary files when calling external programs\n"
+msgstr "%s: erro ao ler registo de vers�o: %s\n"
+
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
+msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
-#: g10/exec.c:432
+#: g10/exec.c:436
#, fuzzy, c-format
-msgid "unable to execute %s \"%s\": %s\n"
+msgid "unable to execute shell `%s': %s\n"
msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:515
#, fuzzy, c-format
msgid "system error while calling external program: %s\n"
msgstr "%s: erro ao ler registo de vers�o: %s\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr ""
-#: g10/exec.c:539
+#: g10/exec.c:541
#, fuzzy
msgid "unable to execute external program\n"
msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
-#: g10/exec.c:548
+#: g10/exec.c:550
#, fuzzy, c-format
msgid "unable to read external program response: %s\n"
msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr ""
-#: g10/exec.c:606
+#: g10/exec.c:608
#, fuzzy, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr ""
@@ -5388,6 +5482,49 @@ msgstr "%s: erro ao escrever registo de diret�rio: %s\n"
msgid "read error: %s\n"
msgstr "armadura: %s\n"
+#, fuzzy
+#~ msgid "revoked: %s"
+#~ msgstr "revkey"
+
+#, fuzzy
+#~ msgid "expired: %s"
+#~ msgstr "[expira: %s]"
+
+#, fuzzy
+#~ msgid "expires: %s"
+#~ msgstr "[expira: %s]"
+
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "rev! subchave foi revogada: %s\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "rev- revoga��o falsa encontrada\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "rev? problema ao verificar revoga��o: %s\n"
+
+#, fuzzy
+#~ msgid "[revoked] "
+#~ msgstr "revkey"
+
+#, fuzzy
+#~ msgid "[expired] "
+#~ msgstr "expire"
+
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr "[expira: %s]"
+
+#~ msgid " [expires: %s]"
+#~ msgstr "[expira: %s]"
+
+#, fuzzy
+#~ msgid " [revoked: %s]"
+#~ msgstr "revkey"
+
+#~ msgid "can't create %s: %s\n"
+#~ msgstr "imposs�vel criar %s: %s\n"
+
#~ msgid "|[files]|encrypt files"
#~ msgstr "|[ficheiros]|cifrar ficheiros"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 64868044a..7561a4285 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU gnupg 1.0\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
"PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
"Last-Translator:\n"
"Language-Team: ?\n"
@@ -56,7 +56,7 @@ msgid "nN"
msgstr "nN"
# INICIO MENU
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "sair"
@@ -293,6 +293,15 @@ msgstr "chave secreta incorreta"
msgid "keyserver error"
msgstr "erro geral"
+#: util/errors.c:108
+msgid "canceled"
+msgstr ""
+
+#: util/errors.c:109
+#, fuzzy
+msgid "no card"
+msgstr "n�o criptografado"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr ""
@@ -315,7 +324,7 @@ msgstr "voc� encontrou um bug ... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr ""
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "imposs�vel abrir `%s': %s\n"
@@ -348,7 +357,7 @@ msgstr "imposs�vel abrir `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr ""
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, fuzzy, c-format
msgid "can't create `%s': %s\n"
msgstr "imposs�vel criar %s: %s\n"
@@ -415,7 +424,7 @@ msgstr ""
msgid "can't generate a prime with less than %d bits\n"
msgstr ""
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -423,134 +432,134 @@ msgstr ""
"@Comandos:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[arquivo]|fazer uma assinatura"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[arquivo]|fazer uma assinatura em texto puro"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "fazer uma assinatura separada"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "criptografar dados"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr ""
"criptografar apenas com criptografia\n"
"sim�trica"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "descriptografar dados (padr�o)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "verificar uma assinatura"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "listar as chaves"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "listar as chaves e as assinaturas"
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "verificar as assinaturas das chaves"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "listar as chaves e as impress�es digitais"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "listar as chaves secretas"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "gerar um novo par de chaves"
-#: g10/g10.c:374
+#: g10/g10.c:378
#, fuzzy
msgid "remove keys from the public keyring"
msgstr "remover a chave do chaveiro p�blico"
-#: g10/g10.c:376
+#: g10/g10.c:380
#, fuzzy
msgid "remove keys from the secret keyring"
msgstr "remover a chave do chaveiro secreto"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "assinar uma chave"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "assinar uma chave localmente"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "assinar ou editar uma chave"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "gerar um certificado de revoga��o"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "exportar chaves"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "exportar chaves para um servidor"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "importar chaves de um servidor"
-#: g10/g10.c:388
+#: g10/g10.c:392
#, fuzzy
msgid "search for keys on a key server"
msgstr "exportar chaves para um servidor"
-#: g10/g10.c:390
+#: g10/g10.c:394
#, fuzzy
msgid "update all keys from a keyserver"
msgstr "importar chaves de um servidor"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "importar/fundir chaves"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "atualizar o banco de dados de confiabilidade"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -560,65 +569,61 @@ msgstr ""
"Op��es:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "criar sa�da com armadura ascii"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|NOME|criptografar para NOME"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr ""
"usar este identificador de usu�rio para\n"
"assinar ou descriptografar"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr ""
"|N|estabelecer n�vel de compress�o N\n"
"(0 desabilita)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "usar modo de texto can�nico"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "usar como arquivo de sa�da"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "detalhado"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "n�o fazer altera��es"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr ""
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -638,15 +643,15 @@ msgstr ""
" --list-keys [nomes] mostrar chaves\n"
" --fingerprint [nomes] mostrar impress�es digitais\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Por favor comunique bugs para <[email protected]>.\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -656,7 +661,7 @@ msgstr ""
"assina, verifica, criptografa ou descriptografa\n"
"a opera��o padr�o depende dos dados de entrada\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -664,480 +669,474 @@ msgstr ""
"\n"
"Algoritmos suportados:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr ""
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr ""
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr ""
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
#, fuzzy
msgid "Compression: "
msgstr "Coment�rio: "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "uso: gpg [op��es] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "comandos conflitantes\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr ""
-#: g10/g10.c:1166
-#, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
-msgstr ""
+#: g10/g10.c:1171
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
+msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/g10.c:1172
-#, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
-msgstr ""
+#: g10/g10.c:1177
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on extension `%s'\n"
+msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/g10.c:1178
-#, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
-msgstr ""
+#: g10/g10.c:1183
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
+msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/g10.c:1184
-#, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
-msgstr ""
+#: g10/g10.c:1189
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on extension `%s'\n"
+msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/g10.c:1190
-#, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
-msgstr ""
+#: g10/g10.c:1195
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
+msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/g10.c:1193
-#, c-format
+#: g10/g10.c:1198
+#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
-msgstr ""
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
+msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/g10.c:1196
-#, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
-msgstr ""
+#: g10/g10.c:1201
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
+msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/g10.c:1202
-#, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
-msgstr ""
+#: g10/g10.c:1207
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
+msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/g10.c:1205
-#, c-format
+#: g10/g10.c:1210
+#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
-msgstr ""
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
+msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/g10.c:1208
-#, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
-msgstr ""
+#: g10/g10.c:1213
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
+msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/g10.c:1334
+#: g10/g10.c:1354
#, fuzzy, c-format
-msgid "unknown configuration item \"%s\"\n"
+msgid "unknown configuration item `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, fuzzy, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "arquivo de op��es `%s': %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "lendo op��es de `%s'\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: %s n�o � para uso normal!\n"
-#: g10/g10.c:1887
+#: g10/g10.c:2021
#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr ""
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "imposs�vel escrever para o chaveiro: %s\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "AVISO: `%s' � um arquivo vazio\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "chaveiro inv�lido"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, fuzzy, c-format
msgid "%s:%d: invalid import options\n"
msgstr "AVISO: `%s' � um arquivo vazio\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
#, fuzzy
msgid "invalid import options\n"
msgstr "armadura inv�lida"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, fuzzy, c-format
msgid "%s:%d: invalid export options\n"
msgstr "AVISO: `%s' � um arquivo vazio\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
#, fuzzy
msgid "invalid export options\n"
msgstr "chaveiro inv�lido"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "AVISO: `%s' � um arquivo vazio\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "armadura inv�lida"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "AVISO: `%s' � um arquivo vazio\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "chaveiro inv�lido"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr ""
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: O programa pode criar um arquivo core!\n"
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr ""
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n�o � permitido com %s!\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n�o faz sentido com %s!\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
#, fuzzy
msgid "selected certification digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve ser maior que 0\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve ser maior que 1\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth deve estar na entre 1 e 255\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
#, fuzzy
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
#, fuzzy
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
#, fuzzy
msgid "invalid default preferences\n"
msgstr "lista prefer�ncias"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
#, fuzzy
msgid "invalid personal cipher preferences\n"
msgstr "lista prefer�ncias"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
#, fuzzy
msgid "invalid personal digest preferences\n"
msgstr "lista prefer�ncias"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
#, fuzzy
msgid "invalid personal compress preferences\n"
msgstr "lista prefer�ncias"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s n�o faz sentido com %s!\n"
-#: g10/g10.c:2680
+#: g10/g10.c:2797
#, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr ""
-#: g10/g10.c:2685
+#: g10/g10.c:2802
#, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr ""
-#: g10/g10.c:2690
-#, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
-msgstr ""
+#: g10/g10.c:2807
+#, fuzzy, c-format
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
+msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [nome_do_arquivo]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [nome_do_arquivo]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [nome_do_arquivo]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_arquivo]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr ""
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [nome_do_arquivo]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_arquivo]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_arquivo]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
-#: g10/g10.c:2908
+#: g10/g10.c:3025
#, fuzzy
msgid "--sign --symmetric [filename]"
msgstr "--symmetric [nome_do_arquivo]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [nome_do_arquivo]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [nome_do_arquivo]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key id-usu�rio"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key id-usu�rio"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
#, fuzzy
msgid "--nrsign-key user-id"
msgstr "--sign-key id-usu�rio"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
#, fuzzy
msgid "--nrlsign-key user-id"
msgstr "--sign-key id-usu�rio"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-usu�rio [comandos]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "imposs�vel abrir %s: %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "enumera��o de chaves secretas falhou: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "get_dir_record: search_record falhou: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "enumera��o de chaves secretas falhou: %s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "retirada de armadura falhou: %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
# "hash" poderia ser "espalhamento", mas n�o fica claro
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de hash inv�lido `%s'\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[nome_do_arquivo]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "V� em frente e digite sua mensagem ...\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "imposs�vel abrir `%s'\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
#, fuzzy
msgid ""
"a notation name must have only printable characters or spaces, and end with "
@@ -1146,56 +1145,56 @@ msgstr ""
"um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
"terminar com '='\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
#, fuzzy
msgid "a user notation name must contain the '@' character\n"
msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
#, fuzzy
msgid "the given certification policy URL is invalid\n"
msgstr "a URL de pol�tica dada � inv�lida\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
#, fuzzy
msgid "the given signature policy URL is invalid\n"
msgstr "a URL de pol�tica dada � inv�lida\n"
-#: g10/g10.c:3747
+#: g10/g10.c:3863
#, fuzzy
-msgid "the given signature preferred keyserver URL is invalid\n"
+msgid "the given preferred keyserver URL is invalid\n"
msgstr "a URL de pol�tica dada � inv�lida\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "ser mais silencioso"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
#, fuzzy
msgid "take the keys from this keyring"
msgstr "Deletar esta chave do chaveiro? "
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
#, fuzzy
msgid "make timestamp conflicts only a warning"
msgstr "conflito de \"timestamp\""
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr ""
"|DA|escrever informa��es de estado para o\n"
"descritor de arquivo DA"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
#, fuzzy
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
#, fuzzy
msgid ""
"Syntax: gpg [options] [files]\n"
@@ -1230,12 +1229,13 @@ msgid "invalid dash escaped line: "
msgstr "linha com h�fen inv�lida: "
#: g10/armor.c:565
-msgid "unexpected armor:"
+#, fuzzy
+msgid "unexpected armor: "
msgstr "armadura inesperada:"
-#: g10/armor.c:695 g10/armor.c:1276
-#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+#: g10/armor.c:695 g10/armor.c:1280
+#, fuzzy, c-format
+msgid "invalid radix64 character %02X skipped\n"
msgstr "caractere radix64 inv�lido %02x ignorado\n"
#: g10/armor.c:738
@@ -1246,33 +1246,34 @@ msgstr "fim de arquivo prematuro (sem CRC)\n"
msgid "premature eof (in CRC)\n"
msgstr "fim de arquivo prematuro (no CRC)\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "CRC malformado\n"
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "erro de CRC; %06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+#, fuzzy
+msgid "premature eof (in trailer)\n"
msgstr "fim de arquivo prematuro (no \"Trailer\")\n"
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "erro na linha \"trailer\"\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "armadura inv�lida: linha maior que %d caracteres\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1332,7 +1333,7 @@ msgstr " ou \""
msgid " aka \""
msgstr " ou \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly\n"
@@ -1594,101 +1595,121 @@ 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:207
+#: g10/keygen.c:249
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "ignorado `%s': duplicado\n"
# muitas ou demais ???
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "Prefer�ncias demais"
# muitas ou demais ???
-#: g10/keygen.c:216
+#: g10/keygen.c:258
#, fuzzy
msgid "too many digest preferences\n"
msgstr "Prefer�ncias demais"
# muitas ou demais ???
-#: g10/keygen.c:218
+#: g10/keygen.c:260
#, fuzzy
msgid "too many compression preferences\n"
msgstr "Prefer�ncias demais"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "Caractere inv�lido no nome\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
#, fuzzy
msgid "writing direct signature\n"
msgstr "escrevendo auto-assinatura\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "escrevendo auto-assinatura\n"
# key binding ???
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "escrevendo assinatura ligada a uma chave\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, fuzzy, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "O tamanho de chave pedido � %u bits\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, fuzzy, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "arredondado para %u bits\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "Por favor selecione o tipo de chave desejado:\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA e ElGamal (padr�o)\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (apenas assinatura)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (apenas criptografia)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, fuzzy, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) DSA (apenas assinatura)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, fuzzy, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) ElGamal (apenas criptografia)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, fuzzy, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) ElGamal (assinatura e criptografia)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, fuzzy, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) DSA (apenas assinatura)\n"
+
+#: g10/keygen.c:1224
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) ElGamal (assinatura e criptografia)\n"
+
+#: g10/keygen.c:1226
+#, fuzzy, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) ElGamal (apenas criptografia)\n"
+
+#: g10/keygen.c:1228
+#, fuzzy, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) ElGamal (assinatura e criptografia)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "Sua op��o? "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "Op��o inv�lida.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1701,29 +1722,29 @@ msgstr ""
" tamanho padr�o � 1024 bits\n"
" tamanho m�ximo sugerido � 2048 bits\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "Que tamanho de chave voc� quer? (1024) "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
-#: g10/keygen.c:1241
+#: g10/keygen.c:1314
#, fuzzy
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
-#: g10/keygen.c:1255
+#: g10/keygen.c:1328
#, 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:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1731,11 +1752,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:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "Voc� tem certeza de que quer este tamanho de chave? "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1743,17 +1764,17 @@ 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:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "O tamanho de chave pedido � %u bits\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arredondado para %u bits\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1769,7 +1790,7 @@ msgstr ""
" <n>m = chave expira em n meses\n"
" <n>y = chave expira em n anos\n"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
#, fuzzy
msgid ""
"Please specify how long the signature should be valid.\n"
@@ -1786,30 +1807,30 @@ msgstr ""
" <n>m = chave expira em n meses\n"
" <n>y = chave expira em n anos\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "A chave � valida por? (0) "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
#, fuzzy
msgid "Signature is valid for? (0) "
msgstr "A chave � valida por? (0) "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "valor inv�lido\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, fuzzy, c-format
msgid "%s does not expire at all\n"
msgstr "A chave n�o expira nunca\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, fuzzy, c-format
msgid "%s expires at %s\n"
msgstr "A chave expira em %s\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1817,16 +1838,17 @@ 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:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "Est� correto (s/n)? "
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
+#, fuzzy
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
@@ -1837,44 +1859,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "Nome completo: "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "Caractere inv�lido no nome\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
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:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr "O nome deve ter pelo menos 5 caracteres\n"
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "Endere�o de correio eletr�nico: "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "Endere�o eletr�nico inv�lido\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "Coment�rio: "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "Caractere inv�lido no coment�rio\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1885,28 +1907,28 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
-#: g10/keygen.c:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoSs"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
#, 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:1542
+#: g10/keygen.c:1615
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:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr ""
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1914,17 +1936,17 @@ msgstr ""
"Voc� precisa de uma frase secreta para proteger sua chave.\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
#, fuzzy
msgid "passphrase not correctly repeated; try again"
msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr ""
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1936,7 +1958,7 @@ msgstr ""
"qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1948,59 +1970,59 @@ 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:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
#, fuzzy
msgid "sorry, can't do this in batch mode\n"
msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "O par de chaves DSA ter� 1024 bits.\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "Gera��o de chave cancelada.\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, fuzzy, c-format
msgid "writing public key to `%s'\n"
msgstr "escrevendo certificado p�blico para `%s'\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "escrevendo certificado privado para `%s'\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, fuzzy, c-format
msgid "writing secret key to `%s'\n"
msgstr "escrevendo certificado privado para `%s'\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, fuzzy, c-format
msgid "no writable public keyring found: %s\n"
msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, fuzzy, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, fuzzy, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "erro na escrita do chaveiro `%s': %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, fuzzy, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "erro na escrita do chaveiro `%s': %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "chaves p�blica e privada criadas e assinadas.\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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"
@@ -2008,12 +2030,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:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -2021,7 +2043,7 @@ msgstr ""
"a chave foi criada %lu segundo no futuro\n"
"(viagem no tempo ou problema no rel�gio)\n"
-#: g10/keygen.c:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -2029,14 +2051,43 @@ msgstr ""
"a chave foi criada %lu segundos no futuro\n"
"(viagem no tempo ou problema no rel�gio)\n"
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "Realmente criar? "
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "enumera��o de blocos de chaves falhou: %s\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "imposs�vel criar %s: %s\n"
+
+#: g10/keygen.c:3248
+#, fuzzy, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "NOTA: chave secreta %08lX expirou %s\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr ""
@@ -2047,7 +2098,7 @@ msgstr ""
msgid "%s: can't open: %s\n"
msgstr "%s: imposs�vel abrir: %s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
@@ -2075,6 +2126,11 @@ msgstr "%s: AVISO: arquivo vazio\n"
msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
msgstr ""
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "imposs�vel abrir %s: %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -2085,22 +2141,30 @@ msgid ""
"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
msgstr ""
-#: g10/encode.c:526 g10/encode.c:721
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
+#: g10/encode.c:526
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
-#: g10/encode.c:634 g10/sign.c:863
+#: g10/encode.c:634 g10/sign.c:864
#, fuzzy, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
#: g10/encode.c:818
#, fuzzy, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s criptografado para: %s\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, fuzzy, c-format
msgid "key `%s' not found: %s\n"
msgstr "usu�rio `%s' n�o encontrado: %s\n"
@@ -2133,9 +2197,9 @@ msgstr "AVISO: nada exportado\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "entradas demais no cache pk - desativado\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
+#: g10/getkey.c:186 g10/getkey.c:2691
#, fuzzy
-msgid "[User id not found]"
+msgid "[User ID not found]"
msgstr "[usu�rio n�o encontrado]"
#: g10/getkey.c:1614
@@ -2288,7 +2352,7 @@ msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
#: g10/import.c:722
#, fuzzy, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "chave %08lX: aceito ID de usu�rio sem auto-assinatura '"
#: g10/import.c:728
@@ -2315,7 +2379,7 @@ msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
msgid "no writable keyring found: %s\n"
msgstr "imposs�vel escrever chaveiro: %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "escrevendo para `%s'\n"
@@ -2429,12 +2493,12 @@ msgstr "chave %08lX: nenhum ID de usu�rio para assinatura\n"
#: g10/import.c:1299
#, fuzzy, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
#: g10/import.c:1301
#, fuzzy, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "chave %08lX: auto-assinatura inv�lida\n"
#: g10/import.c:1319
@@ -2474,7 +2538,7 @@ msgstr "chave %08lX: liga��o de subchave inv�lida\n"
#: g10/import.c:1439
#, fuzzy, c-format
-msgid "key %s: skipped user ID '%s'\n"
+msgid "key %s: skipped user ID \"%s\"\n"
msgstr "chave %08lX: ignorado ID de usu�rio '"
#: g10/import.c:1460
@@ -2484,7 +2548,7 @@ msgstr "chave %08lX: subchave ignorada\n"
#: g10/import.c:1487
#, fuzzy, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
#: g10/import.c:1497
@@ -2517,221 +2581,221 @@ msgstr "chave %08lX: detectado ID de usu�rio duplicado - unido\n"
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chave %08lX: certificado de revoga��o adicionado\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chave %08lX: %d novas assinaturas\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[revoga��o]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[auto-assinatura]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "1 assinatura incorreta\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d assinaturas incorretas\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "1 assinatura n�o verificada por falta de chave\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d assinaturas n�o verificadas por falta de chaves\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "1 assinatura n�o verificada devido a um erro\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d assinaturas n�o verificadas devido a erros\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "1 ID de usu�rio sem auto-assinatura v�lida detectado\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "%d IDs de usu�rios sem auto-assinaturas v�lidas detectados\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, fuzzy, c-format
msgid " (%d) I trust marginally\n"
msgstr "%s: n�o � um banco de dados de confiabilidade\n"
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, fuzzy, c-format
msgid " (%d) I trust fully\n"
msgstr "%s: n�o � um banco de dados de confiabilidade\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, fuzzy, c-format
msgid "User ID \"%s\" is revoked."
msgstr "A chave � protegida.\n"
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
#, fuzzy
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Voc� tem certeza de que quer este tamanho de chave? "
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr ""
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, fuzzy, c-format
msgid "User ID \"%s\" is expired."
msgstr "A chave � protegida.\n"
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, fuzzy, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "AVISO: `%s' � um arquivo vazio\n"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
"is a PGP 2.x-style signature.\n"
msgstr ""
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr ""
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"has expired.\n"
msgstr ""
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"is a local signature.\n"
msgstr ""
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "J� assinado pela chave %08lX\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "J� assinado pela chave %08lX\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
#, fuzzy
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Voc� tem certeza de que quer este tamanho de chave? "
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nada para assinar com a chave %08lX\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
#, fuzzy
msgid "This key has expired!"
msgstr "Nota: Esta chave expirou!\n"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, fuzzy, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Esta chave n�o � protegida.\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr ""
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
msgstr ""
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr ""
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
"to the person named above? If you don't know what to answer, enter \"0\".\n"
msgstr ""
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr ""
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr ""
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr ""
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr ""
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr ""
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2739,14 +2803,14 @@ msgstr ""
"Voc� tem certeza de que quer assinar esta chave com\n"
"sua chave: \""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
#, fuzzy
msgid ""
"\n"
"This will be a self-signature.\n"
msgstr "isto pode ser causado por falta de auto-assinatura\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
#, fuzzy
msgid ""
"\n"
@@ -2755,7 +2819,7 @@ msgstr ""
"A assinatura ser� marcada como n�o-export�vel.\n"
"\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
#, fuzzy
msgid ""
"\n"
@@ -2764,7 +2828,7 @@ msgstr ""
"A assinatura ser� marcada como n�o-export�vel.\n"
"\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
#, fuzzy
msgid ""
"\n"
@@ -2773,7 +2837,7 @@ msgstr ""
"A assinatura ser� marcada como n�o-export�vel.\n"
"\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
#, fuzzy
msgid ""
"\n"
@@ -2782,53 +2846,53 @@ msgstr ""
"A assinatura ser� marcada como n�o-export�vel.\n"
"\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
msgstr ""
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
msgstr ""
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
msgstr ""
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "Realmente assinar? "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "assinatura falhou: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "Esta chave n�o � protegida.\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
#, fuzzy
msgid "Secret parts of primary key are not available.\n"
msgstr "chave secreta n�o dispon�vel"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "A chave � protegida.\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Imposs�vel editar esta chave: %s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2836,7 +2900,7 @@ msgstr ""
"Digite a nova frase para esta chave secreta.\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2844,725 +2908,746 @@ msgstr ""
"Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
"\n"
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "Voc� realmente quer fazer isso? "
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "movendo a assinatura da chave para o local correto\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "sair deste menu"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "q"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "save"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "gravar e sair"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "help"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "mostra esta ajuda"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "mostra impress�o digital"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "list"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "lista chave e identificadores de usu�rios"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "seleciona ID de usu�rio N"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "key"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "seleciona chave secund�ria N"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "check"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "lista assinaturas"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "c"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "assina a chave"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "s"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "tsign"
msgstr "sign"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "make a trust signature"
msgstr "fazer uma assinatura separada"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "assina a chave localmente"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
#, fuzzy
msgid "nrsign"
msgstr "sign"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
#, fuzzy
msgid "sign the key non-revocably"
msgstr "assina a chave localmente"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
#, fuzzy
msgid "nrlsign"
msgstr "sign"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
#, fuzzy
msgid "sign the key locally and non-revocably"
msgstr "assina a chave localmente"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "adiciona um novo ID de usu�rio"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr ""
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
#, fuzzy
msgid "add a photo ID"
msgstr "adiciona um novo ID de usu�rio"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "remove ID de usu�rio"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr ""
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "adiciona nova chave secund�ria"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+#, fuzzy
+msgid "addcardkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "remove uma chave secund�ria"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
#, fuzzy
msgid "addrevoker"
msgstr "revkey"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
#, fuzzy
msgid "add a revocation key"
msgstr "adiciona nova chave secund�ria"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "remove assinaturas"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "muda a data de validade"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr ""
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr ""
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "alterna entre listagem de chave secreta e p�blica"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "t"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
#, fuzzy
msgid "list preferences (expert)"
msgstr "lista prefer�ncias"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
#, fuzzy
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
#, fuzzy
msgid "list preferences (verbose)"
msgstr "lista prefer�ncias"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
#, fuzzy
msgid "setpref"
msgstr "pref"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
#, fuzzy
msgid "set preference list"
msgstr "lista prefer�ncias"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
#, fuzzy
msgid "updpref"
msgstr "pref"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
#, fuzzy
msgid "updated preferences"
msgstr "lista prefer�ncias"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "keyserver"
msgstr "erro geral"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
msgid "set preferred keyserver URL"
msgstr ""
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "muda a frase secreta"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "muda os valores de confian�a"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "revoga assinaturas"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
#, fuzzy
msgid "revuid"
msgstr "revsig"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
#, fuzzy
msgid "revoke a user ID"
msgstr "adiciona um novo ID de usu�rio"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "revoga uma chave secund�ria"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "desativa uma chave"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "ativa uma chave"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr ""
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr ""
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, fuzzy, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "Chave secreta dispon�vel.\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "Comando> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "A chave secreta � necess�ria para fazer isto.\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr ""
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
#, fuzzy
msgid "Key is revoked."
msgstr "A chave � protegida.\n"
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "Realmente assinar todos os IDs de usu�rio? "
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugest�o: Selecione os IDs de usu�rio para assinar\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr ""
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "Voc� n�o pode remover o �ltimo ID de usu�rio!\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "Realmente remover este ID de usu�rio? "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+#, fuzzy
+msgid "Really move the primary key? "
+msgstr "Realmente remover este ID de usu�rio? "
+
+#: g10/keyedit.c:1598
+#, fuzzy
+msgid "You must select exactly one key.\n"
+msgstr "Voc� deve selecionar pelo menos uma chave.\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "Voc� deve selecionar pelo menos uma chave.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "Voc� realmente quer remover as chaves selecionadas? "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "Voc� realmente quer remover esta chave? "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
#, fuzzy
msgid "Really revoke all selected user IDs? "
msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
#, fuzzy
msgid "Really revoke this user ID? "
msgstr "Realmente remover este ID de usu�rio? "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "Voc� realmente quer revogar as chaves selecionadas? "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "Voc� realmente quer revogar esta chave? "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
#, fuzzy
msgid "Set preference list to:\n"
msgstr "lista prefer�ncias"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
#, fuzzy
msgid "Really update the preferences for the selected user IDs? "
msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
#, fuzzy
msgid "Really update the preferences? "
msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "Salvar altera��es? "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "Sair sem salvar? "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "atualiza��o falhou: %s\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "atualiza��o da chave secreta falhou: %s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "Chave n�o alterada, nenhuma atualiza��o � necess�ria.\n"
# help ou ajuda ???
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "Comando inv�lido (tente \"help\")\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr ""
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr ""
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keyedit.c:2219
#, fuzzy, c-format
msgid "This key may be revoked by %s key "
msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr ""
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "imposs�vel criar %s: %s\n"
-#: g10/keyedit.c:2084
-#, fuzzy, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
msgstr "revkey"
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
-msgstr "A chave expira em %s\n"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
+msgstr "expire"
+
+#: g10/keyedit.c:2246
#, fuzzy, c-format
-msgid "expires: %s"
-msgstr "A chave expira em %s\n"
+msgid "usage: %s"
+msgstr "trust"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, fuzzy, c-format
msgid "trust: %s"
msgstr "trust"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "Esta chave foi desativada"
-#: g10/keyedit.c:2146
-#, fuzzy, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! a subchave foi revogada: %s\n"
-
-#: g10/keyedit.c:2149
-#, fuzzy
-msgid "rev- faked revocation found\n"
-msgstr "rev- revoga��es de chaves incorreta\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
+#: g10/keyedit.c:2300
+msgid "card-no: "
msgstr ""
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-#, fuzzy
-msgid "revoked"
-msgstr "revkey"
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-#, fuzzy
-msgid "expired"
-msgstr "expire"
-
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr ""
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
msgstr ""
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-#, fuzzy
-msgid "[revoked] "
-msgstr "revkey"
-
-#: g10/keyedit.c:2274
-#, fuzzy
-msgid "[expired] "
-msgstr "expire"
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
msgstr ""
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
" of PGP to reject this key.\n"
msgstr ""
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
#, fuzzy
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Voc� tem certeza de que quer este tamanho de chave? "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr ""
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "Deletar esta assinatura v�lida? (s/N/q)"
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Deletar esta assinatura inv�lida? (s/N/q)"
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "Realmente remover esta auto-assinatura? (s/N)"
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d assinatura removida.\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d assinaturas removidas.\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "Nada removido.\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
" some versions of PGP to reject this key.\n"
msgstr ""
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
#, fuzzy
msgid "Enter the user ID of the designated revoker: "
msgstr "Digite o tamanho da chave"
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr "Voc� tem certeza de que quer este tamanho de chave? "
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "Por favor remova as sele��es das chaves secretas.\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "Modificando a data de validade para uma chave secund�ria.\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "Modificando a data de validade para uma chave prim�ria.\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
#, fuzzy
msgid "Please select exactly one user ID.\n"
msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
#, fuzzy, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "chave %08lX: auto-assinatura inv�lida\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+#, fuzzy
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "Voc� tem certeza de que quer este tamanho de chave? "
+
+#: g10/keyedit.c:3480
+#, fuzzy
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "Voc� tem certeza de que quer este tamanho de chave? "
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nenhum ID de usu�rio com �ndice %d\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Nenhuma chave secund�ria com �ndice %d\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "ID de usu�rio: \""
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3571,7 +3656,7 @@ msgstr ""
"\"\n"
"assinado com sua chave %08lX em %s\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3580,153 +3665,137 @@ msgstr ""
"\"\n"
"assinado com sua chave %08lX em %s\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, fuzzy, c-format
msgid "This signature expired on %s.\n"
msgstr "Esta chave n�o � protegida.\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
#, fuzzy
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Voc� tem certeza de que quer este tamanho de chave? "
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
#, fuzzy
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "Voc� assinou estes IDs de usu�rio:\n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid " signed by %s on %s%s%s\n"
msgstr " assinado por %08lX em %s\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid " revoked by %s on %s\n"
msgstr " revogado por %08lX em %s\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, fuzzy, c-format
msgid " signed by %s on %s%s\n"
msgstr " assinado por %08lX em %s\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr ""
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
#, fuzzy
msgid "Really create the revocation certificates? (y/N) "
msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "nenhuma chave secreta\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, fuzzy, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "A chave � protegida.\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
-#: g10/keylist.c:179
+#: g10/keylist.c:180
#, fuzzy
msgid "Critical signature policy: "
msgstr "assinatura %s de: %s\n"
-#: g10/keylist.c:181
+#: g10/keylist.c:182
#, fuzzy
msgid "Signature policy: "
msgstr "assinatura %s de: %s\n"
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
#, fuzzy
msgid "Critical signature notation: "
msgstr "Nota��o: "
-#: g10/keylist.c:288
+#: g10/keylist.c:289
#, fuzzy
msgid "Signature notation: "
msgstr "Nota��o: "
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr ""
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr ""
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr "A chave expira em %s\n"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, fuzzy, c-format
-msgid " [expires: %s]"
-msgstr "A chave expira em %s\n"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, fuzzy, c-format
-msgid " [revoked: %s]"
-msgstr "revkey"
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
#, fuzzy
msgid "Primary key fingerprint:"
msgstr "listar as chaves e as impress�es digitais"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
#, fuzzy
msgid " Subkey fingerprint:"
msgstr " Impress�o digital:"
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
#, fuzzy
msgid " Primary key fingerprint:"
msgstr " Impress�o digital:"
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
#, fuzzy
msgid " Subkey fingerprint:"
msgstr " Impress�o digital:"
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr " Impress�o digital:"
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3938,81 +4007,81 @@ msgstr "formato de assinatura antigo (PGP2.x)\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "imposs�vel desativar core dumps: %s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "Algoritmos experimentais n�o devem ser usados!\n"
-#: g10/misc.c:176
+#: g10/misc.c:177
#, fuzzy
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"este algoritmo de criptografia � depreciado; por favor use algum\n"
"algoritmo padr�o!\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr ""
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr ""
-#: g10/misc.c:491
+#: g10/misc.c:517
#, fuzzy, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "AVISO: `%s' � um arquivo vazio\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AVISO: `%s' � um arquivo vazio\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr ""
-#: g10/misc.c:508
+#: g10/misc.c:534
#, fuzzy
msgid "Uncompressed"
msgstr "n�o processado(s)"
-#: g10/misc.c:533
+#: g10/misc.c:559
#, fuzzy
msgid "uncompressed|none"
msgstr "n�o processado(s)"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr ""
-#: g10/misc.c:777
+#: g10/misc.c:826
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "lendo op��es de `%s'\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "destinat�rio padr�o desconhecido `%s'\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
@@ -4051,7 +4120,7 @@ msgstr "imposs�vel abrir `%s': %s\n"
msgid "communication problem with gpg-agent\n"
msgstr ""
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr ""
@@ -4091,24 +4160,24 @@ msgstr "linha muito longa\n"
msgid "invalid response from agent\n"
msgstr ""
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr ""
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr ""
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "imposs�vel pedir senha em modo n�o-interativo\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "Digite a frase secreta: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4118,22 +4187,22 @@ msgstr ""
"Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
"usu�rio: \""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (ID principal da chave %08lX)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "Repita a frase secreta: "
@@ -4348,25 +4417,36 @@ msgstr "AVISO: `%s' � um arquivo vazio\n"
msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
msgstr "imposs�vel criar %s: %s\n"
-#: g10/sign.c:794
+#: g10/sign.c:771 g10/sign.c:1008
#, fuzzy, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgid "writing to file `%s'\n"
+msgstr "escrevendo para `%s'\n"
+
+#: g10/sign.c:795
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr "assinando:"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "imposs�vel abrir arquivo: %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, fuzzy, c-format
msgid "%s encryption will be used\n"
msgstr "descriptografia falhou: %s\n"
@@ -4772,7 +4852,7 @@ msgstr ""
"imposs�vel evitar chave fraca para criptografia sim�trica;\n"
"%d tentativas!\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr ""
@@ -5081,17 +5161,17 @@ msgstr "Nenhuma ajuda dispon�vel"
msgid "No help available for `%s'"
msgstr "Nenhuma ajuda dispon�vel para `%s'"
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, fuzzy, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "erro na escrita do chaveiro `%s': %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, fuzzy, c-format
msgid "keyring `%s' created\n"
msgstr "%s: chaveiro criado\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, fuzzy, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
@@ -5134,8 +5214,7 @@ msgstr "listar as chaves e as assinaturas"
msgid "%s: keyring created\n"
msgstr "%s: chaveiro criado\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5144,31 +5223,36 @@ msgid ""
"Keeping the image close to 240x288 is a good size to use.\n"
msgstr ""
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr ""
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, fuzzy, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "imposs�vel abrir %s: %s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
#, fuzzy
msgid "Are you sure you want to use it (y/N)? "
msgstr "Voc� tem certeza de que quer este tamanho de chave? "
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, fuzzy, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr "%s: n�o � um banco de dados de confiabilidade\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
#, fuzzy
msgid "Is this photo correct (y/N/q)? "
msgstr "Est� correto (s/n)? "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
#, fuzzy
msgid "unable to display photo ID!\n"
msgstr "imposs�vel abrir %s: %s\n"
@@ -5188,43 +5272,49 @@ msgid ""
msgstr ""
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
-msgstr ""
+#, fuzzy
+msgid "this platform requires temporary files when calling external programs\n"
+msgstr "%s: erro lendo registro de vers�o: %s\n"
-#: g10/exec.c:432
-#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
-msgstr ""
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
+msgstr "imposs�vel abrir %s: %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:436
+#, fuzzy, c-format
+msgid "unable to execute shell `%s': %s\n"
+msgstr "imposs�vel abrir %s: %s\n"
+
+#: g10/exec.c:515
#, fuzzy, c-format
msgid "system error while calling external program: %s\n"
msgstr "%s: erro lendo registro de vers�o: %s\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr ""
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr ""
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr ""
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr ""
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr ""
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr ""
@@ -5380,6 +5470,49 @@ msgstr "erro lendo registro de diret�rio: %s\n"
msgid "read error: %s\n"
msgstr "erro de leitura: %s\n"
+#, fuzzy
+#~ msgid "revoked: %s"
+#~ msgstr "revkey"
+
+#, fuzzy
+#~ msgid "expired: %s"
+#~ msgstr "A chave expira em %s\n"
+
+#, fuzzy
+#~ msgid "expires: %s"
+#~ msgstr "A chave expira em %s\n"
+
+#, fuzzy
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "rev! a subchave foi revogada: %s\n"
+
+#, fuzzy
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "rev- revoga��es de chaves incorreta\n"
+
+#, fuzzy
+#~ msgid "[revoked] "
+#~ msgstr "revkey"
+
+#, fuzzy
+#~ msgid "[expired] "
+#~ msgstr "expire"
+
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr "A chave expira em %s\n"
+
+#, fuzzy
+#~ msgid " [expires: %s]"
+#~ msgstr "A chave expira em %s\n"
+
+#, fuzzy
+#~ msgid " [revoked: %s]"
+#~ msgstr "revkey"
+
+#~ msgid "can't create %s: %s\n"
+#~ msgstr "imposs�vel criar %s: %s\n"
+
#~ msgid "store only"
#~ msgstr "apenas armazenar"
diff --git a/po/ro.po b/po/ro.po
index d7e74becf..cf6c6d600 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
"PO-Revision-Date: 2004-06-17 12:00-0500\n"
"Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
"Language-Team: Romanian <[email protected]>\n"
@@ -51,7 +51,7 @@ msgstr "nu"
msgid "nN"
msgstr "nN"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "termin�"
@@ -284,6 +284,16 @@ msgstr "cheie secret� de nefolosit"
msgid "keyserver error"
msgstr "eroare server de chei"
+#: util/errors.c:108
+#, fuzzy
+msgid "canceled"
+msgstr "Renun��"
+
+#: util/errors.c:109
+#, fuzzy
+msgid "no card"
+msgstr "necifrat"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr ""
@@ -306,7 +316,7 @@ msgstr "a�i g�sit un bug ... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "nu a fost g�sit nici un modul de adunare a entropiei\n"
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "nu pot deschide `%s': %s\n"
@@ -340,7 +350,7 @@ msgstr "nu pot citi `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "not�: fi�ierul random_seed nu a fost actualizat\n"
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr "nu pot crea `%s': %s\n"
@@ -411,7 +421,7 @@ msgstr "nu pot genera un num�r prim cu mai pu�in de %d bi�i\n"
msgid "can't generate a prime with less than %d bits\n"
msgstr "nu pot genera un num�r prim cu mai pu�in de %d bi�i\n"
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -419,128 +429,128 @@ msgstr ""
"@Comenzi:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[fi�ier]|creaz� o semn�tur�"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "creaz� o semn�tur� deta�at�"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "cifreaz� datele"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "cifreaz� numai cu cifru simetric"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "decripteaz� datele (implicit)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "verific� o semn�tur�"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "enumer� chei"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "enumer� chei �i semn�turi"
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "verific� semn�turile cheii"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "enumer� chei �i amprente"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "enumer� chei secrete"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "genereaz� o nou� perechi de chei"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "�terge chei de pe inelul de chei public"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "�terge chei de pe inelul de chei secret"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "semneaz� o cheie"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "semneaz� o cheie local"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "semneaz� sau editeaz� o cheie"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "genereaz� un certificat de revocare"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "export� chei"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "export� chei pentru un server de chei"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "import� chei de la un server de chei"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "caut� pentru chei pe un server de chei"
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "actualizeaz� toate cheile de la un server de chei"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "import�/combin� chei"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "actualizeaz� baza de date de �ncredere"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -550,55 +560,51 @@ msgstr ""
"Op�iuni:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "creaz� ie�ire �n armur� ascii"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|NUME|cifrare pentru NUME"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr "folose�te acest id-utilizator pentru a semna sau decripta"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr "|N|seteaz� nivel de compresie N (0 deactiveaz�)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "folose�te modul text canonic"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "folose�te ca fi�ier ie�ire"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "locvace"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "nu face nici o schimbare"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "�ntreab� �nainte de a suprascrie"
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -606,7 +612,7 @@ msgstr ""
"@\n"
"(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -626,15 +632,15 @@ msgstr ""
" --list-keys [nume] arat� chei\n"
" --fingerprint [nume] arat� amprente\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Raporta�i bug-uri la <[email protected]>.\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -644,7 +650,7 @@ msgstr ""
"sign, check, encrypt sau decrypt\n"
"opera�iunea implicit� depinde de datele de intrare\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -652,488 +658,482 @@ msgstr ""
"\n"
"Algoritmuri suportate:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr "Pubkey: "
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr "Cifru: "
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr "Hash: "
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
msgid "Compression: "
msgstr "Compresie: "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "folosire: gpg [op�iuni] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "comenzi �n conflict\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "nu am g�sit nici un semn = �n defini�ia grupului \"%s\"\n"
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru %s \"%s\"\n"
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru %s \"%s\"\n"
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru %s \"%s\"\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru %s \"%s\"\n"
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru %s \"%s\"\n"
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru %s \"%s\"\n"
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru %s \"%s"
"\"\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr ""
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru %s \"%s"
"\"\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru %s \"%s"
"\"\n"
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru %s \"%s"
"\"\n"
-#: g10/g10.c:1205
+#: g10/g10.c:1210
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr ""
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru %s \"%s"
"\"\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru %s \"%s"
"\"\n"
-#: g10/g10.c:1334
-#, c-format
-msgid "unknown configuration item \"%s\"\n"
+#: g10/g10.c:1354
+#, fuzzy, c-format
+msgid "unknown configuration item `%s'\n"
msgstr "articol configurare necunoscut \"%s\"\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOT�: nici un fi�ier op�iuni implicit `%s'\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "fi�ier op�iuni `%s': %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "citesc op�iuni din `%s'\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
-#: g10/g10.c:1887
-#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+#: g10/g10.c:2021
+#, fuzzy, c-format
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr ""
"extensie cifru \"%s\" nu a fost �nc�rcat din cauza permisiunilor nesigure "
"(unsafe)\n"
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "%s nu este un set de carectere valid\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "nu am putut interpreta URI pentru serverul de chei\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: op�iuni export invalide\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "op�iuni export invalide\n"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: op�iuni import invalide\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
msgid "invalid import options\n"
msgstr "op�iuni import invalide\n"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: op�iuni export invalide\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
msgid "invalid export options\n"
msgstr "op�iuni export invalide\n"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: op�iuni import invalide\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "op�iuni import invalide\n"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: op�iuni export invalide\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "op�iuni export invalide\n"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nu pot seta cale-execu�ie ca %s\n"
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s nu este permis cu %s!\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nu are sens cu %s!\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"pute�i crea doar semn�turi deta�ate sau �n clar c�t� vreme sunte�i �n modul "
"--pgp2\n"
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
"nu pute�i semna �i cifra �n acela�i timp c�t� vreme sunte�i �n modul --pgp2\n"
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"trebuie s� folosi�i fi�iere (�i nu un pipe) c�nd lucra�i cu modul --pgp2 "
"activat.\n"
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "cifrarea unui mesaj �n modul --pgp2 necesit� un cifru IDEA\n"
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritm cifrare selectat este invalid\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "algoritm rezumat selectat este invalid\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "algoritm cifrare selectat este invalid\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
msgid "selected certification digest algorithm is invalid\n"
msgstr "algoritm rezumat certificare selectat este invalid\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth trebuie s� fie �n intervalul 1..255\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "default-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "min-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "mod S2K invalid; trebuie s� fie 0, 1 sau 3\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
msgid "invalid default preferences\n"
msgstr "preferin�e implicite invalide\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
msgid "invalid personal cipher preferences\n"
msgstr "preferin�e cifrare personale invalide\n"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
msgid "invalid personal digest preferences\n"
msgstr "preferin�e rezumat personale invalide\n"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
msgid "invalid personal compress preferences\n"
msgstr "preferin�e compresie personale invalide\n"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s nu merge �nc� cu %s!\n"
-#: g10/g10.c:2680
-#, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2797
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "nu pute�i folosi algoritmul de cifrare \"%s\" c�t� vreme �n modul %s\n"
-#: g10/g10.c:2685
-#, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2802
+#, fuzzy, c-format
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "nu pute�i folosi algorimul de rezumat \"%s\" c�t� vreme �n modul %s\n"
-#: g10/g10.c:2690
-#, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2807
+#, fuzzy, c-format
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr ""
"nu pute�i folosi algoritmul de compresie \"%s\" c�t� vreme �n modul %s\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"AVERTISMENT: destinatari (-r) furniza�i f�r� a folosi cifrare cu cheie "
"public�\n"
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [nume_fi�ier]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [nume_fi�ier]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [nume_fi�ier]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nume_fi�ier]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "nu pute�i folosi %s c�t� vreme �n modul %s\n"
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [nume_fi�ier]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nume_fi�ier]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nume_fi�ier]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "nu pute�i folosi %s c�t� vreme �n modul %s\n"
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nume_fi�ier]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [nume_fi�ier]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [nume_fi�ier]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key id-utilizator"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key id-utilizator"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrsign-key id-utilizator"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key id-utilizator"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-utilizator [comenzi]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "nu pot deschide %s: %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id-utilizator] [inel_chei]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "trimitere server de chei e�uat�: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "recep�ie server de chei e�uat�: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, c-format
msgid "key export failed: %s\n"
msgstr "export cheie e�uat: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "c�utare server de chei e�uat�: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "actualizare server de chei e�uat�: %s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "eliminarea armurii a e�uat: %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "punerea armurii a e�uat: %s\n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritm hash invalid `%s'\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[nume_fi�ier]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "nu pot deschide `%s'\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@ -1141,49 +1141,49 @@ msgstr ""
"un nume de nota�ie trebuie s� con�in� numai caractere imprimabile sau spa�ii "
"�i s� se termine cu un '='\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
msgid "a user notation name must contain the '@' character\n"
msgstr "un nume de nota�ie utilizator trebuie s� con�in� caracterul '@'\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr ""
"o valoare de nota�ie trebuie s� nu foloseasc� nici un caracter de control\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr "URL-ul politicii de certificare furnizat este invalid\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
-#: g10/g10.c:3747
+#: g10/g10.c:3863
#, fuzzy
-msgid "the given signature preferred keyserver URL is invalid\n"
+msgid "the given preferred keyserver URL is invalid\n"
msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "fii oarecum mai t�cut"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
msgid "take the keys from this keyring"
msgstr "ia cheile de pe acest inel de chei"
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
msgid "make timestamp conflicts only a warning"
msgstr "d� numai un avertisment la conflicte de timestamp"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr "|FD|scrie informa�ii de stare �n acest FD"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Folosire: gpgv [op�iuni] [fi�iere] (-h pentru ajutor)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1217,12 +1217,13 @@ msgid "invalid dash escaped line: "
msgstr "linie cu liniu�� escape invalid�: "
#: g10/armor.c:565
-msgid "unexpected armor:"
+#, fuzzy
+msgid "unexpected armor: "
msgstr "armur� nea�teptat�:"
-#: g10/armor.c:695 g10/armor.c:1276
-#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+#: g10/armor.c:695 g10/armor.c:1280
+#, fuzzy, c-format
+msgid "invalid radix64 character %02X skipped\n"
msgstr "caracter radix64 invalid %02x s�rit\n"
#: g10/armor.c:738
@@ -1233,33 +1234,34 @@ msgstr "eof prematur (nici un CRC)\n"
msgid "premature eof (in CRC)\n"
msgstr "eof prematur (�n CRC)\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "CRC anormal\n"
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "eroare CRC; %06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+#, fuzzy
+msgid "premature eof (in trailer)\n"
msgstr "eof prematur (�n Trailer)\n"
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "eroare linia de trailer\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "nici o dat� OpenPGP valid� g�sit�.\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "armur� invalid�: linie mai lung� de %d caractere\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1315,7 +1317,7 @@ msgstr " aka \""
msgid " aka \""
msgstr " aka \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1571,96 +1573,116 @@ msgstr "%s: s�rit�: cheia public� este deactivat�\n"
msgid "no valid addressees\n"
msgstr "nici un destinatar valid\n"
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "preferin�a %c%lu duplicat�\n"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "prea multe preferin�e `%c'\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
#, fuzzy
msgid "too many digest preferences\n"
msgstr "prea multe preferin�e `%c'\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
#, fuzzy
msgid "too many compression preferences\n"
msgstr "prea multe preferin�e `%c'\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "caracter invalid �n �ir preferin�e\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
msgid "writing direct signature\n"
msgstr "scriu semn�tur� direct�\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "scriu auto semn�tur�\n"
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "scriu semn�tur� legat� de cheie\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "lungime cheie invalid�; folosesc %u bi�i\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "lungime cheie rotunjit� la %u bi�i\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "Selecta�i ce fel de cheie dori�i:\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA �i ElGamal (implicit)\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (numai semn�tur�)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (numai cifrare)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (numai semn�tur�)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (numai cifrare)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (semn�tur� �i cifrare)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, fuzzy, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) RSA (numai semn�tur�)\n"
+
+#: g10/keygen.c:1224
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) RSA (semn�tur� �i cifrare)\n"
+
+#: g10/keygen.c:1226
+#, fuzzy, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) RSA (numai cifrare)\n"
+
+#: g10/keygen.c:1228
+#, fuzzy, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) RSA (semn�tur� �i cifrare)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "Selec�ia d-voastr�? "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "Selec�ie invalid�.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1673,29 +1695,29 @@ msgstr ""
" lungimea implicit� este 1024 bits\n"
" cea mai lung� cheie sugerat� este 2048 bits\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "Ce lungime de cheie dori�i? (1024) "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA permite numai chei de la 512 la 1024\n"
-#: g10/keygen.c:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr ""
"lungime cheie prea mic�; 1024 este cea mai mic� valoare permis� pentru RSA.\n"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "lungime cheie prea mic�; 768 este cea mai mic� valoare permis�.\n"
-#: g10/keygen.c:1255
+#: g10/keygen.c:1328
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "lungime cheie prea mare; %d este cea mai mare valoare permis�.\n"
-#: g10/keygen.c:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1703,11 +1725,11 @@ msgstr ""
"Lungimi pentru chei mai mari de 2048 nu sunt sugerate\n"
"deoarece calculele iau FOARTE MULT timp!\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "Sunte�i sigur(�) c� dori�i aceast� lungime de cheie?"
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1715,17 +1737,17 @@ msgstr ""
"Bine, dar �ine�i minte c� radia�ia monitorului �i tastaturii d-voastr� este "
"de asemenea vulnerabil� la atacuri!\n"
-#: g10/keygen.c:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Lungimea cheii necesar� este %u bi�i\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "rotunjit� prin adaos la %u bi�i\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1741,7 +1763,7 @@ msgstr ""
" <n>m = cheia expir� �n n luni\n"
" <n>y = cheia expir� �n n ani\n"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1757,29 +1779,29 @@ msgstr ""
" <n>m = semn�tura expir� �n n luni\n"
" <n>y = semn�tura expir� �n n ani\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "Cheia este valid� pentru? (0) "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr "Semn�tura este valid� pentru? (0) "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "valoare invalid�\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s nu expir� deloc\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr "%s expir� la %s\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1787,16 +1809,17 @@ msgstr ""
"Sistemul d-voastr� nu poate afi�a date dup� 2038.\n"
"Totu�i, acestea vor fi corect m�nuite p�n� �n 2106.\n"
-#: g10/keygen.c:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "Este aceasta corect (d/n)? "
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
+#, fuzzy
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
@@ -1808,44 +1831,44 @@ msgstr ""
" \"Popa Ioan (popic�) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "Nume real: "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "Caracter invalid �n nume\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr "Numele nu poate �ncepe cu o cifr�\n"
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr "Numele trebuie s� fie de cel pu�in 5 caractere\n"
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "Adres� de email: "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "Nu este o adres� de email valid�\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "Comentariu: "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "Caracter invalid �n comentariu\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Folosi�i setul de caractere `%s'\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1856,27 +1879,27 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "V� rug�m nu pune�i adresa de email �n numele real sau comentariu\n"
-#: g10/keygen.c:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoTt"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (T)Termin�? "
-#: g10/keygen.c:1542
+#: g10/keygen.c:1615
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termin�? "
-#: g10/keygen.c:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr "V� rug�m corecta�i mai �nt�i eroarea\n"
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1884,16 +1907,16 @@ msgstr ""
"Ave�i nevoie de o fraz�-parol� pentru a v� proteja cheia secret�.\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr "fraza-parol� nu a fost repetat� corect; mai �ncerca�i o dat�"
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1904,7 +1927,7 @@ msgstr ""
"O s� o fac oricum. Pute�i schimba fraza-parol� oric�nd, folosind acest\n"
"program cu op�iunea \"--edit-key\".\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1916,58 +1939,58 @@ msgstr ""
"�n timpul gener�rii numerelor prime; aceasta d� o �ans� generatorului de\n"
"numere aleatoare o �ans� mai bun� de a aduna destul� entropie.\n"
-#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr "�mi pare r�u, nu pot face acest lucru �n modul batch\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "Perechea de chei DSA va avea 1024 bi�i.\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "Generarea cheii a fost anulat�.\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr "scriu cheia public� �n `%s'\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "scriu cheia secret� �n `%s'\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "scriu cheia secret� �n `%s'\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nu am g�sit nici un inel de chei public de scris: %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "nu am g�sit nici un inel de chei secret de scris: %s\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "cheile secret� �i public� au fost create �i semnate.\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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"
@@ -1977,12 +2000,12 @@ msgstr ""
"s� folosi�i comanda \"--edit-key\" pentru a genera o cheie secundar� pentru\n"
"acest scop.\n"
-#: g10/keygen.c:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generarea cheii a e�uat: %s\n"
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1990,7 +2013,7 @@ msgstr ""
"cheia a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
"ceasul)\n"
-#: g10/keygen.c:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1998,14 +2021,43 @@ msgstr ""
"cheia a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
"ceasul)\n"
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "NOT�: crearea de subchei pentru chei v3 nu este conform OpenPGP\n"
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "Crea�i �ntr-adev�r? "
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "stergere keyblock a e�uat: %s\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "nu pot crea `%s': %s\n"
+
+#: g10/keygen.c:3248
+#, fuzzy, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "NOT�: cheia secret� %08lX a expirat la %s\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "--output nu merge pentru aceast� comand�\n"
@@ -2016,7 +2068,7 @@ msgstr "--output nu merge pentru aceast� comand�\n"
msgid "%s: can't open: %s\n"
msgstr "%s: nu pot deschide: %s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "eroare la crearea frazei-parol�: %s\n"
@@ -2045,6 +2097,11 @@ msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
msgstr ""
"�n modul --pgp2 pute�i cifra numai cu chei RSA de 2048 bi�i sau mai pu�in\n"
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "nu pot deschide %s: %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -2056,23 +2113,31 @@ msgid ""
msgstr ""
"nu pot folosi cifrul IDEA pentru pentru toate cheile pentru care cifra�i.\n"
-#: g10/encode.c:526 g10/encode.c:721
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#: g10/encode.c:526
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "for��nd cifrul simetric %s (%d) viola�i preferin�ele destinatarului\n"
-#: g10/encode.c:634 g10/sign.c:863
-#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+#: g10/encode.c:634 g10/sign.c:864
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
msgstr ""
"for��nd algoritmul de compresie %s (%d) viola�i preferin�ele destinatarului\n"
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "for��nd cifrul simetric %s (%d) viola�i preferin�ele destinatarului\n"
+
#: g10/encode.c:818
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrat pentru: \"%s\"\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "cheia `%s' nu a fost g�sit�: %s\n"
@@ -2105,8 +2170,9 @@ msgstr "AVERTISMENT: nimic exportat\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "prea multe intr�ri �n cache-ul pk - deactivat\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+#, fuzzy
+msgid "[User ID not found]"
msgstr "[ID utilizator nu a fost g�sit]"
#: g10/getkey.c:1614
@@ -2259,7 +2325,7 @@ msgstr "cheia %08lX: subcheia HPK corupt� a fost reparat�\n"
#: g10/import.c:722
#, fuzzy, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "cheia %08lX: am acceptat ID-ul utilizator ce nu e auto-semnat '%s'\n"
#: g10/import.c:728
@@ -2286,7 +2352,7 @@ msgstr "cheia %08lX: cheie nou� - s�rit�\n"
msgid "no writable keyring found: %s\n"
msgstr "n-am g�sit nici un inel de chei ce poate fi scris: %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "scriu �n `%s'\n"
@@ -2399,14 +2465,14 @@ msgstr "cheia %08lX: nici un ID utilizator pentru semn�tur�\n"
#: g10/import.c:1299
#, fuzzy, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"cheia %08lX: algoritm cu cheie public� nesuportat pentru ID-ul utilizator \"%"
"s\"\n"
#: g10/import.c:1301
#, fuzzy, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "cheia %08lX: auto-semn�tur� invalid� pentru ID-ul utilizator \"%s\"\n"
#: g10/import.c:1319
@@ -2446,7 +2512,7 @@ msgstr "cheia %08lX: am �ters multiple revoc�ri de subcheie\n"
#: g10/import.c:1439
#, fuzzy, c-format
-msgid "key %s: skipped user ID '%s'\n"
+msgid "key %s: skipped user ID \"%s\"\n"
msgstr "cheia %08lX: am s�rit ID-ul utilizator '"
#: g10/import.c:1460
@@ -2456,7 +2522,7 @@ msgstr "cheia %08lX: am s�rit subcheia\n"
#: g10/import.c:1487
#, fuzzy, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "cheia %08lX: semn�tura nu poate fi exportat� (clasa %02x) - s�rit�\n"
#: g10/import.c:1497
@@ -2490,114 +2556,114 @@ msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"AVERTISMENT: cheia %08lX poate fi revocat�: aduc revocarea cheii %08lX\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"AVERTISMENT: cheia %08lX poate fi revocat�: cheia de revocare %08lX nu este "
"prezent�.\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "cheia %08lX: am ad�ugat certificatul de revocare \"%s\"\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "cheia %08lX: am ad�ugat semn�tura de cheie direct�\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[revocare]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[auto-semn�tur�]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "1 semn�tur� incorect�\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d semn�turi incorecte\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "1 semn�tur� nu a fost verificat� din cauza unei chei lips�\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d semn�turi nu au fost verificate din cauza unor chei lips�\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "1 semn�tur� nu a fost verificat� din cauza unei erori\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d semn�turi nu au fost verificate din cauza unor erori\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "am g�sit 1 ID utilizator f�r� auto-semn�tur� valid�\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "am g�sit %d ID-uri utilizator f�r� auto-semn�turi valide\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, fuzzy, c-format
msgid " (%d) I trust marginally\n"
msgstr " %d = Am o �ncredere marginal�\n"
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, fuzzy, c-format
msgid " (%d) I trust fully\n"
msgstr " %d = Am toat� �ncrederea\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "ID utilizator \"%s\" a fost revocat."
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Sunte�i sigur(�) c� dori�i s� �terge�i permanent \"%s\"? (d/N)"
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr " Nu pot semna.\n"
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "ID utilizator \"%s\" este expirat."
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "ID-ul utilizator \"%s\" nu este auto-semnat."
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2606,11 +2672,11 @@ msgstr ""
"Auto-semn�tura pe \"%s\"\n"
"este o semn�tur� stil PGP 2.x.\n"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Dori�i s� o promova�i la o auto-semn�tur� OpenPGP? (d/N) "
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2619,12 +2685,12 @@ msgstr ""
"Semn�tura d-voastr� curent� pe \"%s\"\n"
"a expirat.\n"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Dori�i s� crea�i o nou� semn�tur� pentru a o �nlocui pe cea expirat�? (d/N) "
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2633,43 +2699,43 @@ msgstr ""
"Semn�tura d-voastr� curent� pe \"%s\"\n"
"semn�tur� local�.\n"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Dori�i s� o promova�i la o semn�tur� total exportabil�? (d/N) "
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" a fost deja semnat� local de cheia %08lX\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" a fost deja semnat� de cheia %08lX\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Dori�i s� o semna�i oricum din nou? (d/N) "
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nimic de semnat cu cheia %08lX\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "Aceast� cheie a expirat!"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Aceast� cheie va expira pe %s.\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Dori�i ca semn�tura d-voastr� s� expire �n acela�i timp? (D/n) "
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
@@ -2677,11 +2743,11 @@ msgstr ""
"Nu pute�i crea o semn�tur� OpenPGP pe o cheie PGP 2.x c�t� vreme sunte�i �n "
"modul --pgp2.\n"
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "Aceasta va face cheia de nefolosit �n PGP 2.x.\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2692,31 +2758,31 @@ msgstr ""
"�ntr-adev�r persoanei numite deasupra? Dac� nu �ti�i ce s� r�spunde�i,\n"
"introduce�i \"0\".\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Nu voi r�spunde.%s\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Nu am verificat deloc.%s\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Am f�cut ceva verific�ri superficiale.%s\n"
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Am f�cut verific�ri foarte atente.%s\n"
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr "Selec�ia dvs.? (introduce�i '?' pentru informa�ii suplimentare): "
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2724,7 +2790,7 @@ msgstr ""
"Sunte�i �ntr-adev�r sigur(�) c� dori�i s� semna�i\n"
"aceast� cheie cu cheia d-voastr�: \""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2732,7 +2798,7 @@ msgstr ""
"\n"
"Aceasta va fi o auto-semn�tur�.\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2740,7 +2806,7 @@ msgstr ""
"\n"
"AVERTISMENT: semn�tura nu va fi marcat� ca non-exportabil�.\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2748,7 +2814,7 @@ msgstr ""
"\n"
"AVERTISMENT: semn�tura nu va fi marcat� ca non-revocabil�.\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2756,7 +2822,7 @@ msgstr ""
"\n"
"Semn�tura va fi marcat� ca non-exportabil�.\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2764,7 +2830,7 @@ msgstr ""
"\n"
"Semn�tura va fi marcat� ca non-revocabil�.\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2772,7 +2838,7 @@ msgstr ""
"\n"
"Nu am verificat aceast� cheie deloc.\n"
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2780,7 +2846,7 @@ msgstr ""
"\n"
"Am verificat aceast� cheie superficial.\n"
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2788,34 +2854,34 @@ msgstr ""
"\n"
"Am verificat aceast� cheie foarte atent.\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "Dori�i cu adev�rat s� semna�i?"
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "semnarea a e�uat: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "Aceast� cheie nu este protejat�.\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr "P�r�ile secrete ale cheii primare nu sunt disponibile.\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "Cheia este protejat�.\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Nu pot edita aceast� cheie: %s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2823,7 +2889,7 @@ msgstr ""
"Introduce�i noua fraz�-parol� pentru acest� cheie secret�.\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2831,546 +2897,568 @@ msgstr ""
"Nu dori�i o fraz�-parol� - aceasta este probabil o idee *proast�*!\n"
"\n"
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "Dori�i �ntr-adev�r s� face�i acest lucru?"
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "mut o semn�tur� de cheie �n locul corect\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "ie�i din acest meniu"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "t"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "salveaz�"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "salveaz� �i termin�"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "ajutor"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "afi�eaz� acest mesaj"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "ampr"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "afi�eaz� amprenta"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "enumer�"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "enumer� chei �i ID-uri utilizator"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "selecteaz� ID utilizator N"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "cheie"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "selecteaz� cheie secundar� N"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "verific�"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "enumer� semn�turi"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "c"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "semneaz�"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "semneaz� cheia"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "s"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "tsign"
msgstr "semneaz�"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "make a trust signature"
msgstr "creaz� o semn�tur� deta�at�"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "semloc"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "semneaz� cheia local"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr "semirev"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr "semneaz� cheia irevocabil"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr "semlirev"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "sign the key locally and non-revocably"
msgstr "semneaz� cheia local �i irevocabil"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "depanare"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "adauid"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "adaug� un ID utilizator"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr "adapoza"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr "adaug� o poz� ID"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "steuid"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "�terge ID utilizator"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr "stepoza"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "adacheie"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "adaug� o cheie secundar�"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+#, fuzzy
+msgid "addcardkey"
+msgstr "adacheie"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "stecheie"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "�terge o cheie secundar�"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "addrevoker"
msgstr "adarev"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "add a revocation key"
msgstr "adaug� o cheie de revocare"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "stesem"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "�terge semn�turi"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "expira"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "schimb� data de expirare"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr "primar"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr "marcheaz� ID-ul utilizator ca primar"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "comuta"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "comut� �ntre listele de chei secrete �i publice"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "t"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr "enumer� preferin�ele (expert)"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr "afispref"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr "afi�eaz� preferin�ele (detaliat)"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr "seteaz� lista de preferin�e"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr "actpref"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr "preferin�e actualizate"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "keyserver"
msgstr "eroare server de chei"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "set preferred keyserver URL"
msgstr "nu am putut interpreta URI pentru serverul de chei\n"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "parola"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "schimb� fraza-parol�"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "incred"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "schimb� �ncrederea pentru proprietar"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "revsem"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "revoc� semn�turi"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revuid"
msgstr "revuid"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revoke a user ID"
msgstr "revoc� un ID utilizator"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "revcheie"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "revoc� o cheie secundar�"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "deact"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "deactiveaz� o cheie"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "activ"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "activeaz� o cheie"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr "afispoza"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr "arat� o poz� ID"
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "nu pot face acest lucru �n modul batch\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "eroare la citire keyblock secret `%s': %s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "Cheia secret� este disponibil�.\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "Comand�> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "Ave�i nevoie de cheia secret� pentru a face aceasta.\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr "V� rug�m folosi�i mai �nt�i comanda \"toggle\".\n"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
msgid "Key is revoked."
msgstr "Cheia este revocat�."
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "Semna�i �ntr-adev�r toate ID-urile utilizator? "
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugestie: Selecta�i ID-ul utilizator de semnat\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Aceast� comand� nu este permis� �n modul %s.\n"
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "Trebuie mai �nt�i s� selecta�i cel pu�in un ID utilizator.\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "Nu pute�i �terge ultimul ID utilizator!\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "�terge�i �ntr-adev�r toate ID-urile utilizator selectate? "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "�terge�i �ntr-adev�r acest ID utilizator? "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+#, fuzzy
+msgid "Really move the primary key? "
+msgstr "�terge�i �ntr-adev�r acest ID utilizator? "
+
+#: g10/keyedit.c:1598
+#, fuzzy
+msgid "You must select exactly one key.\n"
+msgstr "Trebuie s� selecta�i cel pu�in o cheie.\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "Trebuie s� selecta�i cel pu�in o cheie.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "Dori�i �ntr-adev�r s� �terge�i cheile selectate? "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "Dori�i �ntr-adev�r s� �terge�i aceast� cheie? "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
msgid "Really revoke all selected user IDs? "
msgstr "Dori�i �ntr-adev�r s� revoca�i toate ID-urile utilizator selectate? "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
msgid "Really revoke this user ID? "
msgstr "Dori�i �ntr-adev�r s� revoca�i acest ID utilizator? "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "Dori�i �ntr-adev�r s� revoca�i cheile selectate? "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "Dori�i �ntr-adev�r s� revoca�i aceast� cheie? "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
#, fuzzy
msgid "Set preference list to:\n"
msgstr "seteaz� lista de preferin�e"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr ""
"Dori�i �ntr-adev�r s� actualiza�i preferin�ele pentru ID-urile utilizator "
"selectate? "
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr "Dori�i �ntr-adev�r s� actualiza�i preferin�ele? "
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "Salva�i schimb�rile? "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "Termina�i f�r� a salva? "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "actualizarea a e�uat: %s\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "actualizarea secretului a e�uat: %s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "Cheia nu a fost schimbat� a�a c� nici o actualizare a fost necesar�.\n"
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "Comand� invalid� (�ncerca�i \"ajutor\")\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr "Rezumat: "
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr "Capabilit��i: "
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keyedit.c:2219
#, c-format
msgid "This key may be revoked by %s key "
msgstr "Aceast� cheie poate fi revocat� de cheia %s "
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr " (senzitiv)"
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "nu pot crea %s: %s\n"
-#: g10/keyedit.c:2084
-#, fuzzy, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
msgstr "[revocat�] "
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
-msgstr " [expir�: %s]"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expira"
+
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
+msgstr "expira"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2246
#, fuzzy, c-format
-msgid "expires: %s"
-msgstr " [expir�: %s]"
+msgid "usage: %s"
+msgstr " �ncredere: %c/%c"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, fuzzy, c-format
msgid "trust: %s"
msgstr " �ncredere: %c/%c"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "Aceast� cheie a fost deactivat�"
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! subcheia a fost revocat�: %s\n"
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
-msgstr "rev- a fost g�sit� o revocare falsificat�\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? probleme la verificare revoc�rii: %s\n"
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-#, fuzzy
-msgid "revoked"
-msgstr "[revocat�] "
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-#, fuzzy
-msgid "expired"
-msgstr "expira"
+#: g10/keyedit.c:2300
+msgid "card-no: "
+msgstr ""
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Nu exist� nici o preferin�� pentru un ID utilizator stil PGP 2.x.\n"
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3378,15 +3466,7 @@ msgstr ""
"V� rug�m observa�i c� validitatea cheii ar�tate nu este �n mod necesar\n"
"corect� dac� nu reporni�i programul.\n"
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-msgid "[revoked] "
-msgstr "[revocat�] "
-
-#: g10/keyedit.c:2274
-msgid "[expired] "
-msgstr "[expirat�] "
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@ -3395,7 +3475,7 @@ msgstr ""
" Aceast� comand� poate cauza ca un alt ID utilizator\n"
" s� devin� ID-ul utilizator primar presupus.\n"
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3404,45 +3484,45 @@ msgstr ""
"AVERTISMENT: Aceasta este o cheie stil PGP2. Ad�ugarea unei poze ID poate\n"
" cauza unele versiuni de PGP s� resping� aceast� cheie.\n"
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Sunte�i �nc� sigur(�) c� dori�i s� o ad�uga�i? (d/N) "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Nu pute�i ad�uga o poz� ID la o cheie stil PGP2.\n"
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "�terge�i aceast� semn�tur� bun�? (d/N/t)"
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "�terge�i aceast� semn�tur� invalid�? (d/N/t)"
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "�terge�i aceast� semn�tur� necunoscut�? (d/N/t)"
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "�terge�i �ntr-adev�r aceast� auto-semn�tur�? (d/N)"
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Am �ters %d semn�tur�.\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Am �ters %d semn�turi.\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "Nu am �ters nimic.\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3452,92 +3532,102 @@ msgstr ""
"revocator desemnat poate face ca unele versiuni de PGP s� resping� "
"cheia.\n"
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Nu pute�i ad�uga un revocator desemnat la o cheie stil PGP 2.x.\n"
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
msgid "Enter the user ID of the designated revoker: "
msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "nu pot desemna o cheie stil PGP 2.x ca un revocator desemnat\n"
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "nu pute�i desemna o cheie ca propriul s�u revocator desemnat\n"
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "AVERTISMENT: Aceast� cheie a fost revocat� revocatorul desemnat!\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"AVERTISMENT: desemnarea unei chei ca un revocator desemnat nu poate fi "
"anulat�!\n"
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr ""
"Sunte�i sigur(�) c� dori�i s� desemna�i aceast� cheie ca �i revocator "
"desemnat? (d/N): "
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "V� rug�m �terge�i selec�iile din cheile secrete.\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "V� rug�m selecta�i cel mult o cheie secundar�.\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "Schimbarea timpului de expirare pentru o cheie secundar�.\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "Schimbarea timpului de expirare pentru o cheie primar�.\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Nu pute�i schimba data de expirare a unei chei v3\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
msgid "Please select exactly one user ID.\n"
msgstr "V� rug�m selecta�i exact un ID utilizator.\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
-#, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "auto-semn�turi v3 s�rite pentru ID-ul utilizator \"%s\"\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+#, fuzzy
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i (d/N)? "
+
+#: g10/keyedit.c:3480
+#, fuzzy
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i (d/N)? "
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nici un ID utilizator cu indicele %d\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Nici o cheie secundar� cu indicele %d\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "ID utilizator: \""
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3546,7 +3636,7 @@ msgstr ""
"\"\n"
"semnat� cu cheie d-voastr� %08lX la %s\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3555,143 +3645,127 @@ msgstr ""
"\"\n"
"semnat� local cu cheie d-voastr� %08lX la %s\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Aceast� semn�tur� a expirat pe %s.\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Sunte�i �nc� sigur(�) c� dori�i s� o revoca�i? (d/N) "
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Crea�i un certificat de revocare pentru aceast� semn�tur�? (d/N) "
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "A�i semnat aceste ID-uri utilizator:\n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid " signed by %s on %s%s%s\n"
msgstr " semnat� de %08lX la %s%s%s\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid " revoked by %s on %s\n"
msgstr " revocat de %08lX la %s\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "Sunte�i pe cale s� revoca�i aceste semn�turi:\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, fuzzy, c-format
msgid " signed by %s on %s%s\n"
msgstr " semnat� de %08lX la %s%s\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr " (non-exportabil�)"
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
msgid "Really create the revocation certificates? (y/N) "
msgstr "Dori�i �ntr-adev�r s� crea�i certificatele de revocare? (d/N) "
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "nici o cheie secret�\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"AVERTISMENT: o semn�tur� ID utilizator este datat� %d secunde �n viitor\n"
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Afi�ez poza ID %s de dimensiune %ld pentru cheia 0x%08lX (uid %d)\n"
-#: g10/keylist.c:179
+#: g10/keylist.c:180
msgid "Critical signature policy: "
msgstr "Politic� de semn�turi critic�: "
-#: g10/keylist.c:181
+#: g10/keylist.c:182
msgid "Signature policy: "
msgstr "Politic� de semn�turi: "
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "AVERTISMENT: am g�sit date de notare invalide\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
msgid "Critical signature notation: "
msgstr "Notare semn�tur� critic�: "
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr "Notare semn�tur�: "
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr "ilizibil"
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr "Inel de chei"
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr " [expir�: %s]"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr " [expir�: %s]"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, fuzzy, c-format
-msgid " [revoked: %s]"
-msgstr "[revocat�] "
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
msgid "Primary key fingerprint:"
msgstr "Amprent� cheie primar�:"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
msgid " Subkey fingerprint:"
msgstr " Amprent� subcheie:"
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
msgid " Primary key fingerprint:"
msgstr " Amprent� cheie primar�:"
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
msgid " Subkey fingerprint:"
msgstr " Amprent� subcheie:"
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr " Amprent� cheie ="
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3897,82 +3971,82 @@ msgstr "semn�tur� de stil vechi (PGP 2.x)\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "pachet root invalid detectat �n proc_tree()\n"
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "nu pot deactiva generarea fi�ierelor core: %s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "Algoritme experimentale nu ar trebui folosite!\n"
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"acest algoritm de cifrare este �nvechit; v� rug�m folosi�i unul standard!\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr "plugin-ul cu cifrul IDEA nu este prezent\n"
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr ""
"vede�i http://www.gnupg.org/why-not-idea.html pentru informa�ii "
"suplimentare\n"
-#: g10/misc.c:491
+#: g10/misc.c:517
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: op�iune �nvechit� \"%s\"\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "v� rug�m folosi�i \"%s%s\" �n loc\n"
-#: g10/misc.c:508
+#: g10/misc.c:534
msgid "Uncompressed"
msgstr "Necompresat"
-#: g10/misc.c:533
+#: g10/misc.c:559
#, fuzzy
msgid "uncompressed|none"
msgstr "Necompresat"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "acest mesaj s-ar putea s� nu poat� fi folosit de %s\n"
-#: g10/misc.c:777
+#: g10/misc.c:826
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "citesc op�iuni din `%s'\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "destinatar implicit necunoscut `%s'\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "nu pot m�nui algoritmul cu cheie public� %d\n"
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"AVERTISMENT: cheie de sesiune cifrat� simetric poten�ial nesigur� "
"(insecure)\n"
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpachetul de tip %d are bitul critic setat\n"
@@ -4011,7 +4085,7 @@ msgstr "nu m� pot conecta la `%s': %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "probleme de comunicare cu gpg-agent\n"
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr "problem� cu agentul - deactivez folosirea agentului\n"
@@ -4048,24 +4122,24 @@ msgstr "fraz�-parol� prea lung�\n"
msgid "invalid response from agent\n"
msgstr "r�spuns invalid de la agent\n"
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "anulat� de utilizator\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "nu pot cere parola �n modul batch\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "Introduce�i fraza-parol�: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4075,22 +4149,22 @@ msgstr ""
"Ave�i nevoie de o fraz�-parol� pentru a descuia cheia\n"
"secret� pentru utilizator: \""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "cheia %2$s de %1$u-bi�i, ID %3$08lX, creat� %4$s"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (ID cheie principal� %08lX)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "Repeta�i fraza-parol�: "
@@ -4315,26 +4389,37 @@ msgstr "AVERTISMENT: `%s' este un fi�ier gol\n"
msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "pute�i semna-data�at cu chei stil PGP 2.x numai �n modul --pgp2\n"
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
-msgstr "nu pot crea %s: %s\n"
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
+msgstr "nu pot crea `%s': %s\n"
-#: g10/sign.c:794
-#, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+#: g10/sign.c:771 g10/sign.c:1008
+#, fuzzy, c-format
+msgid "writing to file `%s'\n"
+msgstr "scriu �n `%s'\n"
+
+#: g10/sign.c:795
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"for�area algoritmului rezumat %s (%d) violeaz� preferin�ele destinatarului\n"
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr "semnare:"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "nu pot deschide fi�ierul: %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "pute�i semna-�n-clar cu chei stil PGP 2.x �n modul --pgp2\n"
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr "va fi folosit� cifrarea %s\n"
@@ -4729,7 +4814,7 @@ msgstr "cheie slab� creat� - re�ncerc\n"
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr "nu pot evita cheie slab� pentru cifru simetric; am �ncercat %d ori!\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA necesit� folosirea unui algoritm cu hash de 160 bi�i\n"
@@ -5103,17 +5188,17 @@ msgstr "Nici un ajutor disponibil"
msgid "No help available for `%s'"
msgstr "Nici un disponibil disponibil pentru `%s'"
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "eroare la crearea inelului de chei `%s': %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr "inelul de chei `%s' creat\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "am e�uat s� reconstruiesc cache-ul inelului de chei: %s\n"
@@ -5156,8 +5241,7 @@ msgstr "%lu chei verificate (%lu semn�turi)\n"
msgid "%s: keyring created\n"
msgstr "%s: inelul de chei creat\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5173,29 +5257,34 @@ msgstr ""
"foarte larg�!\n"
"�ncerca�i s� folosi�i o imagine de aproximativ 240x288 pixeli.\n"
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr "Introduce�i nume-fi�ier JPEG pentru poz� ID: "
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "Nu pot deschide poza \"%s\": %s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
msgid "Are you sure you want to use it (y/N)? "
msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i (d/N)? "
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr "\"%s\" nu este un fi�ier JPEG\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Is this photo correct (y/N/q)? "
msgstr "Este aceast� poz� corect� (d/N/t)? "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
msgid "unable to display photo ID!\n"
msgstr "nu pot afi�a poza ID!\n"
@@ -5216,45 +5305,51 @@ msgstr ""
"pentru permisiunile fi�ierului\n"
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
+#, fuzzy
+msgid "this platform requires temporary files when calling external programs\n"
msgstr ""
"aceast� platform� necesit� fi�iere temporare c�nd sunt chemate programe "
"externe\n"
-#: g10/exec.c:432
-#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
msgstr "nu pot executa %s \"%s\": %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:436
+#, fuzzy, c-format
+msgid "unable to execute shell `%s': %s\n"
+msgstr "nu pot executa %s \"%s\": %s\n"
+
+#: g10/exec.c:515
#, c-format
msgid "system error while calling external program: %s\n"
msgstr "eroare de sistem la chemarea programului extern: %s\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr "ie�ire nenatural� a programului extern\n"
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr "nu pot executa programul extern\n"
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr "nu pot citi r�spunsul programului extern: %s\n"
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr "AVERTISMENT: nu pot �terge fi�ierul temporar (%s) `%s': %s\n"
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "AVERTISMENT: nu pot �terge directorul temporar `%s': %s\n"
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr "niciodat� "
@@ -5409,6 +5504,47 @@ msgstr "eroare g�sire �nregistrare �ncredere: %s\n"
msgid "read error: %s\n"
msgstr "eroare citire: %s\n"
+#, fuzzy
+#~ msgid "revoked: %s"
+#~ msgstr "[revocat�] "
+
+#, fuzzy
+#~ msgid "expired: %s"
+#~ msgstr " [expir�: %s]"
+
+#, fuzzy
+#~ msgid "expires: %s"
+#~ msgstr " [expir�: %s]"
+
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "rev! subcheia a fost revocat�: %s\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "rev- a fost g�sit� o revocare falsificat�\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "rev? probleme la verificare revoc�rii: %s\n"
+
+#~ msgid "[revoked] "
+#~ msgstr "[revocat�] "
+
+#~ msgid "[expired] "
+#~ msgstr "[expirat�] "
+
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr " [expir�: %s]"
+
+#~ msgid " [expires: %s]"
+#~ msgstr " [expir�: %s]"
+
+#, fuzzy
+#~ msgid " [revoked: %s]"
+#~ msgstr "[revocat�] "
+
+#~ msgid "can't create %s: %s\n"
+#~ msgstr "nu pot crea %s: %s\n"
+
#~ msgid ""
#~ "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n"
#~ msgstr ""
diff --git a/po/ru.po b/po/ru.po
index ffec3d8eb..0209e5395 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GnuPG 1.2.4\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
"PO-Revision-Date: 2003-12-23 19:24+0100\n"
"Last-Translator: Maxim Britov <[email protected]>\n"
"Language-Team: Russian <[email protected]>\n"
@@ -49,7 +49,7 @@ msgstr "нет"
msgid "nN"
msgstr "nN"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "Выход"
@@ -282,6 +282,16 @@ msgstr "неприменимый закрытый ключ"
msgid "keyserver error"
msgstr "ошибка сервера ключей"
+#: util/errors.c:108
+#, fuzzy
+msgid "canceled"
+msgstr "Отмена"
+
+#: util/errors.c:109
+#, fuzzy
+msgid "no card"
+msgstr "не зашифровано"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr ""
@@ -304,7 +314,7 @@ msgstr "Вы нашли ошибку ... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "не найден модуль накопления энтропии\n"
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "не могу открыть `%s': %s\n"
@@ -336,7 +346,7 @@ msgstr "не могу прочитать `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "замечание: файл random_seed не обновлен\n"
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr "не могу создать `%s': %s\n"
@@ -406,7 +416,7 @@ msgstr "не могу создать главное число меньшее %d
msgid "can't generate a prime with less than %d bits\n"
msgstr "не могу создать главное число меньшее %d бит\n"
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -414,128 +424,128 @@ msgstr ""
"@Команды:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[file]|создать подпись к файлу"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[file]|создать прозрачную подпись к файлу"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "создать отделенную (detached) подпись"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "зашифровать данные"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "зашифровать только симметричным шифром"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "расшифровать данные (по умолчанию)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "проверить подпись"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "вывести список ключей"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "вывести список ключей и подписей"
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "проверка подписей на ключе"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "вывести список ключей и их отпечатков"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "вывести список секретных ключей"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "создать новую пару ключей"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "удалить ключи из таблицы открытых ключей"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "удалить ключи из таблицы закрытых ключей"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "подписать ключ"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "подписать ключ локально"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "подписать или редактировать ключ"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "создать сертификат отзыва"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "экспортировать ключи"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "экспортировать ключи на сервер ключей"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "импортировать ключи с сервера ключей"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "искать ключи на сервере ключей"
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "обновить все ключи с сервера ключей"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "импортировать/объединить ключи"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "обновить таблицу доверий"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|algo [files]|вывести хэши файлов"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -545,55 +555,51 @@ msgstr ""
"Параметры:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "вывод в ASCII формате"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|NAME|зашифровать для получателя NAME"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr "использовать данный User ID для подписывания и расшифрования"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr "|N|установить уровень сжатия N (по умолчанию - 0)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "использовать канонический текстовый режим"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "вывод в указанный файл"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "подробно"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "не делать никаких изменений"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "спросить перед перезаписью"
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -601,7 +607,7 @@ msgstr ""
"@\n"
"(См. документацию для более полного ознакомления с командами и параметрами)\n"
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -621,18 +627,18 @@ msgstr ""
" --list-keys [имена] показать ключи\n"
" --fingerprint [имена] показать отпечатки (fingerprints)\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"О найденных ошибка сообщайте <[email protected]>.\n"
"Подпишитесь на русскоязычную группу рассылки GnuPG-ru отправив письмо по "
"адресу [email protected] с темой subscribe.\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -642,7 +648,7 @@ msgstr ""
"подписать и проверить, зашифровать или расшифровать\n"
"операция по умолчанию зависит от входных данных\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -650,470 +656,464 @@ msgstr ""
"\n"
"Поддерживаются следующие алгоритмы:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr "С открытым ключом: "
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr "Симметричные шифры: "
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr "Хэш-функции: "
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
msgid "Compression: "
msgstr "Алгоритмы сжатия: "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "использование: gpg [опции] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "несовместимые команды\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "no = sign found in group definition \"%s\"\n"
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "ВНИМАНИЕ: небезопасный владелец у файла %s \"%s\"\n"
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "ВНИМАНИЕ: небезопасный владелец у файла %s \"%s\"\n"
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "ВНИМАНИЕ: небезопасный владелец у файла %s \"%s\"\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "ВНИМАНИЕ: небезопасные права доступа к %s \"%s\"\n"
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "ВНИМАНИЕ: небезопасные права доступа к %s \"%s\"\n"
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "ВНИМАНИЕ: небезопасные права доступа к %s \"%s\"\n"
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "ВНИМАНИЕ: небезопасные установки владельца каталога %s \"%s\"\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "ВНИМАНИЕ: небезопасные установки владельца каталога %s \"%s\"\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "ВНИМАНИЕ: небезопасные установки владельца каталога %s \"%s\"\n"
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "ВНИМАНИЕ: небезопасные права доступа к каталогу %s \"%s\"\n"
-#: g10/g10.c:1205
+#: g10/g10.c:1210
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "ВНИМАНИЕ: небезопасные права доступа к каталогу %s \"%s\"\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "ВНИМАНИЕ: небезопасные права доступа к каталогу %s \"%s\"\n"
-#: g10/g10.c:1334
-#, c-format
-msgid "unknown configuration item \"%s\"\n"
+#: g10/g10.c:1354
+#, fuzzy, c-format
+msgid "unknown configuration item `%s'\n"
msgstr "файл конфигурации содержит неизвестный параметр \"%s\"\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "ЗАМЕЧАНИЕ: файл настроек старого формата `%s' проигнорирован\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "ЗАМЕЧАНИЕ: файл настроек `%s' не обнаружен\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "файл настроек `%s': %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "настройки взяты из файла `%s'\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "ЗАМЕЧАНИЕ: %s не предназначен для обычного использования!\n"
-#: g10/g10.c:1887
-#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+#: g10/g10.c:2021
+#, fuzzy, c-format
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr ""
"расширение шифра \"%s\" не загружено вследствие небезопасных прав доступа\n"
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "%s недопустимая таблица символов\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "не могу проанализировать URI сервера ключей\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: недопустимые параметры экспорта\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "недопустимые параметры экспорта\n"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: недопустимые параметры импорта\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
msgid "invalid import options\n"
msgstr "недопустимые параметры импорта\n"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: недопустимые параметры экспорта\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
msgid "invalid export options\n"
msgstr "недопустимые параметры экспорта\n"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: недопустимые параметры импорта\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "недопустимые параметры импорта\n"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: недопустимые параметры экспорта\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "недопустимые параметры экспорта\n"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "не могу определить путь запуска для %s\n"
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти!\n"
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ВНИМАНИЕ: %s заменит %s\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s недопустимо использовать с %s!\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s не имеет смысла совместно с %s!\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"Можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "Вы не можете одновременно подписать и зашифровать в режиме --pgp2\n"
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "Вы должны использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "для зашифровки сообщения в режиме --pgp2 требуется шифр IDEA\n"
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "выбран неверный алгоритм шифрования\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "выбрана неверная хэш-функция\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "выбран неверный алгоритм шифрования\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
msgid "selected certification digest algorithm is invalid\n"
msgstr "выбрана неверная хэш-функция для сертификации\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed должен быть больше 0\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed должен быть больше 1\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "недопустимый default-cert-level; должен быть 0, 1, 2 или 3\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "недопустимый min-cert-level; должен быть 1, 2 или 3\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "ЗАМЕЧАНИЕ: простой (0) режим S2K строго не рекомендуется\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
msgid "invalid default preferences\n"
msgstr "недопустимые предпочтения по умолчанию\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
msgid "invalid personal cipher preferences\n"
msgstr "недопустимые персональные предпочтения шифра\n"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
msgid "invalid personal digest preferences\n"
msgstr "недопустимые персональные предпочтения хэш-функции\n"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
msgid "invalid personal compress preferences\n"
msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s не работает пока с %s\n"
-#: g10/g10.c:2680
-#, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2797
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "Вы не можете использовать шифрование \"%s\" в режиме %s\n"
-#: g10/g10.c:2685
-#, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2802
+#, fuzzy, c-format
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "Вы не можете использовать хэш-функцию \"%s\" в режиме %s\n"
-#: g10/g10.c:2690
-#, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2807
+#, fuzzy, c-format
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "Вы не можете использовать сжатие \"%s\" в режиме %s\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "сбой инициализации таблицы доверий: %s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
"ключом\n"
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [filename]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [filename]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [filename]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [filename]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "Вы не можете использовать %s в режиме %s\n"
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [filename]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filename]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [filename]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "Вы не можете использовать %s в режиме %s\n"
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filename]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [filename]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [filename]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrsign-key user-id"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key user-id"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [commands]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "не могу открыть %s: %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [user-id] [keyring]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "неудача при отправке на сервер ключей: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "неудача при получении с сервера ключей: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, c-format
msgid "key export failed: %s\n"
msgstr "не удалось экспортировать ключ: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "неудача при поиске на сервере ключей: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "неудача при обновлении на сервере ключей: %s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "ошибка преобразования из ASCII формата: %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "ошибка преобразования в ASCII формат: %s\n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "недопустимая хэш-функция `%s'\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[filename]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "Набирайте Ваше сообщение ...\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "не могу открыть `%s'\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@ -1121,49 +1121,49 @@ msgstr ""
"имя примечания должно содержать только печатные символы или пробелы,и "
"заканчиваться знаком '='\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
msgid "a user notation name must contain the '@' character\n"
msgstr "имя примечания должно содержать '@' символ\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "значение примечания не должно содержать управляющие символы\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr "заданный URL правил сертификации неверен\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr "заданный URL правил подписи неверен\n"
-#: g10/g10.c:3747
+#: g10/g10.c:3863
#, fuzzy
-msgid "the given signature preferred keyserver URL is invalid\n"
+msgid "the given preferred keyserver URL is invalid\n"
msgstr "заданный URL правил подписи неверен\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "уменьшить количество выводимой информации"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
msgid "take the keys from this keyring"
msgstr "используются ключи из данной таблицы ключей"
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
msgid "make timestamp conflicts only a warning"
msgstr ""
"при несоответствии отметки времени ограничиваться только предупреждением"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr "|FD|выводить инфромацию в файл с дескриптором FD"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Использовать: gpgv [параметры] [файлы] (-h для подсказки)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1197,12 +1197,13 @@ msgid "invalid dash escaped line: "
msgstr "неправильный отступ из минусов: "
#: g10/armor.c:565
-msgid "unexpected armor:"
+#, fuzzy
+msgid "unexpected armor: "
msgstr "неожиданный формат ASCII:"
-#: g10/armor.c:695 g10/armor.c:1276
-#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+#: g10/armor.c:695 g10/armor.c:1280
+#, fuzzy, c-format
+msgid "invalid radix64 character %02X skipped\n"
msgstr "недопустимый символ radix64 %02x пропущен\n"
#: g10/armor.c:738
@@ -1213,33 +1214,34 @@ msgstr "преждевременный конец файла (eof) (нет CRC)\
msgid "premature eof (in CRC)\n"
msgstr "преждевременный конец файла (eof) (в CRC)\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "плохо сформированный CRC\n"
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "ошибка контрольной суммы CRC; %06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+#, fuzzy
+msgid "premature eof (in trailer)\n"
msgstr "преждевременный конец файла (eof) (в дополнении)\n"
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "ошибка в строке дополнения\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "не найдено данных формата OpenPGP.\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "неправильный ASCII формат: строка длиннее %d символов\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1295,7 +1297,7 @@ msgstr " aka \""
msgid " aka \""
msgstr " aka \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1542,96 +1544,116 @@ msgstr "%s: пропущено: открытый ключ отключен\n"
msgid "no valid addressees\n"
msgstr "нет действительных адресов\n"
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "предпочтения %c%lu дублируются\n"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "слишком много `%c' предпочтений\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
#, fuzzy
msgid "too many digest preferences\n"
msgstr "слишком много `%c' предпочтений\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
#, fuzzy
msgid "too many compression preferences\n"
msgstr "слишком много `%c' предпочтений\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "недопустимый символ в строке предпочтений\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
msgid "writing direct signature\n"
msgstr "writing direct signature\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "сохраняем самоподпись\n"
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "сохраняем объединяющую подпись\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "неверный размер ключа; используется %u бит\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "размер ключа приведен к %u битам\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "Выберите тип ключа:\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA и ElGamal (по умолчанию)\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (только для подписи)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (только для шифрования)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (только для подписи)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (только для шифрования)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (подпись и шифрование)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, fuzzy, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) RSA (только для подписи)\n"
+
+#: g10/keygen.c:1224
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) RSA (подпись и шифрование)\n"
+
+#: g10/keygen.c:1226
+#, fuzzy, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) RSA (только для шифрования)\n"
+
+#: g10/keygen.c:1228
+#, fuzzy, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) RSA (подпись и шифрование)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "Ваш выбор (?-подробнее)? "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "Неправильный выбор.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1644,28 +1666,28 @@ msgstr ""
" размер ключа по умолчанию 1024 бит\n"
" максимально рекомендуемый размер 2048 бит\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "Какой размер ключа Вы выбрали? (1024) "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA поддерживает размер ключа от 512 до 1024\n"
-#: g10/keygen.c:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "слишком малый размер ключа; 1024 - минимальный размер ключа RSA.\n"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "слишком малый размер ключа; 768 - минимально допустимый размер.\n"
-#: g10/keygen.c:1255
+#: g10/keygen.c:1328
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "слишком большой размер ключа; %d - максимально допустимый размер.\n"
-#: g10/keygen.c:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1673,11 +1695,11 @@ msgstr ""
"Размер ключа больше 2048 не рекомендуется, т.к.\n"
"вычисления с ним займут МНОГО времени!\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "Вы действительно хотите иметь ключ такого размера? "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1685,17 +1707,17 @@ msgstr ""
"Отлично, только помните, что излучение монитора и клавиатуры\n"
"также могут быть перехвачены!\n"
-#: g10/keygen.c:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Запрашиваемый размер ключа %u бит\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "приведен к размеру %u бит\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1711,7 +1733,7 @@ msgstr ""
" <n>m = срок действия n месяцев\n"
" <n>y = срок действия n лет\n"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1727,29 +1749,29 @@ msgstr ""
" <n>m = срок действия подписи n месяцев\n"
" <n>y = срок действия подписи n лет\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "Ключ действителен до? (0) "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr "Подпись действительна до? (0) "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "неправильное значение\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s не имеет ограничения срока действия\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr "%s действителен до: %s\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1757,16 +1779,17 @@ msgstr ""
"Ваша система не может корректно отображать даты после 2038.\n"
"Однако, корректно обрабатываются даты до 2106.\n"
-#: g10/keygen.c:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "Все верно? (y/n) "
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
+#, fuzzy
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
@@ -1776,44 +1799,44 @@ msgstr ""
" \"Baba Yaga (pensioner) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "Ваше настоящее имя: "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "Недопустимый символ в Имени\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr "Имя не должно начинаться с цифры\n"
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr "Имя не должно быть короче 5 символов\n"
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "Email-адрес: "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "Неправильный e-mail адрес\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "Комментарий: "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "Недопустимый символ в комментарии\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Используется таблица символов: `%s'.\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1824,28 +1847,28 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Не вставляйте email-адрес в имя пользователя и комментарий\n"
-#: g10/keygen.c:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (Q)Выход? "
-#: g10/keygen.c:1542
+#: g10/keygen.c:1615
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (O)Принять/(Q)Выход? "
-#: g10/keygen.c:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr "Сначала исправьте ошибку\n"
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1853,16 +1876,16 @@ msgstr ""
"Для защиты секретного ключа необходим пароль.\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr "повторный ввод пароля некорректен; попробуйте еще раз"
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1874,7 +1897,7 @@ msgstr ""
"запустив данную программу с ключом \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1886,58 +1909,58 @@ msgstr ""
"обращения к дискам) в процессе генерации; это даст генератору\n"
"случайных чисел возможность получить лучшую энтропию.\n"
-#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr "извините, но это невозможно выполнить в пакетном режиме\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "Пара ключей DSA будет иметь длину 1024 бита.\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "Создание ключа прервано.\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr "сохранение открытого ключа в `%s'\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "сохранение секретного ключа в `%s'\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "сохранение секретного ключа в `%s'\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "нет доступной для записи таблицы закрытых ключей: %s\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "ошибка записи таблицы открытых ключей `%s': %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "ошибка записи таблицы секретных ключей `%s': %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "открытый и закрытый ключи созданы и подписаны.\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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"
@@ -1946,34 +1969,63 @@ msgstr ""
"можете\n"
"воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
-#: g10/keygen.c:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Сбой при создании ключа: %s\n"
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
-#: g10/keygen.c:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
"ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"ПРЕДУПРЕЖДАЮ: создание подключа для ключей v3 не совместимо с OpenPGP\n"
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "Действительно создать? "
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "сбой при удалении блока ключа: %s\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "не могу создать `%s': %s\n"
+
+#: g10/keygen.c:3248
+#, fuzzy, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "ЗАМЕТЬТЕ: секретный ключ %08lX просрочен с %s\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "--output не работает для данной команды\n"
@@ -1984,7 +2036,7 @@ msgstr "--output не работает для данной команды\n"
msgid "%s: can't open: %s\n"
msgstr "%s: не могу открыть: %s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "ошибка при создании ключевой фразы (пароля): %s\n"
@@ -2012,6 +2064,11 @@ msgstr "%s: ВНИМАНИЕ: пустой файл\n"
msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
msgstr "в режиме --pgp2 ключ RSA для ширования должен быть не более 2048 бит\n"
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "не могу открыть %s: %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -2022,22 +2079,30 @@ msgid ""
"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
msgstr "не могу использовать шифр IDEA для всех ключей.\n"
-#: g10/encode.c:526 g10/encode.c:721
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#: g10/encode.c:526
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "использование шифра %s (%d) нарушает предпочтения получателя\n"
-#: g10/encode.c:634 g10/sign.c:863
-#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+#: g10/encode.c:634 g10/sign.c:864
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
msgstr "сжатие алгоритмом %s (%d) нарушает предпочтения получателя\n"
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "использование шифра %s (%d) нарушает предпочтения получателя\n"
+
#: g10/encode.c:818
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s зашифровано для: \"%s\"\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "ключ `%s' не найден: %s\n"
@@ -2070,8 +2135,9 @@ msgstr "ВНИМАНИЕ: нечего экспортировать\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "слишком много входов в pk кэше - отключено\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+#, fuzzy
+msgid "[User ID not found]"
msgstr "[User ID Не найден]"
#: g10/getkey.c:1614
@@ -2225,7 +2291,7 @@ msgstr "ключ %08lX: HKP повреждение подключа исправ
#: g10/import.c:722
#, fuzzy, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "ключ %08lX: принят ключ без самоподписи '%s'\n"
#: g10/import.c:728
@@ -2252,7 +2318,7 @@ msgstr "ключ %08lX: новый ключ - пропущен\n"
msgid "no writable keyring found: %s\n"
msgstr "нет доступной для записи таблицы ключей: %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "сохраняю в `%s'\n"
@@ -2365,12 +2431,12 @@ msgstr "ключ %08lX: нет User ID для подписи\n"
#: g10/import.c:1299
#, fuzzy, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "ключ %08lX: неподдерживаемый алгоритм с открытым ключом у \"%s\" \n"
#: g10/import.c:1301
#, fuzzy, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "ключ %08lX: неправильная самоподпись на \"%s\"\n"
#: g10/import.c:1319
@@ -2410,7 +2476,7 @@ msgstr "ключ %08lX: удален многократный отзыв под�
#: g10/import.c:1439
#, fuzzy, c-format
-msgid "key %s: skipped user ID '%s'\n"
+msgid "key %s: skipped user ID \"%s\"\n"
msgstr "ключ %08lX: пропущен User ID '"
#: g10/import.c:1460
@@ -2420,7 +2486,7 @@ msgstr "ключ %08lX: пропущен подключ\n"
#: g10/import.c:1487
#, fuzzy, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "ключ %08lX: не экспортируемая подпись (класс %02x) - пропущена\n"
#: g10/import.c:1497
@@ -2453,112 +2519,112 @@ msgstr "ключ %08lX: обнаружено дублирование User ID -
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "ВНИМАНИЕ: ключ %08lX возможно отозван: запрашиваю ключ отзыва %08lX\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "ВНИМАНИЕ: ключ %08lX возможно отозван: ключ отзыва %08lX не получен.\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "ключ %08lX: \"%s\" добавлен сертификат отзыва\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "ключ %08lX: direct key signature добавлена\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[отозван]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[самоподпись]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "1 плохая подпись\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d плохих подписей\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "1 подпись не проверена за отсутствием ключа\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d подписей не проверено за отсутствием ключей\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "1 подпись не проверена из-за ошибки\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d подписей не проверено из-за ошибок\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "обнаружен 1 User ID без действительной самоподписи\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "обнаружено %d User ID без действительной самоподписи\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, fuzzy, c-format
msgid " (%d) I trust marginally\n"
msgstr " %d = Доверяю ограниченно\n"
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, fuzzy, c-format
msgid " (%d) I trust fully\n"
msgstr " %d = Полностью доверяю\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "User ID \"%s\" отозван."
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Вы уверены, что хотите это подписать? (y/N) "
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr " Не могу подписать.\n"
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Срок действия User ID \"%s\" истек."
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "User ID \"%s\" без самоподписи."
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2567,11 +2633,11 @@ msgstr ""
"Самоподпись у \"%s\"\n"
"это подпись PGP 2.x -стиля.\n"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Вы хотите сделать это OpenPGP самоподписью? (y/N) "
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2580,11 +2646,11 @@ msgstr ""
"Ваша текущая подпись на \"%s\"\n"
"просрочена.\n"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Вы хотите сделать новую подпись для замены просроченной? (y/N) "
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2593,55 +2659,55 @@ msgstr ""
"Ваша текущая подпись на \"%s\"\n"
"является локальной.\n"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Вы хотите сделать это полностью экспортируемой подписью? (y/N) "
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" уже был локально подписан ключом %08lX\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" уже был подписан ключом %08lX\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Вы действительно хотите снова подписать это? (y/N)"
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Нечего подписывать ключом %08lX\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "Данный ключ просрочен!"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Срок действия данного ключа истекает %s.\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr ""
"Вы хотите, чтобы Ваша подпись была действительна до того же времени?(Y/n) "
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
msgstr ""
"Вы не можете сделать OpenPGP подпись на PGP 2.x ключе в режиме --pgp2.\n"
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "Это сделает ключ несовместимым с PGP 2.x.\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2651,31 +2717,31 @@ msgstr ""
"чье имя указано в User ID ключа?\n"
" Если Вы не знаете что ответить, введите \"0\".\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Не буду отвечать.%s\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Я не проверял совсем.%s\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Я проверил частично.%s\n"
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Я проверил очень тщательно.%s\n"
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr "Ваш выбор? (введите '?' для большей информации): "
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2683,7 +2749,7 @@ msgstr ""
"Вы уверены, что хотите подписать этот ключ\n"
"своим ключом: \""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2691,7 +2757,7 @@ msgstr ""
"\n"
"Это будет самоподпись.\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2699,7 +2765,7 @@ msgstr ""
"\n"
"ВНИМАНИЕ: подпись не будет помечена как не экспортируемая.\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2707,7 +2773,7 @@ msgstr ""
"\n"
"ВНИМАНИЕ: подпись не будет помечена как не отзываемая.\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2715,7 +2781,7 @@ msgstr ""
"\n"
"Подпись будет помечена как не экспортируемая.\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2723,7 +2789,7 @@ msgstr ""
"\n"
"Подпись будет помечена как не отзываемая.\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2731,7 +2797,7 @@ msgstr ""
"\n"
"Я не проверял этот ключ совсем.\n"
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2739,7 +2805,7 @@ msgstr ""
"\n"
"Я частично проверил этот ключ.\n"
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2747,34 +2813,34 @@ msgstr ""
"\n"
"Я очень тщательно проверил этот ключ.\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "Действительно подписать? "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "не удалось подписать: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "Данный ключ не защищен.\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr "Секретная часть главного ключа отсутствует.\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "Ключ защищен.\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Не могу редактировать данный ключ: %s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2782,7 +2848,7 @@ msgstr ""
"Введите новый пароль для данного секретного ключа.\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2790,544 +2856,566 @@ msgstr ""
"Вы не хотите задать пароль? Это очень ПЛОХАЯ идея!\n"
"\n"
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "Вы действительно хотите сделать это? "
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "перемещение подписи ключа в правильное место\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "выйти из этого меню"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "q"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "save"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "сохранить и выйти"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "help"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "показать эту справку"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "показать отпечаток"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "list"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "вывести список ключей и User ID"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "выбрать User ID N"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "key"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "выбрать вторичный ключ N"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "check"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "вывести список подписей"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "c"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "подписать ключ"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "s"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "tsign"
msgstr "sign"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "make a trust signature"
msgstr "создать отделенную (detached) подпись"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "локально подписать ключ"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr "подписать ключ без возможности отзыва"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "sign the key locally and non-revocably"
msgstr "подписать ключ локально и без возможности отзыва"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "добавить User ID"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr "addphoto"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr "добавить фото ID"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "удалить User ID"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr "delphoto"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "добавить вторичный ключ"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+#, fuzzy
+msgid "addcardkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "удалить вторичный ключ"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "addrevoker"
msgstr "addrevoker"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "add a revocation key"
msgstr "добавить ключ отзыва"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "удалить подпись"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "сменить срок действия"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr "primary"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr "пометить User ID как главный"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "переключение между открытым и закрытым ключами"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "t"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr "список предпочтений (экспертам)"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr "список предпочтений (подробный)"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr "установить предпочтения"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr "обновить предпочтения"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "keyserver"
msgstr "ошибка сервера ключей"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "set preferred keyserver URL"
msgstr "не могу проанализировать URI сервера ключей\n"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "сменить пароль"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "изменить уровень доверия владельцу"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "отзыв подписей"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revuid"
msgstr "revuid"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revoke a user ID"
msgstr "отзыв User ID"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "отзыв подключей"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "отключить ключ"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "включить ключ"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr "showphoto"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr "показать фото ID"
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "не могу делать это в пакетном режиме\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "ошибка чтения секретного блока ключа `%s': %s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "Секретный ключ доступен.\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "Команда> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "Для данного действия нужен секретный ключ.\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr "Сначала воспользуйтесь командой \"toggle\".\n"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
msgid "Key is revoked."
msgstr "Ключ отозван."
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "Вы действительно хотите подписать ВСЕ User ID? "
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "Подсказка: Выберите User IDs для подписи\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Данная команда не допустима в режиме %s.\n"
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "Вы должны выбрать хотя бы один User ID.\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "Вы не можете удалить последний User ID!\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "Вы действительно хотите удалить ВСЕ выбранные User IDs? "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "Вы действительно хотите удалить данный User ID? "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+#, fuzzy
+msgid "Really move the primary key? "
+msgstr "Вы действительно хотите удалить данный User ID? "
+
+#: g10/keyedit.c:1598
+#, fuzzy
+msgid "You must select exactly one key.\n"
+msgstr "Вы должны выбрать хотя бы один ключ.\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "Вы должны выбрать хотя бы один ключ.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "Вы действительно хотите удалить выбранные ключи? "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "Вы действительно хотите удалить данный ключ? "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
msgid "Really revoke all selected user IDs? "
msgstr "Действительно отозвать ВСЕ выбранные User ID? "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
msgid "Really revoke this user ID? "
msgstr "Действительно отозвать данный User ID? "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "Вы действительно хотите отозвать выбранные ключи? "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "Вы действительно хотите отозвать данный ключ? "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
#, fuzzy
msgid "Set preference list to:\n"
msgstr "установить предпочтения"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr "Действительно обновить предпочтения для выбранных User ID? "
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr "Действительно обновить предпочтения? "
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "Сохранить изменения? "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "Выйти без сохранения? "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "сбой при обновлении: %s\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "сбой при обновлений секретного ключа: %s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "ключ не изменялся - обновление не нужно.\n"
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "Недопустимая команда (список команд: \"help\")\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr "Хэш-функции: "
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr "Опции: "
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keyedit.c:2219
#, c-format
msgid "This key may be revoked by %s key "
msgstr "Данный ключ может быть отозван ключом %s "
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr " (sensitive)"
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "не могу создать %s: %s\n"
-#: g10/keyedit.c:2084
-#, fuzzy, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
msgstr "[отозван]"
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
-msgstr " [годен до: %s]"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
+msgstr "expire"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2246
#, fuzzy, c-format
-msgid "expires: %s"
-msgstr " [годен до: %s]"
+msgid "usage: %s"
+msgstr " доверие: %c/%c"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, fuzzy, c-format
msgid "trust: %s"
msgstr " доверие: %c/%c"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "Данный ключ отключен"
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! подключ отозван: %s\n"
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
-msgstr "rev- найден поддельный отзыв\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? проблема проверки отзыва: %s\n"
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-#, fuzzy
-msgid "revoked"
-msgstr "[отозван]"
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-#, fuzzy
-msgid "expired"
-msgstr "expire"
+#: g10/keyedit.c:2300
+msgid "card-no: "
+msgstr ""
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Не может быть предпочтений в PGP 2.x-стиле User ID.\n"
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3335,15 +3423,7 @@ msgstr ""
"Заметьте, что показанные степени достоверности могут быть неверными,\n"
"пока Вы не перезапустите программу.\n"
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-msgid "[revoked] "
-msgstr "[отозван]"
-
-#: g10/keyedit.c:2274
-msgid "[expired] "
-msgstr "[просрочен]"
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@ -3351,7 +3431,7 @@ msgstr ""
"ВНИМАНИЕ: нет User ID отмеченного как главный. Данная команда может\n"
" использовать другой User ID в качестве главного.\n"
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3360,45 +3440,45 @@ msgstr ""
"ВНИМАНИЕ: Это ключ PGP2. Добавление фото ID может в некоторых версиях\n"
" PGP вызвать выбраковку ключа.\n"
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Вы уверены, что хотите добавить это? (y/N) "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Вы можете не добавлять фото ID в ключ PGP2-типа.\n"
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "Удалить данную действительную подпись? (y/N/q)"
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Удалить данную недействительную подпись? (y/N/q)"
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Удалить данную неизвестную подпись? (y/N/q)"
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "Действительно удалить данную самоподпись? (y/N)"
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Удалена %d подпись.\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Удалено %d подписи.\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "Ничего не удалено.\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3407,88 +3487,98 @@ msgstr ""
"ВНИМАНИЕ: Это ключ PGP 2.x. Добавление назначенного отзывающим ключа\n"
" может в некоторых версиях PGP вызвать выбраковку ключа.\n"
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Вы не можете добавить назначенный отзывающим ключ в PGP 2.x ключ.\n"
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
msgid "Enter the user ID of the designated revoker: "
msgstr "Укажите User ID ключа, назначенного отзывающим: "
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "нельзя назначить PGP 2.x ключ, как назначенный отзывающим\n"
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "ключ не может быть назначен отзывающим сам себя\n"
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "ВНИМАНИЕ: Данный ключ отозван отзывающим ключом!\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "ВНИМАНИЕ: назначение ключа отзывающим не возможно будет отменить!\n"
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N): "
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "Снимите выделение с секретного ключа.\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "Выделите не более одного вторичного ключа.\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "Смена срока действия вторичного ключа.\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "Смена срока действия главного ключа\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Вы не можете изменить срок действия v3 ключа\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "Нет соответствующей подписи в связке секретных\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
msgid "Please select exactly one user ID.\n"
msgstr "Выберите только один User ID.\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
-#, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "пропуск v3 самоподписи на User ID \"%s\"\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+#, fuzzy
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "Вы действительно хотите использовать его? (y/N)"
+
+#: g10/keyedit.c:3480
+#, fuzzy
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "Вы действительно хотите использовать его? (y/N)"
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "Нет User ID с индексом %d\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Нет вторичного ключа с индексом %d\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "User ID: \""
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3497,7 +3587,7 @@ msgstr ""
"\"\n"
"подписанный Вашим ключом %08lX %s\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3506,142 +3596,126 @@ msgstr ""
"\"\n"
"подписан локально Вашим ключом %08lX %s\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Срок подписи закончился %s.\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Вы уверены, что хотите отозвать? (y/N) "
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "Вы подписали данные User ID:\n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid " signed by %s on %s%s%s\n"
msgstr " подписан %08lX %s%s%s\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid " revoked by %s on %s\n"
msgstr " отозван %08lX %s\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "Вы отзываете следующие подписи:\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, fuzzy, c-format
msgid " signed by %s on %s%s\n"
msgstr " подписан %08lX %s%s\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr " (не экспортируемая)"
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
msgid "Really create the revocation certificates? (y/N) "
msgstr "Действительно создать сертификат отзыва? (y/N) "
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "нет секретного ключа\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "User ID \"%s\" уже отозван\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "ВНИМАНИЕ: User ID подпись датирована %d секундами в будущем\n"
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Показ %s фото ID размера %ld для ключа 0x%08lX (uid %d)\n"
-#: g10/keylist.c:179
+#: g10/keylist.c:180
msgid "Critical signature policy: "
msgstr "Критические правила для подписи: "
-#: g10/keylist.c:181
+#: g10/keylist.c:182
msgid "Signature policy: "
msgstr "Правила для подписи: "
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "ВНИМАНИЕ: найдена недопустимая форма записи данных\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
msgid "Critical signature notation: "
msgstr "Критическое примечание к подписи: "
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr "Примечание к подписи"
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr "нечитаемо для человека"
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr "Таблица ключей"
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr " [годен до: %s]"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr " [годен до: %s]"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, fuzzy, c-format
-msgid " [revoked: %s]"
-msgstr "[отозван]"
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
msgid "Primary key fingerprint:"
msgstr " Отпечаток главного ключа:"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
msgid " Subkey fingerprint:"
msgstr " Отпечаток подключа:"
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
msgid " Primary key fingerprint:"
msgstr " Отпечаток главного ключа:"
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
msgid " Subkey fingerprint:"
msgstr " Отпечаток подключа:"
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr " Отпечаток ключа ="
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3846,80 +3920,80 @@ msgstr "старый (PGP 2.x) стиль подписи\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "обнаружен недопустимый корневой пакет в proc_tree()\n"
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "не могу отключить создание образа памяти (core dumps): %s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "Использовать экспериментальные алгоритмы не рекомендуется!\n"
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"не рекомендуем данный алгоритм шифрования; используйте более стандартный!\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr "модуль поддержки шифра IDEA не обнаружен\n"
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr "смотрите подробности на http://www.gnupg.org/why-not-idea.html\n"
-#: g10/misc.c:491
+#: g10/misc.c:517
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: не рекомендуемая опция \"%s\"\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "ВНИМАНИЕ: \"%s\" не рекомендуемая опция\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "используйте \"%s%s\" взамен\n"
-#: g10/misc.c:508
+#: g10/misc.c:534
msgid "Uncompressed"
msgstr "не сжато"
-#: g10/misc.c:533
+#: g10/misc.c:559
#, fuzzy
msgid "uncompressed|none"
msgstr "не сжато"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "данное сообщение может быть не пригодно для %s\n"
-#: g10/misc.c:777
+#: g10/misc.c:826
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "настройки взяты из файла `%s'\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "неизвестный получатель по умолчанию `%s'\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "не могу использовать алгоритм с открытым ключом %d\n"
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"ВНИМАНИЕ: потенциально небезопасный симметрично зашифрованный сеансовый "
"ключ\n"
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "подпакет типа %d имеет выставленный критический бит\n"
@@ -3958,7 +4032,7 @@ msgstr "не могу подключиться к `%s': %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "коммуникационный проблемы с gpg-agent\n"
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr "проблема с агентом - использование агента отключено\n"
@@ -3994,24 +4068,24 @@ msgstr "пароль слишком длинный\n"
msgid "invalid response from agent\n"
msgstr "неверный ответ от агента\n"
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "прервано пользователем\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "проблема с агентом: агент вернул 0x%lx\n"
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "не могу получить пароль в пакетном режиме\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "Введите пароль: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4021,22 +4095,22 @@ msgstr ""
"Необходим пароль для доступа к секретному ключу пользователя:\n"
"\""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-бит %s ключ, ID %08lX, создан %s"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (главный идентификатор ключа %08lX)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "Повторите пароль: "
@@ -4251,25 +4325,36 @@ msgstr "ВНИМАНИЕ: `%s' пустой файл\n"
msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "только отделенная подпись доступна с PGP 2.x ключом в режиме --pgp2\n"
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
-msgstr "не могу создать %s: %s\n"
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
+msgstr "не могу создать `%s': %s\n"
-#: g10/sign.c:794
-#, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+#: g10/sign.c:771 g10/sign.c:1008
+#, fuzzy, c-format
+msgid "writing to file `%s'\n"
+msgstr "сохраняю в `%s'\n"
+
+#: g10/sign.c:795
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "использование хэш-функции %s (%d) нарушает предпочтения получателя\n"
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr "подписывание:"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "не могу открыть файл: %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "только прозрачная подпись доступна с PGP 2.x ключом в режиме --pgp2\n"
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr "будет использовано %s шифрование\n"
@@ -4665,7 +4750,7 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr ""
"невозможно избежать слабого ключа для симметричного шифра; %d попыток!\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA требует использования 160 битной хэш-функции\n"
@@ -5027,17 +5112,17 @@ msgstr "Нет доступной справки"
msgid "No help available for `%s'"
msgstr "Нет справки для `%s'"
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "ошибка создания таблицы ключей `%s': %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr "создана таблица ключей `%s'\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "сбой перестройки кэша таблицы ключей: %s\n"
@@ -5080,8 +5165,7 @@ msgstr "%lu ключей проверено (%lu подписей)\n"
msgid "%s: keyring created\n"
msgstr "%s: таблица ключей создана\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5095,29 +5179,34 @@ msgstr ""
"с Вашим открытым ключом и увеличит его размер, т.е. не следует брать очень\n"
"большое изображение. Рекомендуемый размер около 240x288.\n"
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr "Введите имя JPEG файла для Фото ID: "
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "Не могу открыть фото \"%s\": %s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
msgid "Are you sure you want to use it (y/N)? "
msgstr "Вы действительно хотите использовать его? (y/N)"
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr "\"%s\" не JPEG файл\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Is this photo correct (y/N/q)? "
msgstr "Данное фото правильное (y/N/q)? "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
msgid "unable to display photo ID!\n"
msgstr "не могу отобразить Фото ID!\n"
@@ -5136,45 +5225,51 @@ msgid ""
msgstr "вызов внешних программ отключен из-за небезопасных прав доступа\n"
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
+#, fuzzy
+msgid "this platform requires temporary files when calling external programs\n"
msgstr ""
"на данной платформе требуется использование временных файлов\n"
" при вызове внешних программ\n"
-#: g10/exec.c:432
-#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
msgstr "не могу запустить %s \"%s\": %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:436
+#, fuzzy, c-format
+msgid "unable to execute shell `%s': %s\n"
+msgstr "не могу запустить %s \"%s\": %s\n"
+
+#: g10/exec.c:515
#, c-format
msgid "system error while calling external program: %s\n"
msgstr "ошибка системы при вызове внешней программы: %s\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr "ненормалоьное завершение внешней программы\n"
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr "не могу запустить внешнюю программу\n"
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr "не могу прочитать ответ внешней программы: %s\n"
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr "ВНИМАНИЕ: не могу удалить временный файл (%s) `%s': %s\n"
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "ВНИМАНИЕ: не могу удалить временный каталог `%s': %s\n"
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr "никогда "
@@ -5330,6 +5425,47 @@ msgstr "ошибка поиска записи о доверии: %s\n"
msgid "read error: %s\n"
msgstr "ошибка чтения: %s\n"
+#, fuzzy
+#~ msgid "revoked: %s"
+#~ msgstr "[отозван]"
+
+#, fuzzy
+#~ msgid "expired: %s"
+#~ msgstr " [годен до: %s]"
+
+#, fuzzy
+#~ msgid "expires: %s"
+#~ msgstr " [годен до: %s]"
+
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "rev! подключ отозван: %s\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "rev- найден поддельный отзыв\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "rev? проблема проверки отзыва: %s\n"
+
+#~ msgid "[revoked] "
+#~ msgstr "[отозван]"
+
+#~ msgid "[expired] "
+#~ msgstr "[просрочен]"
+
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr " [годен до: %s]"
+
+#~ msgid " [expires: %s]"
+#~ msgstr " [годен до: %s]"
+
+#, fuzzy
+#~ msgid " [revoked: %s]"
+#~ msgstr "[отозван]"
+
+#~ msgid "can't create %s: %s\n"
+#~ msgstr "не могу создать %s: %s\n"
+
#~ msgid ""
#~ "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n"
#~ msgstr ""
diff --git a/po/sk.po b/po/sk.po
index 0927cdd6d..6ce6ea850 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.5\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
"PO-Revision-Date: 2004-07-20 15:52+0200\n"
"Last-Translator: Michal Majer <[email protected]>\n"
"Language-Team: Slovak <[email protected]>\n"
@@ -45,7 +45,7 @@ msgstr "nie"
msgid "nN"
msgstr "nN"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "ukon�i�"
@@ -278,6 +278,16 @@ msgstr "nepou�ite�n� tajn� k���"
msgid "keyserver error"
msgstr "chyba servera k���ov"
+#: util/errors.c:108
+#, fuzzy
+msgid "canceled"
+msgstr "Zru�i�"
+
+#: util/errors.c:109
+#, fuzzy
+msgid "no card"
+msgstr "neza�ifrovan�"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr ""
@@ -300,7 +310,7 @@ msgstr "n�jden� chyba v programe ... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "nebol detekovan� �iadny modul na z�skanie entropie\n"
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "nem��em otvori� `%s': %s\n"
@@ -332,7 +342,7 @@ msgstr "nem��em ��ta� `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "pozn�mka: s�bor random_seed nie je aktualizovan�\n"
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr "nem��em vytvori� `%s': %s\n"
@@ -400,7 +410,7 @@ msgstr "nem��em vytvori� prvo��slo s d�kou menej ako %d bitov\n"
msgid "can't generate a prime with less than %d bits\n"
msgstr "nem��em vytvori� prvo��slo s d�kou menej ako %d bitov\n"
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -408,128 +418,128 @@ msgstr ""
"@Pr�kazy:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[s�bor]|vytvori� podpis"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "vytvori� podpis oddelen� od dokumentu"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "�ifrova� d�ta"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "�ifrovanie len so symetrickou �ifrou"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "de�ifrova� d�ta (implicitne)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "verifikova� podpis"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "vyp�sa� zoznam k���ov"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "vyp�sa� zoznam k���ov a podpisov"
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "skontrolova� podpisy k���ov"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "vyp�sa� zoznam k���ov a fingerprintov"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "vyp�sa� zoznam tajn�ch k���ov"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "vytvori� nov� p�r k���ov"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "odstr�ni� k��� zo s�boru tajn�ch k���ov"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "podp�sa� k���"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "podp�sa� k��� lok�lne"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "podp�sa� alebo modifikova� k���"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "vytvori� revoka�n� certifik�t"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "exportova� k���e"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "exportova� k���e na server k���ov"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "importova� k���e zo servera k���ov"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "vyh�ada� k���e na serveri k���ov"
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "aktualizova� v�etky k���e zo servera k���ov"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "importova�/zl��i� k���e"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "aktualizova� datab�zu d�very"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|algo [s�bory]|vyp�� hash"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -539,59 +549,55 @@ msgstr ""
"Mo�nosti:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|MENO|�ifrova� pre MENO"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr ""
"pou�i� toto id u��vate�a na podp�sanie\n"
" alebo de�ifrovanie"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr ""
"|N|nastavi� �rove� komprim�cie N (0 - �iadna\n"
" komprim�cia)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "pou�i� k�nonick� textov� m�d"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "pou�i� ako v�stupn� s�bor"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "s dodato�n�mi inform�ciami"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "nevykona� �iadne zmeny"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "vy�iada� potvrdenie pred prep�san�m"
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -600,7 +606,7 @@ msgstr ""
"(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
"mo�nost�)\n"
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -620,17 +626,17 @@ msgstr ""
" --list-keys [men�] vyp�sa� k���e\n"
" --fingerprint [men�] vyp�sa� fingerprinty\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Chyby ozn�mte, pros�m, na adresu <[email protected]>.\n"
"Pripomienky k prekladu <[email protected]>.\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -640,7 +646,7 @@ msgstr ""
"podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
"implicitn� oper�cie z�visia od vstupn�ch d�t\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -648,478 +654,472 @@ msgstr ""
"\n"
"Podporovan� algoritmy:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr "Verejn� k���e: "
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr "�ifry: "
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr "Hash: "
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
msgid "Compression: "
msgstr "Kompresia: "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "pou�itie: gpg [mo�nosti] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "konfliktn� pr�kazy\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "no = podpis n�jden� v defin�cii skupiny \"%s\"\n"
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
-#: g10/g10.c:1205
+#: g10/g10.c:1210
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr ""
"VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
"VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
-#: g10/g10.c:1334
-#, c-format
-msgid "unknown configuration item \"%s\"\n"
+#: g10/g10.c:1354
+#, fuzzy, c-format
+msgid "unknown configuration item `%s'\n"
msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "POZN�MKA: star� implicitn� s�bor s mo�nos�ami `%s ignorovan�'\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "POZN�MKA: neexistuje implicitn� s�bor s mo�nos�ami `%s'\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "s�bor s mo�nos�ami `%s': %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "��tam mo�nosti z `%s'\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "POZN�MKA: %s nie je pre norm�lne pou�itie!\n"
-#: g10/g10.c:1887
-#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+#: g10/g10.c:2021
+#, fuzzy, c-format
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr ""
"�ifra \"%s\" nebola nahran�, preto�e pr�stupov� pr�va nie s� nastaven� "
"bezpe�ne\n"
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "%s nie je platn� znakov� sada\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "neplatn� parameter pre export\n"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: neplatn� parameter pre import\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
msgid "invalid import options\n"
msgstr "neplatn� parameter pre import\n"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
msgid "invalid export options\n"
msgstr "neplatn� parameter pre export\n"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: neplatn� parameter pre import\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "neplatn� parameter pre import\n"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "neplatn� parameter pre export\n"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nemo�no nastavi� exec-path na %s\n"
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROVANIE: %s prep��e %s\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Nie je dovolen� pou��va� %s s %s!\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ned�va s %s zmysel!\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"v m�de --pgp2 m��ete vytv�ra� len oddelen� podpisy alebo podpisy �itate�n� "
"ako text\n"
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "v m�de --pgp2 nemo�no s��asne �ifrova� a podpisova�\n"
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "v m�de --pgp2 mus�te pou�i� s�bor (nie r�ru).\n"
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "�ifrovanie spr�v v m�de --pgp2 vy�aduje algoritmus IDEA\n"
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "vybran� hashovac� algoritmus je neplatn�\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
msgid "selected certification digest algorithm is invalid\n"
msgstr "vybran� hashovac� algoritmus je neplatn�\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "polo�ka max-cert-depth mus� by� v rozmedz� od 1 do 255\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "neplatn� implicitn� �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "neplatn� minim�lna �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razne nedoporu�ovan�\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "neplatn� m�d S2K; mus� by� 0, 1 alebo 3\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
msgid "invalid default preferences\n"
msgstr "neplatn� defaultn� predvo�by\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
msgid "invalid personal cipher preferences\n"
msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
msgid "invalid personal digest preferences\n"
msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
msgid "invalid personal compress preferences\n"
msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s e�te nepracuje s %s\n"
-#: g10/g10.c:2680
-#, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2797
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "nem��ete pou�i� �ifrovac� algoritmus \"%s\" v m�de %s\n"
-#: g10/g10.c:2685
-#, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2802
+#, fuzzy, c-format
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "nem��ete pou�i� hashovac� algoritmus \"%s\" v m�de %s\n"
-#: g10/g10.c:2690
-#, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2807
+#, fuzzy, c-format
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "nem��ete pou�i� kompresn� algoritmus \"%s\" v m�de %s\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "nem��em inicializova� datab�zu d�very: %s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"VAROVANIE: dan� adres�t (-r) bez pou�itia �ifrovania s verejn�m k���om\n"
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [meno s�boru]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [meno s�boru]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [meno s�boru]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [meno s�boru]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr ""
"pou�itie %s nie je v m�de %s dovolen�\n"
"\n"
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [meno s�boru]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [meno s�boru]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [meno s�boru]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
"pou�itie %s nie je v m�de %s dovolen�\n"
"\n"
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [meno s�boru]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [meno s�boru]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [meno s�boru]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key id u��vate�a"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key id u��vate�a"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrsign-key id u��vate�a"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key id u��vate�a"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id u��vate�a [pr�kazy]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "nemo�no otvori� %s: %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id u��vate�a] [s�bor s k���mi (keyring)]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "nepodarilo posla� k��� na server: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, c-format
msgid "key export failed: %s\n"
msgstr "nepodaril sa export k���a: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "nepodarilo sa n�js� server: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "aktualiz�cia servera zlyhala: %s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "neplatn� hashovac� algoritmus `%s'\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[meno s�boru]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "Za�nite p�sa� svoju spr�vu ...\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "nemo�no otvori� `%s'\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@ -1127,48 +1127,48 @@ msgstr ""
"meno m��e obsahova� len p�smen�, ��slice, bodky, pod�iarn�ky alebo medzery a "
"kon�i� s '='\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
msgid "a user notation name must contain the '@' character\n"
msgstr "hodnota mus� obsahova� znak '@'\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "hodnota nesmie obsahova� �iadne kontroln� znaky\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
-#: g10/g10.c:3747
+#: g10/g10.c:3863
#, fuzzy
-msgid "the given signature preferred keyserver URL is invalid\n"
+msgid "the given preferred keyserver URL is invalid\n"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "by� o trochu tich��"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
msgid "take the keys from this keyring"
msgstr "Zmaza� tento k��� zo s�boru k���ov? "
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
msgid "make timestamp conflicts only a warning"
msgstr "konflikt �asov�ho raz�tka"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr "|FD|zap�sa� inform�cie o stave do tohto FD"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Pou�itie: gpgv [mo�nosti] [s�bory] (-h pre pomoc)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1202,12 +1202,13 @@ msgid "invalid dash escaped line: "
msgstr "nespr�vne ozna�enie riadku m�nusmi: "
#: g10/armor.c:565
-msgid "unexpected armor:"
+#, fuzzy
+msgid "unexpected armor: "
msgstr "neo�ak�van� k�dovanie ASCII:"
-#: g10/armor.c:695 g10/armor.c:1276
-#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+#: g10/armor.c:695 g10/armor.c:1280
+#, fuzzy, c-format
+msgid "invalid radix64 character %02X skipped\n"
msgstr "neplatn� znak vo form�te radix64 %02x bol presko�en�\n"
#: g10/armor.c:738
@@ -1218,33 +1219,34 @@ msgstr "pred�asn� koniec s�boru (�iadne CRC)\n"
msgid "premature eof (in CRC)\n"
msgstr "pred�asn� koniec s�boru (v CRC)\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "nespr�vny form�t CRC\n"
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "Chyba CRC; %06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+#, fuzzy
+msgid "premature eof (in trailer)\n"
msgstr "pred�asn� koniec s�boru (v p�ti�ke)\n"
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "chyba v p�ti�ke\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "neplatn� k�dovanie ASCII: riadok je dlh�� ako %d znakov\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1300,7 +1302,7 @@ msgstr " alias \""
msgid " aka \""
msgstr " alias \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1554,96 +1556,116 @@ msgstr "%s: presko�en�: verejn� k��� je neplatn� (disabled)\n"
msgid "no valid addressees\n"
msgstr "�iadne platn� adresy\n"
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "duplicita predvo�by %c%lu\n"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "pr�li� ve�a `%c' predvolieb\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
#, fuzzy
msgid "too many digest preferences\n"
msgstr "pr�li� ve�a `%c' predvolieb\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
#, fuzzy
msgid "too many compression preferences\n"
msgstr "pr�li� ve�a `%c' predvolieb\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "neplatn� znak v re�azci s predvo�bami\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
msgid "writing direct signature\n"
msgstr "zapisujem podpis k���a n�m sam�m (direct signature)\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "zapisujem podpis k���a sebou sam�m\n"
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "zapisujem \"key-binding\" podpis\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "neplatn� d�ka k���a; pou�ijem %u bitov\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "d�ka k���a zaokr�hlen� na %u bitov\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA a ElGamal (implicitn�)\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (len na podpis)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (len na �ifrovanie)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (len na podpis)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (len na �ifrovanie)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (pro �ifrov�n� a podpis)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, fuzzy, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) RSA (len na podpis)\n"
+
+#: g10/keygen.c:1224
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) RSA (pro �ifrov�n� a podpis)\n"
+
+#: g10/keygen.c:1226
+#, fuzzy, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) RSA (len na �ifrovanie)\n"
+
+#: g10/keygen.c:1228
+#, fuzzy, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) RSA (pro �ifrov�n� a podpis)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "V� v�ber? "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "Neplatn� v�ber.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1656,31 +1678,31 @@ msgstr ""
" implicitn� ve�kos� k���a je 1024 bitov\n"
" najvy��ia navrhovan� ve�kos� k���a je 2048 bitov\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "Ak� ve�kos� k���a si prajete? (1024) "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "k��� DSA mus� ma� ve�kos� od 512 do 1024 bitov.\n"
-#: g10/keygen.c:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr ""
"ve�kos� k���a je pr�li� mal�; minim�lna povolen� ve�kos� pre RSA je 1024 "
"bitov.\n"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr ""
"ve�kos� k���a je pr�li� mal�; minim�lna povolen� ve�kos� je 768 bitov.\n"
-#: g10/keygen.c:1255
+#: g10/keygen.c:1328
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "ve�kos� k���a je pr�li� ve�k�; maxim�lna povolen� hodnota je %d.\n"
-#: g10/keygen.c:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1688,11 +1710,11 @@ msgstr ""
"Ve�kosti k���ov v��ie ako 2048 bitov se neodpor��aj�, preto�e\n"
"v�po�ty potom trvaj� VE�MI dlho!\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "Skuto�ne chcete vytvori� k��� tejto d�ky? "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1700,17 +1722,17 @@ msgstr ""
"Dobre, ale nezab�dajte, �e inform�cie m��u by� vyzraden� z po��ta�a aj "
"elektromagnetick�m vy�arovan�m monitora alebo kl�vesnice!\n"
-#: g10/keygen.c:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Po�adovan� d�ka k���a je %u bitov.\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "zaokr�hlen� na %u bitov\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1726,7 +1748,7 @@ msgstr ""
" <n>m = doba platnosti k���a skon�� za n mesiacov\n"
" <n>y = doba platnosti k���a skon�� za n rokov\n"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1742,29 +1764,29 @@ msgstr ""
" <n>m = doba platnosti podpisu skon�� za n mesiacov\n"
" <n>y = doba platnosti podpisu skon�� za n rokov\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "K��� je platn� na? (0) "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr "Podpis je platn� na? (0) "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "neplatn� hodnota\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr "platnos� %s neskon��\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr "platnos� %s skon�� %s\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1772,16 +1794,17 @@ msgstr ""
"V� syst�m nevie zobrazi� d�tumy po roku 2038.\n"
"V ka�dom pr�pade bud� d�tumy korektne spracov�van� do roku 2106.\n"
-#: g10/keygen.c:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "Je to spr�vne (a/n)? "
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
+#, fuzzy
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
@@ -1792,44 +1815,44 @@ msgstr ""
" \"Jozko Mrkvicka (student) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "Meno a priezvisko: "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "Neplatn� znak ve mene\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr "Meno nem��e za��na� ��slicou\n"
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr "Meno mus� by� dlh� aspo� 5 znakov\n"
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "E-mailov� adresa: "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "Neplatn� e-mailov� adresa\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "Koment�r: "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "Neplatn� znak v koment�ri\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Pou��vate znakov� sadu `%s'.\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1840,27 +1863,27 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "Do po�a meno alebo koment�r nep��te, pros�m, e-mailov� adresu.\n"
-#: g10/keygen.c:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "mMkKeEPpUu"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (U)kon�i�? "
-#: g10/keygen.c:1542
+#: g10/keygen.c:1615
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (P)okra�ova�/(U)kon�i�? "
-#: g10/keygen.c:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr "Najsk�r, pros�m, opravte chybu\n"
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1868,16 +1891,16 @@ msgstr ""
"Na ochranu V�ho tajn�ho k���a mus�te zada� heslo.\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1889,7 +1912,7 @@ msgstr ""
"tohto programu s parametrom \"--edit-key\".\n"
"\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1901,58 +1924,58 @@ msgstr ""
"pou��va� disky); v�aka tomu m� gener�tor lep�iu �ancu z�ska� dostatok "
"entropie.\n"
-#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr "nemo�no previes� v d�vkovom m�de\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "P�r k���ov DSA bude ma� d�ku 1024 bitov.\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "Vytv�ranie k���a bolo zru�en�.\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr "zapisujem verejn� k��� do `%s'\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nen�jden� zapisovate�n� s�bor verejn�ch k���ov (pubring): %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "nen�jden� zapisovate�n� s�bor tajn�ch k���ov (secring): %s\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "chyba pri z�pise do s�boru verejn�ch k���ov `%s': %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "verejn� a tajn� k��� boli vytvoren� a podp�san�.\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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"
@@ -1960,12 +1983,12 @@ msgstr ""
"Tento k��� nem��e by� pou�it� na �ifrovanie. Pre vytvorenie\n"
"sekund�rneho k���a na tento ��el m��ete pou�i� pr�kaz \"--edit-key\".\n"
-#: g10/keygen.c:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -1973,7 +1996,7 @@ msgstr ""
"k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
"je probl�m so syst�mov�m �asom)\n"
-#: g10/keygen.c:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1981,14 +2004,43 @@ msgstr ""
"k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
"je probl�m so syst�mov�m �asom)\n"
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "POZN�MKA: vytvorenie podk���a pre k���e v3 nie je v s�lade s OpenPGP\n"
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "Skuto�ne vytvori�? "
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "nem��em vytvori� `%s': %s\n"
+
+#: g10/keygen.c:3248
+#, fuzzy, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "POZN�MKA: platnos� tajn�ho k���a %08lX skon�ila %s\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "--output pre tento pr�kaz nefunguje\n"
@@ -1999,7 +2051,7 @@ msgstr "--output pre tento pr�kaz nefunguje\n"
msgid "%s: can't open: %s\n"
msgstr "%s: nem��em otvori�: %s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
@@ -2028,6 +2080,11 @@ msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
msgstr ""
"v m�de --pgp2 m��ete �ifrova� len RSA k���om s d�kou 2048 bitov a menej\n"
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "nemo�no otvori� %s: %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -2038,23 +2095,31 @@ msgid ""
"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
msgstr "algoritmus IDEA nemo�no pou�i� na v�etky k���e, pre ktor� �ifrujete.\n"
-#: g10/encode.c:526 g10/encode.c:721
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#: g10/encode.c:526
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "vy�iadan� symetrick� �ifra %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
-#: g10/encode.c:634 g10/sign.c:863
-#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+#: g10/encode.c:634 g10/sign.c:864
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
msgstr ""
"vy�iadan� kompresn� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "vy�iadan� symetrick� �ifra %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
+
#: g10/encode.c:818
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s za�ifrovan� pre: %s\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "k��� `%s' nebol n�jden�: %s\n"
@@ -2087,8 +2152,9 @@ msgstr "VAROVANIE: ni� nebolo vyexportovan�\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "pr�li� ve�a polo�iek v bufferi verejn�ch k���ov - vypnut�\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+#, fuzzy
+msgid "[User ID not found]"
msgstr "[User id not found]"
# c-format
@@ -2244,7 +2310,7 @@ msgstr "k��� %08lX: HKP po�kodenie podk���a opraven�\n"
# c-format
#: g10/import.c:722
#, fuzzy, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr ""
"k��� %08lX: prijat� id u��vate�a '%s', ktor� nie je podp�san� n�m sam�m\n"
@@ -2272,7 +2338,7 @@ msgstr "k��� %08lX: nov� k��� - presko�en�\n"
msgid "no writable keyring found: %s\n"
msgstr "nen�jden� zapisovate�n� s�bor k���ov (keyring): %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "zapisujem do '%s'\n"
@@ -2385,14 +2451,14 @@ msgstr "k��� %08lX: neexistuje id u��vate�a pre podpis\n"
#: g10/import.c:1299
#, fuzzy, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"k��� %08lX: nepodporovan� algoritmus verejn�ho k���a u u��vate�sk�ho id \"%s"
"\"\n"
#: g10/import.c:1301
#, fuzzy, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr ""
"k��� %08lX: neplatn� podpis k���a n�m sam�m u u��vate�sk�ho id \"%s\"\n"
@@ -2433,7 +2499,7 @@ msgstr "k��� %08lX: zmazan� viacn�sobn� revok�cia podk���a\n"
#: g10/import.c:1439
#, fuzzy, c-format
-msgid "key %s: skipped user ID '%s'\n"
+msgid "key %s: skipped user ID \"%s\"\n"
msgstr "k��� %08lX: identifik�tor u��vate�a presko�en� '"
#: g10/import.c:1460
@@ -2443,7 +2509,7 @@ msgstr "k��� %08lX: podk��� presko�en�\n"
#: g10/import.c:1487
#, fuzzy, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "k��� %08lX: podpis nie je exportovate�n� (trieda %02x) - presko�en�\n"
#: g10/import.c:1497
@@ -2478,114 +2544,114 @@ msgstr ""
"VAROVANIE: k��� %08lX m��e by� revokovan�: sk��am z�ska� revoka�n� k��� %"
"08lX\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"VAROVANIE: k��� %08lX m��e by� revokovan�: revoka�n� k��� %08lX nen�jden�.\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "k��� %08lX: pridan� revoka�n� certifik�t \"%s\"\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "k��� %08lX: podpis k���a n�m sam�m (direct key signature)\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[revok�cia]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[podpis k���a n�m sam�m]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "1 zl� podpis\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d zl�ch podpisov\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "1 podpis neoveren�, preto�e ch�ba k���\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d podpisov neoveren�ch, preto�e ch�ba k���\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "1 podpis neoveren�, preto�e vznikla chyba\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d podpisov neoveren�ch, preto�e vznikli chyby\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "zisten� 1 identifik�tor u��vate�a bez platn�ho podpisu n�m sam�m\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr ""
"zisten�ch %d identifik�torov u��vate�a bez platn�ho podpisu n�m sam�m\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, fuzzy, c-format
msgid " (%d) I trust marginally\n"
msgstr " %d = D�verujem �iasto�ne\n"
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, fuzzy, c-format
msgid " (%d) I trust fully\n"
msgstr " %d = D�verujem �plne\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "U��vate�sk� ID \"%s\" je revokovan�."
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr " Nemo�no podp�sa�.\n"
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "U��vate�sk� ID \"%s\" je revokovan�."
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "ID u��vate�a \"%s\" nie je podp�san� n�m sam�m."
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2594,11 +2660,11 @@ msgstr ""
"Podpis k���a \"%s\" n�m sam�m je\n"
"podpis vo form�te PGP 2.x.\n"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Prajete si ho zmeni� na form�t OpenPGP? (a/N) "
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2608,11 +2674,11 @@ msgstr ""
"je len lok�lny.\n"
"\n"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Chcete, aby platnos� V�ho podpisu vypr�ala v rovnakom �ase? (A/n) "
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2622,54 +2688,54 @@ msgstr ""
"je len lok�lny.\n"
"\n"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Prajete si ho zmeni� na plne exportovate�n� podpis? (a/N) "
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" je u� lok�lne podp�san� k���om %08lX\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" je u� podp�san� k���om %08lX\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Ni� na podp�sanie k���om %08lX\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "Platnos� k���a vypr�ala!"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Platnos� k���a vypr�� %s.\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Chcete, aby platnos� V�ho podpisu vypr�ala v rovnakom �ase? (A/n) "
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
msgstr ""
"Nem��ete vytvori� OpenPGP podpis k���a typu PGP 2.x, ke� ste v --pgp2 m�de.\n"
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "To by sp�sobilo nepou�itelnos� k���a v PGP 2.x.\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2679,31 +2745,31 @@ msgstr ""
"patr� vy��ie uvedenej osobe?\n"
"Pokia� nepozn�te odpove�, zadajte \"0\".\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Neodpoviem.%s\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) V�bec som to nekontroloval(a).%s\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) �iasto�ne som to overil(a).%s\n"
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Ve�mi d�kladne som to overil(a).%s\n"
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr "V� v�ber? ('?' - viac inform�ci�): "
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2711,7 +2777,7 @@ msgstr ""
"Ste si ist�, �e chcete podp�sa� tento k���\n"
"svoj�m k���om: \""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2719,7 +2785,7 @@ msgstr ""
"\n"
"Ide o podpis k���a n�m sam�m\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2727,7 +2793,7 @@ msgstr ""
"\n"
"VAROVANIE: podpis nebude ozna�en� ako neexportovate�n�.\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2735,7 +2801,7 @@ msgstr ""
"\n"
"VAROVANIE: podpis nebude ozna�en� ako neodvolate�n� (non-revocable).\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2744,7 +2810,7 @@ msgstr ""
"Podpis bude ozna�en� ako neexportovate�n�.\n"
"\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2752,7 +2818,7 @@ msgstr ""
"\n"
"Podpis bude ozna�en� ako neodvolate�n� (non-revocable).\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2760,7 +2826,7 @@ msgstr ""
"\n"
"V�bec som tento k��� neoveril.\n"
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2768,7 +2834,7 @@ msgstr ""
"\n"
"�iasto�ne som overil tento k���.\n"
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2776,34 +2842,34 @@ msgstr ""
"\n"
"Velmi d�kladne som overil tento k���.\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "Skuto�ne podp�sa�? "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "podpisovanie zlyhalo: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "Tento k��� nie je chr�nen�.\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "k��� je chr�nen�.\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Nie je mo�n� editova� tento k���: %s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2811,7 +2877,7 @@ msgstr ""
"Vlo�te nov� heslo (passphrase) pre tento tajn� k���.\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2819,544 +2885,566 @@ msgstr ""
"Nechcete heslo - to je *zl�* n�pad!\n"
"\n"
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "Skuto�ne to chcete urobi�? "
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "pres�vam podpis k���a na spr�vne miesto\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "ukon�i� toto menu"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "u"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "ulo�i�"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "ulo�i� a ukon�i�"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "help"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "uk�za� t�to pomoc"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "vyp�sa� fingerprint"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "list"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "vyp�sa� zoznam k���ov a id u��vate�ov"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "vyberte identifik�tor u��vate�a N"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "key"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "vyberte sekund�rny k��� N"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "check"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "vyp�sa� zoznam podpisov"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "c"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "podp�sa� k���"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "s"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "tsign"
msgstr "sign"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "make a trust signature"
msgstr "vytvori� podpis oddelen� od dokumentu"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "podp�sa� k��� lok�lne"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr "podp�sa� k��� bez mo�nosti odvola� podpis (non-revocably)"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "sign the key locally and non-revocably"
msgstr "podp�sa� k��� lok�lne a bez mo�nosti odvola� podpis (non-revocably)"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "prida� identifik�tor u��vate�a"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr "addphoto"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr "prida� fotografick� ID"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "zmaza� identifik�tor u��vate�a"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr "delphoto"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "prida� sekund�rny k���"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+#, fuzzy
+msgid "addcardkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "zmaza� sekund�rny k���"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "addrevoker"
msgstr "addrevoker"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "add a revocation key"
msgstr "prida� revoka�n� k���"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "zmaza� podpisy"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "zmeni� dobu platnosti"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr "primary"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr "ozna�i� u��vate�sk� ID ako prim�rne"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "prepn�� medzi vyp�san�m zoznamu tajn�ch a verejn�ch k���ov"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "t"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr "vyp�sa� zoznam predvolieb (pre expertov)"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr "vyp�sa� zoznam predvolieb (podrobne)"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr "nastavi� zoznam predvolieb"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr "aktualizova� predvo�by"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "keyserver"
msgstr "chyba servera k���ov"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "set preferred keyserver URL"
msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "zmeni� heslo"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "revokova� podpisy"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revuid"
msgstr "revsig"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revoke a user ID"
msgstr "revokova� identifik�tor u��vate�a"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "revokova� sekund�rny k���"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "nastavi� k��� ako neplatn� (disable)"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "nastavi� k��� ako platn� (enable)"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr "showphoto"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr "uk�za� fotografick� ID"
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "nemo�no previes� v d�vkovom m�de\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "chyba pri ��tan� bloku tajn�ho k���a `%s': %s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "Tajn� k��� je dostupn�.\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "Pr�kaz> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "Na vykonanie tejto oper�cie je potrebn� tajn� k���.\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr "Pros�m, najsk�r pou�ite pr�kaz \"toggle\" (prepn��).\n"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
msgid "Key is revoked."
msgstr "K��� revokovan�."
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "Skuto�ne podp�sa� v�etky id u��vate�a? "
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Tento pr�kaz nie je v m�doch %s dovolen�.\n"
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "Mus�te vybra� aspo� jedno id u��vate�a.\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "Nem��ete zmaza� posledn� id u��vate�a!\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "Skuto�ne odstr�ni� v�etky vybran� id u��vate�a? "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+#, fuzzy
+msgid "Really move the primary key? "
+msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
+
+#: g10/keyedit.c:1598
+#, fuzzy
+msgid "You must select exactly one key.\n"
+msgstr "Mus�te vybra� aspo� jeden k���.\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "Mus�te vybra� aspo� jeden k���.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "Skuto�ne chcete zmaza� tento k���? "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
msgid "Really revoke all selected user IDs? "
msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
msgid "Really revoke this user ID? "
msgstr "Skuto�ne revokova� toto id u��vate�a? "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "Skuto�ne chcete revokova� vybran� k���e? "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "Skuto�ne chcete revokova� tento k���? "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
#, fuzzy
msgid "Set preference list to:\n"
msgstr "nastavi� zoznam predvolieb"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr "Skuto�ne aktualizova� predvo�by? "
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "Ulo�i� zmeny? "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "Ukon�i� bez ulo�enia? "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "aktualiz�cia zlyhala: %s\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "k��� nebol zmenen�, tak�e nie je potrebn� ho aktualizova�.\n"
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr "Digest: "
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr "Charakteristiky: "
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keyedit.c:2219
#, c-format
msgid "This key may be revoked by %s key "
msgstr "Tento k��� m��e by� revokovan� k���om %s "
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr "(citliv� inform�cia)"
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "%s: nem��em vytvori�: %s\n"
-#: g10/keyedit.c:2084
-#, fuzzy, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
msgstr "[revokovan�]"
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
-msgstr " [platnos� skon��: %s]"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
+msgstr "expire"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2246
#, fuzzy, c-format
-msgid "expires: %s"
-msgstr " [platnos� skon��: %s]"
+msgid "usage: %s"
+msgstr " d�vera: %c/%c"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, fuzzy, c-format
msgid "trust: %s"
msgstr " d�vera: %c/%c"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "Tento k��� bol ozna�en� za neplatn� (disabled)"
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! podk��� bol revokovan�: %s\n"
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
-msgstr "rev- n�jden� falo�n� revok�cia\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? probl�m overenia revok�cie: %s\n"
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-#, fuzzy
-msgid "revoked"
-msgstr "[revokovan�]"
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-#, fuzzy
-msgid "expired"
-msgstr "expire"
+#: g10/keyedit.c:2300
+msgid "card-no: "
+msgstr ""
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "U��vate�sk� ID vo form�te PGP 2.x nem� �iadne predvo�by\n"
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3364,15 +3452,7 @@ msgstr ""
"Pros�m nezab�dajte, �e zobrazovan� �daje o platnosti k���ov nemusia\n"
"by� spr�vne, pokia� znovu nespust�te program.\n"
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-msgid "[revoked] "
-msgstr "[revokovan�]"
-
-#: g10/keyedit.c:2274
-msgid "[expired] "
-msgstr "[expirovan�]"
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@ -3380,7 +3460,7 @@ msgstr ""
"VAROVANIE: �iadne ID u��vate�a nebolo ozna�en� ako prim�rne. Tento pr�kaz\n"
"sp�sob�, �e in� ID u��vate�a sa bude pova�ova� prim�rne.\n"
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3389,45 +3469,45 @@ msgstr ""
"VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
" verzi�ch PGP vies� k odmietnutiu tohto k���a.\n"
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Ste si ist�, �e ho chcete st�le prida�? (a/N) "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Nemali by ste prid�va� fotografick� ID k PGP2 k���u.\n"
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "Zmaza� tento dobr� podpis? (a/N/u)"
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Zmaza� tento neplatn� podpis? (a/N/u)"
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Zmaza� tento nezn�my podpis? (a/N/u)"
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "Skuto�ne zmaza� tento podpis podp�san� sebou sam�m? (a/N)"
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Zmazan� %d podpis.\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Zmazan�ch %d podpisov.\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "Ni� nebolo zmaznan�.\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3436,88 +3516,98 @@ msgstr ""
"VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
" verzi�ch PGP vies� k odmietnutiu tohoto k���a.\n"
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Nemali by ste prid�va� fotografick� ID k PGP2 k���u.\n"
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
msgid "Enter the user ID of the designated revoker: "
msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "k��� vo form�te PGP 2.x nemo�no poveri� revok�ciou\n"
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "k��� nemo�no poveri� revok�ciou n�m sam�m\n"
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "VAROVANIE: Tento k��� bol revokovan� jeho ur�en�m revok�torom/!\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "VAROVANIE: ozna�enie k���a ako revokovac� u� nem��e by� zru�en�!\n"
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr "Ste si ist�, �e chcete ozna�i� tento k��� ako revokovac�? (a/N): "
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "Pros�m, odstr��te v�ber z tajn�ch k���ov.\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "Pros�m, vyberte najviac jeden sekund�rny k���.\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "Men�m dobu platnosti sekund�rneho k���a.\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "Men�m dobu platnosti prim�rneho k���a.\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Nem��ete zmeni� dobu platnosti k���a verzie 3\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
msgid "Please select exactly one user ID.\n"
msgstr "Pros�m, vyberte pr�ve jedno id u��vate�a.\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
-#, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "presko�en� v3 podpis k���a n�m sam�m u u��vate�sk�ho id \"%s\"\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+#, fuzzy
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
+
+#: g10/keyedit.c:3480
+#, fuzzy
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Neexistuje sekund�rny k��� s indexom %d\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "id u��vate�a: \""
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3526,7 +3616,7 @@ msgstr ""
"\"\n"
"podp�san� Va��m k���om %08lX v %s\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3535,143 +3625,127 @@ msgstr ""
"\"\n"
"lok�lne podp�san� Va��m k���om %08lX v %s\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Platnos� podpisu vypr�� %s.\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Ste si ist�, �e ho chcete st�le revokova�? (a/N) "
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? (a/N)"
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "Podp�sali ste nasleduj�ce identifik�tory u��vate�a:\n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid " signed by %s on %s%s%s\n"
msgstr " podp�san� %08lX v %s%s%s\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid " revoked by %s on %s\n"
msgstr " revokovan� %08lX v %s\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "Chyst�te sa revokova� tieto podpisy:\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, fuzzy, c-format
msgid " signed by %s on %s%s\n"
msgstr " podp�san� %08lX v %s%s\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr " (nexeportovate�n�)"
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
msgid "Really create the revocation certificates? (y/N) "
msgstr "Skuto�ne vytvori� revoka�n� certifik�ty? (a/N) "
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "neexistuje tajn� k���\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "VAROVANIE: podpis pou�ivate�k�ho ID vznikol %d sekund v bud�cnosti\n"
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Zobrazujem %s fotografick� ID s ve�kos�ou %ld pre k��� 0x%08lX (uid %d)\n"
-#: g10/keylist.c:179
+#: g10/keylist.c:180
msgid "Critical signature policy: "
msgstr "Kritick� podpisov� politika: "
-#: g10/keylist.c:181
+#: g10/keylist.c:182
msgid "Signature policy: "
msgstr "Podpisov� politika: "
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "VAROVANIE: n�jden� neplatn� form�t z�pisu d�tumu\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
msgid "Critical signature notation: "
msgstr "Kritick� podpisov� not�cia: "
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr "Podpisov� not�cia: "
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr "nie je v priamo �itate�nom form�te"
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr "s�bor k���ov (keyring)"
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr " [platnos� skon��: %s]"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr " [platnos� skon��: %s]"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, fuzzy, c-format
-msgid " [revoked: %s]"
-msgstr "[revokovan�]"
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
msgid "Primary key fingerprint:"
msgstr "Prim�rny fingerprint k���a:"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
msgid " Subkey fingerprint:"
msgstr " Fingerprint podk���a:"
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
msgid " Primary key fingerprint:"
msgstr " Prim�rny fingerprint k���a:"
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
msgid " Subkey fingerprint:"
msgstr " Fingerprint podk���a:"
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr " Fingerprint k���a ="
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3883,81 +3957,81 @@ msgstr "podpis star�ho typu (PGP 2.x)\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "n�jden� neplatn� kore�ov� paket v proc_tree()\n"
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "nem��em vypn�� vytv�ranie core s�borov: %s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "Experiment�lne algoritmy by sa nemali pou��va�!\n"
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"tento �ifrovac� algoritmus je zastaral�; pros�m, pou�ite nejak� "
"�tandardnej��!\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr "IDEA modul pre GnuPG nen�jden�\n"
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr ""
"viac inform�ci� n�jdete v dokumente http://www.gnupg.cz/why-not-idea.html\n"
-#: g10/misc.c:491
+#: g10/misc.c:517
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: pou�itie parametra \"%s\" sa neodpor��a\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "pou�ite namiesto neho \"%s%s\" \n"
-#: g10/misc.c:508
+#: g10/misc.c:534
msgid "Uncompressed"
msgstr "Nekomprimovan�"
-#: g10/misc.c:533
+#: g10/misc.c:559
#, fuzzy
msgid "uncompressed|none"
msgstr "Nekomprimovan�"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "t�to spr�va nemus� pou�ite�n� s %s\n"
-#: g10/misc.c:777
+#: g10/misc.c:826
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "��tam mo�nosti z `%s'\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "nezn�my implicitn� adres�t `%s'\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "nem��em pracova� s algoritmom verejn�ho k���a %d\n"
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
"VAROVANIE: pravdepodobne nebezpe�n� symetricky �ifrovan� k��� sedenia\n"
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
@@ -3996,7 +4070,7 @@ msgstr "nem��em sa pripoji� k `%s': %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "probl�m v komunik�cii s gpg-agentom\n"
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr "probl�m s agentom - pou��vanie agenta vypnut�\n"
@@ -4032,24 +4106,24 @@ msgstr "heslo je pr�li� dlh�\n"
msgid "invalid response from agent\n"
msgstr "neplatn� reakcia od agenta\n"
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "zru�en� u��vate�om\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "probl�m s agentom: agent vracia 0x%lx\n"
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "v d�vkovom re�ime sa nem��em p�ta� na heslo\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "Vlo�te heslo: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4059,22 +4133,22 @@ msgstr ""
"Mus�te pozna� heslo, aby ste odomkli tajn� k��� pre\n"
"u��vate�a: \""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "d�ka %u bitov, typ %s, ID %08lX, vytvoren� %s"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (hlavn� ID k���a %08lX)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "Opakujte heslo: "
@@ -4295,28 +4369,39 @@ msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
"v m�de --pgp2 m��ete vytvori� len oddelen� podpis k���a vo form�te PGP-2.x\n"
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
-msgstr "%s: nem��em vytvori�: %s\n"
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
+msgstr "nem��em vytvori� `%s': %s\n"
-#: g10/sign.c:794
-#, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+#: g10/sign.c:771 g10/sign.c:1008
+#, fuzzy, c-format
+msgid "writing to file `%s'\n"
+msgstr "zapisujem do '%s'\n"
+
+#: g10/sign.c:795
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr "podpisujem:"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "nemo�no otvori� s�bor: %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
"v m�de --pgp2 m��ete vytv�ra� �itate�n� podpisy len s k���mi form�tu PGP-2."
"x\n"
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr "bude pou�it� �ifrovanie %s\n"
@@ -4715,7 +4800,7 @@ msgstr ""
"nem��em sa vyvarova� slab�ho k���a pre symetrick� �ifru; oper�ciu som sk�sil "
"%d kr�t!\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA po�aduje pou�itie 160 bitov�ho hashovacieho algoritmu\n"
@@ -5081,17 +5166,17 @@ msgstr "Pomoc nie je k dispoz�cii"
msgid "No help available for `%s'"
msgstr "Pomoc nie je dostupn� pre '%s'"
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr "s�bor k���ov (keyring) `%s' vytvoren�\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
@@ -5134,8 +5219,7 @@ msgstr "%lu k���ov skontrolovan�ch (%lu podpisov)\n"
msgid "%s: keyring created\n"
msgstr "%s: s�bor k���ov (keyring) vytvoren�\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5150,29 +5234,34 @@ msgstr ""
"Ak pou�ijete ve�mi ve�k� obr�zok, k��� bude tie� ve�k�! Odpor��an� ve�kos�\n"
"obr�zka je okolo 240x288.\n"
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr "Meno s�bor s fotografiou vo form�te JPEG: "
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "Nemo�no otvori� fotografiu \"%s\": %s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
msgid "Are you sure you want to use it (y/N)? "
msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr "\"%s\" nie je s�bor JPEG\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Is this photo correct (y/N/q)? "
msgstr "Je t�to fotografia spr�vna (a/N/u)? "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
msgid "unable to display photo ID!\n"
msgstr "nemo�no nastavi� exec-path na %s\n"
@@ -5193,44 +5282,50 @@ msgstr ""
"nastaven�\n"
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
+#, fuzzy
+msgid "this platform requires temporary files when calling external programs\n"
msgstr ""
"t�to platforma potrebuje do�asn� s�bory na spustenie extern�ho programu\n"
-#: g10/exec.c:432
-#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
msgstr "nemo�no spusti� %s \"%s\": %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:436
+#, fuzzy, c-format
+msgid "unable to execute shell `%s': %s\n"
+msgstr "nemo�no spusti� %s \"%s\": %s\n"
+
+#: g10/exec.c:515
#, c-format
msgid "system error while calling external program: %s\n"
msgstr "syst�mov� chyba pri volan� extern�ho programu: %s\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr "nekorektn� ukon�enie extern�ho programu\n"
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr "nemo�no spusti� extern� program\n"
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr "nemo�no c�ta� odozvu extern�ho programu: %s\n"
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "VAROVANIE: nem��em vymaza� do�asn� adres�r `%s': %s\n"
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr "nikdy "
@@ -5385,6 +5480,47 @@ msgstr "chyba pri h�adan� z�znamu d�very: %s\n"
msgid "read error: %s\n"
msgstr "chyba pri ��tan�: %s\n"
+#, fuzzy
+#~ msgid "revoked: %s"
+#~ msgstr "[revokovan�]"
+
+#, fuzzy
+#~ msgid "expired: %s"
+#~ msgstr " [platnos� skon��: %s]"
+
+#, fuzzy
+#~ msgid "expires: %s"
+#~ msgstr " [platnos� skon��: %s]"
+
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "rev! podk��� bol revokovan�: %s\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "rev- n�jden� falo�n� revok�cia\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "rev? probl�m overenia revok�cie: %s\n"
+
+#~ msgid "[revoked] "
+#~ msgstr "[revokovan�]"
+
+#~ msgid "[expired] "
+#~ msgstr "[expirovan�]"
+
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr " [platnos� skon��: %s]"
+
+#~ msgid " [expires: %s]"
+#~ msgstr " [platnos� skon��: %s]"
+
+#, fuzzy
+#~ msgid " [revoked: %s]"
+#~ msgstr "[revokovan�]"
+
+#~ msgid "can't create %s: %s\n"
+#~ msgstr "%s: nem��em vytvori�: %s\n"
+
#~ msgid ""
#~ "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n"
#~ msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 7ed61ac4b..9f8dbf8f8 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.1\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
"PO-Revision-Date: 2003-12-03 16:11+0100\n"
"Last-Translator: Per Tunedal <[email protected]>\n"
"Language-Team: Swedish <[email protected]>\n"
@@ -61,7 +61,7 @@ msgstr "nej"
msgid "nN"
msgstr "nN"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "avsluta"
@@ -295,6 +295,16 @@ msgstr "oanv�ndbar hemlig nyckel"
msgid "keyserver error"
msgstr "nyckelserverfel"
+#: util/errors.c:108
+#, fuzzy
+msgid "canceled"
+msgstr "avbruten av anv�ndaren\n"
+
+#: util/errors.c:109
+#, fuzzy
+msgid "no card"
+msgstr "inte krypterad"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr ""
@@ -317,7 +327,7 @@ msgstr "du har hittat ett fel i programmet ... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr ""
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "kan inte �ppna \"%s\": %s\n"
@@ -349,7 +359,7 @@ msgstr "kan inte l�sa \"%s\": %s\n"
msgid "note: random_seed file not updated\n"
msgstr "notera: random_seed uppdaterades inte\n"
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr "kan inte skapa \"%s\": %s\n"
@@ -417,7 +427,7 @@ msgstr ""
msgid "can't generate a prime with less than %d bits\n"
msgstr ""
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -425,128 +435,128 @@ msgstr ""
"@Kommandon:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[fil]|skapa en signatur"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[fil]|skapa en klartext-signatur"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "skapa en signatur i en separat fil"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "kryptera data"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "endast symetrisk kryptering"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "dekryptera data (normall�ge)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "verifiera en signatur"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "r�kna upp nycklar"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "r�kna upp nycklar och signaturer"
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "verifiera nyckelsignaturer"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "r�kna upp nycklar och fingeravtryck"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "r�kna upp hemliga nycklar"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "generera ett nytt nyckelpar"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "ta bort nycklar fr�n den offentliga (publika)nyckelringen"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "ta bort nycklar fr�n den hemliga nyckelringen"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "signera en nyckel"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "signera en nyckel lokalt"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "signera eller redigera en nyckel"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "generera ett sp�rrcertifikat"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "exportera nycklar"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "exportera nycklar till en nyckelserver"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "importera nycklar fr�n en nyckelserver"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "s�k efter nycklar hos en nyckelserver"
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "uppdatera alla nycklar nycklar fr�n en nyckelserver"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "importera/sl� ihop nycklar"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "uppdatera tillitsdatabasen"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|algo [filer]|skriv ut kontrollsummor"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -556,55 +566,51 @@ msgstr ""
"Flaggor:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "skapa utdata med ett ascii-skal"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|NAMN|kryptera f�r NAMN"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr "anv�nd denna anv�ndaridentitet f�r att signera eller dekryptera"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr "|N|s�tt kompressionsniv�n till N (0 f�r att sl� av kompression)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "anv�nd \"ursprunglig text\"-l�get"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "anv�nd som fil f�r utdata"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "utf�rlig"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "g�r inga �ndringar"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr ""
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -612,7 +618,7 @@ msgstr ""
"@\n"
"(Se manualsidan f�r en komplett lista p� alla kommandon och flaggor)\n"
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -632,17 +638,17 @@ msgstr ""
"--list-keys [namn] visa nycklar\n"
"--fingerprint [namn] visa fingeravtryck\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Rapportera g�rna fel till <[email protected]>.\n"
"Rapportera g�rna fel eller synpunkter p� �vers�ttningen till <[email protected]>.\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Anv�ndning: gpg [flaggor] [filer] (-h f�r hj�lp)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -652,7 +658,7 @@ msgstr ""
"signera, kontrollera, kryptera eller dekryptera\n"
"vilken operation som utf�rs beror p� programmets indata\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -660,250 +666,249 @@ msgstr ""
"\n"
"St�dda algoritmer:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr ""
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr ""
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr ""
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
#, fuzzy
msgid "Compression: "
msgstr "Kommentar: "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "anv�ndning: gpg [flaggor] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "motstridiga kommandon\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr ""
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "VARNING: %s os�ker �gare till %s\n"
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "VARNING: %s os�ker �gare till %s\n"
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "VARNING: %s os�ker �gare till %s\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "VARNING: %s os�ker �gare till %s\n"
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "VARNING: %s os�ker �gare till %s\n"
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "VARNING: %s os�ker �gare till %s\n"
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "VARNING: %s os�ker �gare till %s\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "VARNING: %s os�ker �gare till %s\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "VARNING: %s os�ker �gare till %s\n"
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "VARNING: %s os�ker �gare till %s\n"
-#: g10/g10.c:1205
-#, c-format
+#: g10/g10.c:1210
+#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
-msgstr ""
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
+msgstr "VARNING: %s os�ker �gare till %s\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "VARNING: %s os�ker �gare till %s\n"
-#: g10/g10.c:1334
+#: g10/g10.c:1354
#, fuzzy, c-format
-msgid "unknown configuration item \"%s\"\n"
+msgid "unknown configuration item `%s'\n"
msgstr "%s: ny inst�llningsfil skapad\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "OBSERVERA: inst�llningsfilen \"%s\" anv�nds inte\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "OBSERVERA: inst�llningsfilen \"%s\" saknas\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "inst�llningsfil \"%s\": %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "l�ser flaggor fr�n \"%s\"\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "OBSERVERA: %s �r inte f�r normal anv�ndning!\n"
-#: g10/g10.c:1887
+#: g10/g10.c:2021
#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr ""
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "%s �r ingen giltig teckentabell\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "kunde inte tolka nyckelserver-URI\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s: felaktiga exportalternativ %d\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "felaktiga exportalternativ\n"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s: felaktiga importalternativ %d\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
msgid "invalid import options\n"
msgstr "felaktiga importalternativ\n"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s: felaktiga exportalternativ %d\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
msgid "invalid export options\n"
msgstr "felaktiga exportalternativ\n"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s: felaktiga importalternativ %d\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "felaktiga importalternativ\n"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s: felaktiga exportalternativ %d\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "felaktiga exportalternativ\n"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "kunde inte s�tta exec-s�kv�gen till %s\n"
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VARNING: %s g�ller ist�llet f�r %s\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s �r inte till�ten tillsammans med %s!\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "det �r ingen po�ng att anv�nda %s tillsammans med %s!\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"du kan bara skapa fr�nkopplade signaturereller klartextsignaturer\n"
"tillsammans med --pgp2\n"
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
"du kan inte b�de signera och kryptera samtidigt tillsammans med --pgp2\n"
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "du m�ste anv�nda filer (och inte r�r) tillsammans med --pgp2\n"
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
"f�r att kryptera meddelanden med --pgp2 kr�vs IDEA-insticksprogrammet\n"
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "den valda krypteringsalgoritmen �r ogiltig\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "den valda kontrollsummealgoritmen �r ogiltig\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "den valda krypteringsalgoritmen �r ogiltig\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
msgid "selected certification digest algorithm is invalid\n"
msgstr "den valda kontrollsummealgoritmen �r ogiltig\n"
@@ -913,230 +918,223 @@ msgstr "den valda kontrollsummealgoritmen �r ogiltig\n"
# �r �nd� litet. Eventuellt borde meddelandena inte alls
# �vers�ttas f�r att g�ra eventuell fels�kning l�ttare
# f�r internationella fels�kare
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr "variabeln \"completes-needed\" m�ste ha ett v�rde som �r st�rre �n 0\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr "variabeln \"marginals-needed\" m�ste vara st�rre �n 1\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "variabeln \"max-cert-depth\" m�ste ha ett v�rde mellan 1 och 255\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
#, fuzzy
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "ogiltig standardv�rde f�r test-niv�; m�ste vara 0, 1, 2 eller 3\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
#, fuzzy
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "ogiltig standardv�rde f�r test-niv�; m�ste vara 0, 1, 2 eller 3\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "OBSERVERA: enkelt S2K-l�ge (0) rekommenderas inte\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ogiltigt S2K-l�ge; m�ste vara 0, 1 eller 3\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
msgid "invalid default preferences\n"
msgstr "ogiltiga standardinst�llningar\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
msgid "invalid personal cipher preferences\n"
msgstr "felaktiga inst�llningar av krypteringsalgoritm\n"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
msgid "invalid personal digest preferences\n"
msgstr "felaktiga inst�llningar av checksummealgoritm\n"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
msgid "invalid personal compress preferences\n"
msgstr "felaktiga inst�llningar av kompressionsalgoritm\n"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "det �r ingen po�ng att anv�nda %s tillsammans med %s!\n"
-#: g10/g10.c:2680
+#: g10/g10.c:2797
#, fuzzy, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "du kan inte anv�nda %s n�r du �r i %s l�ge\n"
-#: g10/g10.c:2685
+#: g10/g10.c:2802
#, fuzzy, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "du kan inte anv�nda %s n�r du �r i %s l�ge\n"
-#: g10/g10.c:2690
+#: g10/g10.c:2807
#, fuzzy, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "du kan inte anv�nda %s n�r du �r i %s l�ge\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"VARNING: Du har valt mottagare (-r) trots att symetrisk kryptering valts\n"
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [filnamn]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [filnamn]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [filnamn]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [filnamn]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "du kan inte anv�nda %s n�r du �r i %s l�ge\n"
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [filnamn]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnamn]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [filnamn]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "du kan inte anv�nda %s n�r du �r i %s l�ge\n"
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filnamn]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [filnamn]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [filnamn]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key anv�ndaridentitet"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key anv�ndaridentitet"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrsign-key anv�ndaridentitet"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key anv�ndaridentitet"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key anv�ndaridentitet [kommandon]"
-# Filnamn b�de med och utan fnuttar finns. lite ologiskt. Vill n�gon
-# fixa en patch?
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "kan inte �ppna %s: %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [anv�ndaridentitet] [nyckelring]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "Nyckelgenereringen misslyckades: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "Nyckelgenereringen misslyckades: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "Nyckelgenereringen misslyckades: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "Nyckelgenereringen misslyckades: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "misslyckades med att uppdatera hemligheten: %s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "misslyckades med att ta bort skalet: %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "misslyckades med att skapa skal: %s\n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "felaktig hash-algoritm \"%s\"\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[filnamn]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "Skriv ditt meddelande h�r ...\n"
# se f�rra kommentaren
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "kan inte �ppna \"%s\"\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@ -1144,52 +1142,52 @@ msgstr ""
"ett notationsnamn kan bara inneh�lla bokst�ver, siffror, punkter eller\n"
"understrykningstecken och sluta med ett likhetstecken\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
#, fuzzy
msgid "a user notation name must contain the '@' character\n"
msgstr "ett notationsv�rde f�r inte ineh�lla n�gra kontrolltecken\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "ett notationsv�rde f�r inte ineh�lla n�gra kontrolltecken\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr "den angivna URL som beskriver certifikationspolicy �r ogiltig\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr "den angivna URL som beskriver signaturpolicy �r ogiltig\n"
-#: g10/g10.c:3747
+#: g10/g10.c:3863
#, fuzzy
-msgid "the given signature preferred keyserver URL is invalid\n"
+msgid "the given preferred keyserver URL is invalid\n"
msgstr "den angivna URL som beskriver signaturpolicy �r ogiltig\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "var n�got tystare"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
#, fuzzy
msgid "take the keys from this keyring"
msgstr "Vill du ta bort denna nyckel fr�n nyckelringen? "
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
#, fuzzy
msgid "make timestamp conflicts only a warning"
msgstr "konflikt mellan tidsst�mplar"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr "|FD|skriv statusinformation till denna FD"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
#, fuzzy
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Anv�ndning: gpg [flaggor] [filer] (-h f�r hj�lp)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1221,12 +1219,13 @@ msgid "invalid dash escaped line: "
msgstr "felaktig bindestreck-kodad rad: "
#: g10/armor.c:565
-msgid "unexpected armor:"
+#, fuzzy
+msgid "unexpected armor: "
msgstr "ov�ntat skal:"
-#: g10/armor.c:695 g10/armor.c:1276
-#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+#: g10/armor.c:695 g10/armor.c:1280
+#, fuzzy, c-format
+msgid "invalid radix64 character %02X skipped\n"
msgstr "ogiltigt radix64-tecken %02x hoppades �ver\n"
#: g10/armor.c:738
@@ -1237,33 +1236,34 @@ msgstr "f�r tidigt filslut (ingen CRC-summa)\n"
msgid "premature eof (in CRC)\n"
msgstr "f�r tidigt filslut (i CRC-summan)\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "felformaterad CRC-summa\n"
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC-fel; %06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+#, fuzzy
+msgid "premature eof (in trailer)\n"
msgstr "f�r tidigt filslut (i den avslutande raden)\n"
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "fel i avslutande rad\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "hittade ingen giltig OpenPGP-data.\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "felaktigt skal: raden �r l�ngre �n %d tecken\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1322,7 +1322,7 @@ msgstr " �ven k�nd som \""
msgid " aka \""
msgstr " �ven k�nd som \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1584,97 +1584,117 @@ msgstr "%s: hoppade �ver: den offentliga (publika) nyckeln �r deaktiverad\n"
msgid "no valid addressees\n"
msgstr "inga giltiga adresser\n"
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "inst�llningen %c%lu �r dubblerad\n"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "f�r m�nga `%c' inst�llningar\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
#, fuzzy
msgid "too many digest preferences\n"
msgstr "f�r m�nga `%c' inst�llningar\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
#, fuzzy
msgid "too many compression preferences\n"
msgstr "f�r m�nga `%c' inst�llningar\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "Ogiltigt tecken i inst�llningsstr�ngen\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
#, fuzzy
msgid "writing direct signature\n"
msgstr "skriver sj�lvsignatur\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "skriver egensignatur\n"
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "skriver signatur knuten till nyckeln\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "ogiltig nyckelstorlek; anv�nder %u bitar\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "nyckelstorleken avrundad upp�t till %u bitar\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "V�lj vilken typ av nyckel du vill ha:\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA och ElGamal (standardvalet)\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (endast signering)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (endast kryptering)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (endast signering)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (endast kryptering)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (signering och kryptering)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, fuzzy, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) RSA (endast signering)\n"
+
+#: g10/keygen.c:1224
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) RSA (signering och kryptering)\n"
+
+#: g10/keygen.c:1226
+#, fuzzy, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) RSA (endast kryptering)\n"
+
+#: g10/keygen.c:1228
+#, fuzzy, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) RSA (signering och kryptering)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "Vad v�ljer du? "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "Felaktigt val.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1687,29 +1707,29 @@ msgstr ""
" den f�rvalda nyckelstorleken �r 1024 bitar\n"
" den st�rsta f�reslagna nyckelstorleken �r 2048 bitar\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "Vilken nyckelstorlek vill du ha? (1024) "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
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:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr ""
"nyckelstorleken �r f�r liten; 1024 �r det minsta till�tna v�rdet f�r RSA.\n"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "nyckelstorleken �r f�r liten; 768 �r det minsta till�tna v�rdet.\n"
-#: g10/keygen.c:1255
+#: g10/keygen.c:1328
#, 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:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1717,11 +1737,11 @@ msgstr ""
"Nyckelstorlekar st�rre �n 2048 �r inte att rekommendera\n"
"eftersom ber�kningar tar MYCKET l�ng tid!\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "�r du s�ker p� att du vill ha denna nyckelstorlek? "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1729,18 +1749,18 @@ 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:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "Den efterfr�gade nyckelstorleken �r %u bitar\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, 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:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1757,7 +1777,7 @@ msgstr ""
" <n>y = nyckeln blir ogiltig efter n �r\n"
# borde kolla upp m�jligheterna i k�llkoden att anv�nda v m � ist�llet f�r wmy
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1773,29 +1793,29 @@ msgstr ""
" <n>m = signaturen blir ogiltig efter n m�nader\n"
" <n>y = signaturen blir ogiltig efter n �r\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "F�r hur l�ng tid �r nyckeln giltig? (0) "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr "F�r hur l�ng tid �r signaturen giltig? (0) "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "ogiltigt v�rde\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr "Giltighetstiden f�r %s g�r aldrig ut\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr "Giltighetstiden f�r %s g�r ut vid f�ljande tidpunkt: %s\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1803,16 +1823,17 @@ 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:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "St�mmer detta (j/n)? "
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
+#, fuzzy
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
@@ -1823,44 +1844,44 @@ msgstr ""
" \"Gustav Vasa (Brutal kung) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "Namn: "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "Ogiltigt tecken i namnet\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr "Namnet f�r inte b�rja med en siffra\n"
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr "Namnet m�ste vara �tminstone 5 tecken l�ngt\n"
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "Epostadress: "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "Epostadressen �r ogiltig\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "Kommentar: "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "Ogiltigt tecken i kommentaren\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "Du anv�nder teckenupps�ttningen \"%s\"\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1871,28 +1892,28 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
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:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "NnKkEeOoAa"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
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:1542
+#: g10/keygen.c:1615
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:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr "R�tta f�rst felet\n"
# fel kapitalisering i originalet?
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1900,16 +1921,16 @@ msgstr ""
"Du beh�ver en l�senmening f�r att skydda din hemliga nyckel\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr "l�senmeningen upprepades inte korrekt; f�rs�k igen."
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1920,7 +1941,7 @@ msgstr ""
"Jag kommer att g�ra det �nd�. Du kan �ndra din l�senmening n�r som helst\n"
"om du anv�nder detta program med flaggan \"--edit-key\".\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1932,59 +1953,59 @@ 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:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
#, fuzzy
msgid "sorry, can't do this in batch mode\n"
msgstr "kan inte g�ra detta i batch-l�ge\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA-nyckelparet kommer att ha 1024 bitar.\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "Skapandet av nycklar avbr�ts.\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr "skriver offentlig (publik) nyckel till \"%s\"\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "skriver hemlig nyckel till \"%s\"\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "skriver hemlig nyckel till \"%s\"\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "hittade ingen offentlig (publik) nyckelring: %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "fel vid skrivning av offentliga (publika) nyckelringen \"%s\": %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "offentlig (publik) och hemlig nyckel �r skapade och signerade.\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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"
@@ -1993,13 +2014,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:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Nyckelgenereringen misslyckades: %s\n"
# c-format beh�vs inte i singularis
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@ -2007,7 +2028,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:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -2015,14 +2036,43 @@ msgstr ""
"nyckeln �r skapad %lu sekunder in i framtiden (problemet �r\n"
"relaterat till tidsresande eller en felst�lld klocka)\n"
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "OSERVERA: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n"
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "Vill du verkligen skapa? "
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "numrering av nyckelblock misslyckades: %s\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "kan inte skapa \"%s\": %s\n"
+
+#: g10/keygen.c:3248
+#, fuzzy, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "OBSERVERA: den hemliga nyckeln %08lX gick ut %s\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "--output kan inte anv�ndas f�r detta kommando\n"
@@ -2033,7 +2083,7 @@ msgstr "--output kan inte anv�ndas f�r detta kommando\n"
msgid "%s: can't open: %s\n"
msgstr "%s: kan inte �ppna: %s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "fel vid skapandet av l�senmening: %s\n"
@@ -2063,6 +2113,13 @@ msgstr ""
"du kan endast krypterar till RSA nycklar som �r h�gst 2048 bitar l�nga i --"
"pgp2-l�ge\n"
+# Filnamn b�de med och utan fnuttar finns. lite ologiskt. Vill n�gon
+# fixa en patch?
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "kan inte �ppna %s: %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -2073,26 +2130,36 @@ msgid ""
"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
msgstr "kan inte anv�nda IDEA-kryptering f�r alla nycklar du krypterar till.\n"
-#: g10/encode.c:526 g10/encode.c:721
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#: g10/encode.c:526
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"att kr�va symetrisk kryptering med %s (%d) strider mot mottagarnas "
"inst�llningar\n"
-#: g10/encode.c:634 g10/sign.c:863
-#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+#: g10/encode.c:634 g10/sign.c:864
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
msgstr ""
"att genomdriva komprimeringsalgoritm %s (%d) strider mot mottagarens "
"inst�llningar\n"
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"att kr�va symetrisk kryptering med %s (%d) strider mot mottagarnas "
+"inst�llningar\n"
+
#: g10/encode.c:818
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s krypterad f�r: \"%s\"\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, fuzzy, c-format
msgid "key `%s' not found: %s\n"
msgstr "anv�ndaren \"%s\" hittades inte: %s\n"
@@ -2125,8 +2192,9 @@ msgstr "VARNING: exporterade ingenting\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "f�r m�nga poster i pk-cachen - inaktiverad\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+#, fuzzy
+msgid "[User ID not found]"
msgstr "[Hittade inte anv�ndaridentiteten]"
#: g10/getkey.c:1614
@@ -2284,7 +2352,7 @@ msgstr "nyckel %08lX: HKP-skadad undernyckel reparerad\n"
# vad inneb�r fnutten i slutet?
#: g10/import.c:722
#, fuzzy, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr ""
"nyckel %08lX: accepterade anv�ndaridentitet ID '%s' som saknar egensignatur\n"
@@ -2312,7 +2380,7 @@ msgstr "nyckeln %08lX: ny nyckel - �verhoppad\n"
msgid "no writable keyring found: %s\n"
msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "skriver till \"%s\"\n"
@@ -2430,13 +2498,13 @@ msgstr "nyckel %08lX: ingen anv�ndaridentitet f�r signaturen\n"
# fixme: I appended the %s -wk
#: g10/import.c:1299
#, fuzzy, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"nyckel %08lX: algoritmen f�r offentlig (publik) nyckel st�ds inte (\"%s\")\n"
#: g10/import.c:1301
#, fuzzy, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "nyckel %08lX: ogiltig egensignatur\n"
#: g10/import.c:1319
@@ -2476,7 +2544,7 @@ msgstr "nyckel %08lX: tog bort ogiltig sp�rr av undernyckel\n"
#: g10/import.c:1439
#, fuzzy, c-format
-msgid "key %s: skipped user ID '%s'\n"
+msgid "key %s: skipped user ID \"%s\"\n"
msgstr "nyckel %08lX: hoppade �ver anv�ndaridentitet '"
#: g10/import.c:1460
@@ -2486,7 +2554,7 @@ msgstr "nyckel %08lX: hoppade �ver undernyckel\n"
#: g10/import.c:1487
#, fuzzy, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "nyckel %08lX: icke exporterbar signatur (klass %02x) - hoppade �ver\n"
#: g10/import.c:1497
@@ -2523,113 +2591,113 @@ msgstr "nyckel %08lX: anv�ndaridentitet hittades tv� g�nger - slog ihop\n"
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "VARNING: nyckeln %08lX kan ha sp�rrats: H�mtar sp�rrnyckel %08lX\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "VARNING: nyckeln %08lX kan ha sp�rrats: Sp�rrnyckeln %08lX saknas.\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "nyckel %08lX: lade till sp�rrcertifikat (revocation certificate)\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "nyckel %08lX: %d nya signaturer\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[sp�rrad]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[egensignatur]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "1 felaktig signatur\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d felaktiga signaturer\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "1 signatur verifierades inte eftersom nyckeln saknades\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d signaturer verifierades inte eftersom nycklar saknades\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "1 signatur verifierades inte eftersom ett fel uppstod\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d signaturer verifierades inte eftersom fel uppstod\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "1 anv�ndaridentitet utan giltig egensignatur hittades\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "%d anv�ndaridentiteter utan giltig egensignatur hittades\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, fuzzy, c-format
msgid " (%d) I trust marginally\n"
msgstr " %d = Jag litar maginellt p� denna anv�ndare\n"
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, fuzzy, c-format
msgid " (%d) I trust fully\n"
msgstr " %d = Jag litar fullst�ndigt p� denna anv�ndare\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Anv�ndar-ID \"%s\" �r sp�rrat."
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
#, fuzzy
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "�r du s�ker p� att du vill ha denna nyckelstorlek? "
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr " Kan inte signera.\n"
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, fuzzy, c-format
msgid "User ID \"%s\" is expired."
msgstr "Anv�ndar-ID \"%s\" �r sp�rrat."
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, fuzzy, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "VARNING: anv�ndar-ID \"%s\" saknar egensignatur.\n"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2638,69 +2706,69 @@ msgstr ""
"Egensignaturen p� \"%s\"\n"
"�r en signatur av PGP 2.x-typ.\n"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Will du g�ra om den till en egensignatur av OpenPGP-typ? (j/N) "
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"has expired.\n"
msgstr ""
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
#, fuzzy
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Vill du att giltighetstiden f�r signaturen ska upph�ra vid samma tid? (J/n) "
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"is a local signature.\n"
msgstr ""
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Vill du �ndra den till en fullst�ndigt exporterbar signatur? (j/N) "
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" var redan signerad lokalt av nyckeln %08lX\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "Redan signerad av nyckeln %08lX\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
#, fuzzy
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "�r du s�ker p� att du vill ha denna nyckelstorlek? "
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Det finns inget att signera med nyckeln %08lX\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "Notera: Giltighetstiden f�r denna nyckel har g�tt ut!"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Denna nyckels giltighetstid g�r ut vid %s.\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr ""
"Vill du att giltighetstiden f�r signaturen ska upph�ra vid samma tid? (J/n) "
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
@@ -2708,11 +2776,11 @@ msgstr ""
"Du kan inte g�ra en OpenPGP-signatur p� en PGP 2.x-nyckel n�r du �r i --pgp2-"
"l�ge\n"
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "Detta skulle g�ra nyckeln oanv�ndbar i PGP 2.x.\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2721,32 +2789,32 @@ msgstr ""
"Hur noga har du kontrollerat att nyckeln du ska signera verkligen tillh�r\n"
"personen som n�mns ovan? Om du inte vet vad du ska svara, svara \"0\".\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr ""
" (0) Jag vill inte ange hur noga jag har kontrollerat identiteten.%s\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Jag har inte kontrollerat identiteten alls.%s\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Jag har gjort viss kontroll av identiteten.%s\n"
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Jag har gjort en noggrann kontroll av identiteten.%s\n"
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr ""
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2754,7 +2822,7 @@ msgstr ""
"�r du verkligen s�ker p� att du vill signera denna nyckel\n"
"med din nyckel: \""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2762,7 +2830,7 @@ msgstr ""
"\n"
"Detta kommer att bli en egensignatur\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2771,7 +2839,7 @@ msgstr ""
"VARNING: Signaturen kommer att markeras som icke exporterbar.\n"
"\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2780,7 +2848,7 @@ msgstr ""
"VARNING: Signaturen kommer att markeras som icke m�jlig att �terkalla.\n"
"\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2789,7 +2857,7 @@ msgstr ""
"Signaturen kommer att markeras som icke exporterbar.\n"
"\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2798,7 +2866,7 @@ msgstr ""
"Signaturen kommer att markeras som icke m�jlig att �terkalla.\n"
"\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2806,7 +2874,7 @@ msgstr ""
"\n"
"Jag har inte kontrollerat identiteten alls.\n"
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2814,7 +2882,7 @@ msgstr ""
"\n"
"Jag har gjort viss kontroll av identiteten.\n"
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2822,34 +2890,34 @@ msgstr ""
"\n"
"Jag har gjort en noggrann kontroll av identiteten.\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "Vill du verkligen signera? "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "signeringen misslyckades: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "Denna nyckel �r inte skyddad.\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr "De hemliga delarna av den prim�ra nyckeln �r inte tillg�ngliga.\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "Nyckeln �r skyddad.\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Kan inte redigera denna nyckel: %s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2857,7 +2925,7 @@ msgstr ""
"Skriv in den nya l�senmening f�r denna hemliga nyckel.\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2865,623 +2933,635 @@ msgstr ""
"Du vill inte ha n�gon l�senmening - detta �r sannolikt en d�lig id�!\n"
"\n"
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "Vill du verkligen g�ra detta? "
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "flyttar en nyckelsignatur till den r�tta platsen\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "avsluta denna meny"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "q"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "save"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "spara och avsluta"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "help"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "visa denna hj�lp"
# skall dessa �vers�ttas?
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "visa fingeravtryck"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "list"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "r�kna upp nycklar och anv�ndaridentiteter"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "v�lj anv�ndaridentitet N"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "key"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "v�lj sekund�r nyckel N"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "check"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "r�kna upp signaturer"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "c"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "signera nyckeln"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "s"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "tsign"
msgstr "sign"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "make a trust signature"
msgstr "skapa en signatur i en separat fil"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "signera nyckeln lokalt"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr "signera nyckeln utan m�jlighet att �terkalla signaturen"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
#, fuzzy
msgid "sign the key locally and non-revocably"
msgstr "signera nyckeln lokalt och utan m�jlighet att �terkalla signaturen"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "l�gg till en anv�ndaridentitet"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr "l�gg till bild"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr "l�gg till en anv�ndaridentitet med foto"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "ta bort en anv�ndaridentitet"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr "ta bort bild"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "l�gg till en sekund�r nyckel"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+#, fuzzy
+msgid "addcardkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "ta bort en sekund�r nyckel"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "addrevoker"
msgstr "Ange sp�rrnyckel"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "add a revocation key"
msgstr "l�gg till en sp�rrnyckel"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "ta bort signaturer"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "�ndra utg�ngsdatum"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr "prim�r"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr "markera anv�ndar-ID:t som prim�rt"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "hoppa mellan utskrift av hemliga och offentliga (publika) nycklar"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "t"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr "skriv ut inst�llningar (expertl�ge)"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr "skriv ut inst�llningar (utf�rligt)"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr "ange inst�llningslista"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr "uppdaterat inst�llningar"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "keyserver"
msgstr "nyckelserverfel"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "set preferred keyserver URL"
msgstr "kunde inte tolka nyckelserver-URI\n"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "�ndra l�senmening"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "trust"
# originalet borde ha ett value
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "�ndra �gartillitsv�rdet"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "�terkalla signaturer"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
#, fuzzy
msgid "revuid"
msgstr "revsig"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
#, fuzzy
msgid "revoke a user ID"
msgstr "l�gg till en anv�ndaridentitet"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "sp�rra en sekund�r nyckel"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "deaktivera en nyckel"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "aktivera en nyckel"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr "visa bild"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr "visa bild-ID"
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "kan inte g�ra detta i batch-l�ge\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "fel vid l�sning av hemlig nyckel\"%s\": %s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "Den hemliga nyckeln finns tillg�nglig.\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "Kommando> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "Den hemliga nyckeln beh�vs f�r att g�ra detta.\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr "Anv�nd kommandot \"toggle\" f�rst.\n"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
msgid "Key is revoked."
msgstr "Nyckeln �r sp�rrad."
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "Vill du verkligen signera alla anv�ndaridentiteter? "
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "Tips: V�lj det anv�ndarid du vill signera\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Detta kommando �r inte till�tet n�r du �r i %s-l�ge.\n"
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "Du m�ste v�lja �tminstone en anv�ndaridentitet.\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "Du kan inte ta bort den sista anv�ndaridentiteten!\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "Vill du verkligen ta bort alla valda anv�ndaridentiteter? "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "Vill du verkligen ta bort denna anv�ndaridentitet? "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+#, fuzzy
+msgid "Really move the primary key? "
+msgstr "Vill du verkligen ta bort denna anv�ndaridentitet? "
+
+#: g10/keyedit.c:1598
+#, fuzzy
+msgid "You must select exactly one key.\n"
+msgstr "Du m�ste v�lja �tminstone en nyckel.\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "Du m�ste v�lja �tminstone en nyckel.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "Vill du verkligen ta bort valda nycklar? "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "Vill du verkligen ta bort denna nyckel? "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
#, fuzzy
msgid "Really revoke all selected user IDs? "
msgstr "Vill du verkligen ta bort alla valda anv�ndaridentiteter? "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
#, fuzzy
msgid "Really revoke this user ID? "
msgstr "Vill du verkligen ta bort denna anv�ndaridentitet? "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "Vill du verkligen sp�rra de valda nycklarna? "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "Vill du verkligen sp�rra denna nyckel? "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
#, fuzzy
msgid "Set preference list to:\n"
msgstr "ange inst�llningslista"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr ""
"Vill du verkligen �ndra inst�llningarna f�r alla valda anv�ndaridentiteter? "
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
#, fuzzy
msgid "Really update the preferences? "
msgstr "Vill du verkligen skapa �terkallelsecertifikaten? (j/N)"
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "Spara �ndringarna? "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "Avsluta utan att spara? "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "uppdateringen misslyckades: %s\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "misslyckades med att uppdatera hemligheten: %s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "Nyckeln �r of�r�ndrad s� det beh�vs ingen uppdatering.\n"
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "Ogiltigt kommando (f�rs�k med \"help\")\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr ""
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr ""
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keyedit.c:2219
#, fuzzy, c-format
msgid "This key may be revoked by %s key "
msgstr "VARNING: Denna nyckel har sp�rrats av sin �gare!\n"
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr " (k�nsligt)"
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "kan inte skapa %s: %s\n"
-#: g10/keyedit.c:2084
-#, fuzzy, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
msgstr "revkey"
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
-msgstr "[g�r ut: %s]"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
+msgstr "expire"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2246
#, fuzzy, c-format
-msgid "expires: %s"
-msgstr "[g�r ut: %s]"
+msgid "usage: %s"
+msgstr " tillit: %c/%c"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, fuzzy, c-format
msgid "trust: %s"
msgstr " tillit: %c/%c"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "Denna nyckel har deaktiverats"
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "revoked! en undernyckel har sp�rrats: %s\n"
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
-msgstr "rev- hittade f�rfalskad sp�rr av nyckeln\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? problem vid kontroll av sp�rren: %s\n"
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-#, fuzzy
-msgid "revoked"
-msgstr "revkey"
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-#, fuzzy
-msgid "expired"
-msgstr "expire"
+#: g10/keyedit.c:2300
+msgid "card-no: "
+msgstr ""
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr ""
"Du kan inte ange n�gra inst�llningar f�r ett anv�ndar-ID av PGP 2.x-typ.\n"
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
msgstr ""
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-#, fuzzy
-msgid "[revoked] "
-msgstr "revkey"
-
-#: g10/keyedit.c:2274
-#, fuzzy
-msgid "[expired] "
-msgstr "expire"
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
msgstr ""
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
" of PGP to reject this key.\n"
msgstr ""
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
#, fuzzy
msgid "Are you sure you still want to add it? (y/N) "
msgstr "�r du s�ker p� att du vill ha denna nyckelstorlek? "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Du kan inte l�gga till ett bild-ID till en nyckel av PGP 2-typ.\n"
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Vill du radera denna ok�nda signatur? (j/N/a)"
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "Vill du verkligen radera denna egensignatur? (j/N)"
# skulle lika g�rna kunna heta 1 signatur va?
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "Raderade %d signatur.\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "Raderade %d signaturer.\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "Ingenting raderat.\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3490,92 +3570,102 @@ msgstr ""
"VARNING: Detta �r en PGP 2-nyckel. Om du anger en sp�rrnyckel kan denna "
"nyckel inte anv�ndas i vissa versioner av PGP.\n"
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Du f�r inte ange en sp�rrnyckel f�r en PGP 2-nyckel.\n"
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
#, fuzzy
msgid "Enter the user ID of the designated revoker: "
msgstr "Ange ID f�r �nskad sp�rrnyckel"
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "Det g�r inte att anv�nda en PGP 2-nyckel som sp�rrnyckel\n"
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "Du kan inte ange en nyckel som sin egen sp�rrnyckel\n"
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "VARNING: Denna nyckel har sp�rrats av sin �gare!\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
#, fuzzy
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "Du kan inte ange en nyckel som sin egen sp�rrnyckel\n"
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr "Du kan inte ange en nyckel som sin egen sp�rrnyckel\n"
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "Tag bort markeringar fr�n de hemliga nycklarna.\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "V�lj som mest en sekund�r nyckel.\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "�ndrar giltighetstid f�r en sekund�r nyckel.\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "�ndrar giltighetstid f�r den prim�ra nyckeln.\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Du kan inte �ndra giltighetsdatum f�r en v3-nyckel\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
#, fuzzy
msgid "Please select exactly one user ID.\n"
msgstr "Du m�ste v�lja �tminstone en anv�ndaridentitet.\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
#, fuzzy, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "nyckel %08lX: ogiltig sj�lvsignatur\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+#, fuzzy
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "�r du s�ker p� att du vill ha denna nyckelstorlek? "
+
+#: g10/keyedit.c:3480
+#, fuzzy
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "�r du s�ker p� att du vill ha denna nyckelstorlek? "
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "Ingen anv�ndaridentitet med index %d\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "Ingen sekund�r nyckel med index %d\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "anv�ndaridentitet: \""
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3584,7 +3674,7 @@ msgstr ""
"\"\n"
"signerad med din nyckel %08lX %s\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3593,154 +3683,138 @@ msgstr ""
"\"\n"
"lokalt signerad med din nyckel %08lX vid %s\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, fuzzy, c-format
msgid "This signature expired on %s.\n"
msgstr "%s-signatur fr�n: %s\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Vill du verkligen sp�rra denna nyckel? "
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
#, fuzzy
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr ""
"Vill du skapa ett sp�rrcertifikat (revocation certificate) f�r denna "
"signatur? (j/N)"
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "Du har signerat f�ljande anv�ndaridentiteter:\n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid " signed by %s on %s%s%s\n"
msgstr " signerad av %08lX %s\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid " revoked by %s on %s\n"
msgstr " sp�rrad av %08lX %s\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "Du st�r i begrepp att �terkalla dessa signaturer:\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, fuzzy, c-format
msgid " signed by %s on %s%s\n"
msgstr " signerad av %08lX %s\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr " (icke exporterbar)"
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
#, fuzzy
msgid "Really create the revocation certificates? (y/N) "
msgstr "Vill du verkligen skapa sp�rrcertifikaten? (j/N)"
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "ingen hemlig nyckel\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, fuzzy, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "Anv�ndar-ID \"%s\" �r sp�rrat."
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
-#: g10/keylist.c:179
+#: g10/keylist.c:180
#, fuzzy
msgid "Critical signature policy: "
msgstr "%s-signatur fr�n: %s\n"
-#: g10/keylist.c:181
+#: g10/keylist.c:182
#, fuzzy
msgid "Signature policy: "
msgstr "%s-signatur fr�n: %s\n"
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "VARNING: ogiltig notationsdata hittades\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
#, fuzzy
msgid "Critical signature notation: "
msgstr "Notation: "
-#: g10/keylist.c:288
+#: g10/keylist.c:289
#, fuzzy
msgid "Signature notation: "
msgstr "Notation: "
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr "inte m�jlig att l�sa f�r m�nniskor"
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr "Nyckelring"
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr "[g�r ut: %s]"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr "[g�r ut: %s]"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, fuzzy, c-format
-msgid " [revoked: %s]"
-msgstr "revkey"
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
#, fuzzy
msgid "Primary key fingerprint:"
msgstr "r�kna upp nycklar och fingeravtryck"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
#, fuzzy
msgid " Subkey fingerprint:"
msgstr " Fingeravtryck:"
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
#, fuzzy
msgid " Primary key fingerprint:"
msgstr " Fingeravtryck:"
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
#, fuzzy
msgid " Subkey fingerprint:"
msgstr " Fingeravtryck:"
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr " Fingeravtryck:"
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3962,81 +4036,81 @@ msgstr "signatur av den gamla (PGP 2.x) typen\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "felaktigt rotpaket hittades i proc_tree()\n"
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "kan inte deaktivera minnesutskrifter: %s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "Experimentella algoritmer b�r inte anv�ndas!\n"
# XXX
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"denna krypteringsalgoritm �r f�rlegad, anv�nd ist�llet en mer normal "
"algoritm!\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr "Insticksprogram f�r IDEA-kryptering �r inte installerat\n"
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr "Mer information finns p�: http://www.gnupg.org/why-not-idea.html\n"
-#: g10/misc.c:491
+#: g10/misc.c:517
#, fuzzy, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "VARNING: %s �r en f�rlegad flagga\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, fuzzy, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "VARNING: %s �r en f�rlegad flagga\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, fuzzy, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "anv�nd \"--keyserver-options %s\" ist�llet\n"
-#: g10/misc.c:508
+#: g10/misc.c:534
#, fuzzy
msgid "Uncompressed"
msgstr "inte behandlade"
-#: g10/misc.c:533
+#: g10/misc.c:559
#, fuzzy
msgid "uncompressed|none"
msgstr "inte behandlade"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "detta meddelande kanske inte kan anv�ndas av %s\n"
-#: g10/misc.c:777
+#: g10/misc.c:826
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "l�ser flaggor fr�n \"%s\"\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "den f�rvalda mottagaren \"%s\" �r ok�nd\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "kan inte hantera algoritm %d f�r offentlig (publik) nyckelhantering\n"
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, 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"
@@ -4075,7 +4149,7 @@ msgstr "kan inte ansluta till \"%s\": %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "problem vid kommunikation med GPG-Agent\n"
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
#, fuzzy
msgid "problem with the agent - disabling agent use\n"
msgstr "problem med agenten: agenten returnerar 0x%lx\n"
@@ -4112,24 +4186,24 @@ msgstr "l�senmeningen �r f�r l�ng\n"
msgid "invalid response from agent\n"
msgstr "felaktigt svar fr�n agenten\n"
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "avbruten av anv�ndaren\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "problem med agenten: agenten returnerar 0x%lx\n"
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "kan inte fr�ga efter l�senmening i batch-l�ge\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "Ange l�senmening: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4139,22 +4213,22 @@ msgstr ""
"Du beh�ver en l�senmening f�r att l�sa upp den hemliga nyckeln f�r\n"
"anv�ndaren: \""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-bits %s-nyckel, ID %08lX, skapad %s"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (huvudnyckelns identitet %08lX)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "Repetera l�senmeningen: "
@@ -4378,25 +4452,38 @@ msgstr ""
"du kan bara skapa fr�nkopplade signaturereller klartextsignaturer\n"
"tillsammans med --pgp2\n"
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
-msgstr "kan inte skapa %s: %s\n"
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
+msgstr "kan inte skapa \"%s\": %s\n"
+
+#: g10/sign.c:771 g10/sign.c:1008
+#, fuzzy, c-format
+msgid "writing to file `%s'\n"
+msgstr "skriver till \"%s\"\n"
-#: g10/sign.c:794
+#: g10/sign.c:795
#, fuzzy, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "OBSERVERA: chifferalgoritmen %d finns inte i inst�llningarna\n"
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr "signerar:"
-#: g10/sign.c:985
+# Filnamn b�de med och utan fnuttar finns. lite ologiskt. Vill n�gon
+# fixa en patch?
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "kan inte �ppna %s: %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, fuzzy, c-format
msgid "%s encryption will be used\n"
msgstr "dekrypteringen misslyckades: %s\n"
@@ -4806,7 +4893,7 @@ msgstr ""
"kan inte undvika en svag nyckel f�r symmetrisk kryptering; f�rs�kte\n"
"%d g�nger!\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA kr�ver att du anv�nder en 160-bitars hash-algoritm\n"
@@ -5182,17 +5269,17 @@ msgstr "Det finns ingen hj�lp tillg�nglig"
msgid "No help available for `%s'"
msgstr "Det finns ingen hj�lp tillg�nglig f�r \"%s\""
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "fel vid skapande av nyckelringen \"%s\": %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr "%s: nyckelring skapad\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "misslyckades med att �terskapa nyckelringscache: %s\n"
@@ -5236,8 +5323,7 @@ msgstr "%lu nycklar och %lu signaturer har kontrollerats\n"
msgid "%s: keyring created\n"
msgstr "%s: nyckelring skapad\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5246,31 +5332,36 @@ msgid ""
"Keeping the image close to 240x288 is a good size to use.\n"
msgstr ""
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr ""
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, fuzzy, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "kunde inte s�tta exec-s�kv�gen till %s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
#, fuzzy
msgid "Are you sure you want to use it (y/N)? "
msgstr "�r du s�ker p� att du vill ha denna nyckelstorlek? "
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, fuzzy, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr "%s: detta �r inte en tillitsdatabasfil\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
#, fuzzy
msgid "Is this photo correct (y/N/q)? "
msgstr "St�mmer detta (j/n)? "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
#, fuzzy
msgid "unable to display photo ID!\n"
msgstr "kunde inte s�tta exec-s�kv�gen till %s\n"
@@ -5290,44 +5381,50 @@ msgid ""
msgstr ""
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
-msgstr ""
+#, fuzzy
+msgid "this platform requires temporary files when calling external programs\n"
+msgstr "%s: fel vid l�sning av versionspost: %s\n"
+
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
+msgstr "kunde inte s�tta exec-s�kv�gen till %s\n"
-#: g10/exec.c:432
+#: g10/exec.c:436
#, fuzzy, c-format
-msgid "unable to execute %s \"%s\": %s\n"
+msgid "unable to execute shell `%s': %s\n"
msgstr "kunde inte s�tta exec-s�kv�gen till %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:515
#, fuzzy, c-format
msgid "system error while calling external program: %s\n"
msgstr "%s: fel vid l�sning av versionspost: %s\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr ""
-#: g10/exec.c:539
+#: g10/exec.c:541
#, fuzzy
msgid "unable to execute external program\n"
msgstr "kunde inte s�tta exec-s�kv�gen till %s\n"
-#: g10/exec.c:548
+#: g10/exec.c:550
#, fuzzy, c-format
msgid "unable to read external program response: %s\n"
msgstr "kunde inte s�tta exec-s�kv�gen till %s\n"
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr ""
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr ""
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr ""
@@ -5486,6 +5583,49 @@ msgstr "%s: fel vid l�sning av katalogpost: %s\n"
msgid "read error: %s\n"
msgstr "skal: %s\n"
+#, fuzzy
+#~ msgid "revoked: %s"
+#~ msgstr "revkey"
+
+#, fuzzy
+#~ msgid "expired: %s"
+#~ msgstr "[g�r ut: %s]"
+
+#, fuzzy
+#~ msgid "expires: %s"
+#~ msgstr "[g�r ut: %s]"
+
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "revoked! en undernyckel har sp�rrats: %s\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "rev- hittade f�rfalskad sp�rr av nyckeln\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "rev? problem vid kontroll av sp�rren: %s\n"
+
+#, fuzzy
+#~ msgid "[revoked] "
+#~ msgstr "revkey"
+
+#, fuzzy
+#~ msgid "[expired] "
+#~ msgstr "expire"
+
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr "[g�r ut: %s]"
+
+#~ msgid " [expires: %s]"
+#~ msgstr "[g�r ut: %s]"
+
+#, fuzzy
+#~ msgid " [revoked: %s]"
+#~ msgstr "revkey"
+
+#~ msgid "can't create %s: %s\n"
+#~ msgstr "kan inte skapa %s: %s\n"
+
#~ msgid "|[files]|encrypt files"
#~ msgstr "|[filer]|kryptera filer"
diff --git a/po/tr.po b/po/tr.po
index 6a87aab6e..a4f739050 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
"PO-Revision-Date: 2004-07-08 08:10+0300\n"
"Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
"Language-Team: Turkish <[email protected]>\n"
@@ -50,7 +50,7 @@ msgstr "hayır"
msgid "nN"
msgstr "hH"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "quit"
@@ -283,6 +283,16 @@ msgstr "gizli anahtar kullanımdışı"
msgid "keyserver error"
msgstr "anahtar sunucusu hatası"
+#: util/errors.c:108
+#, fuzzy
+msgid "canceled"
+msgstr "İptal"
+
+#: util/errors.c:109
+#, fuzzy
+msgid "no card"
+msgstr "şifrelenemedi"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr ""
@@ -305,7 +315,7 @@ msgstr "bir yazılım hatası buldunuz ... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "rasgele bayt elde etme modülü bulunamadı\n"
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "`%s' açılamıyor: %s\n"
@@ -337,7 +347,7 @@ msgstr "\"%s\" okunamıyor: %s\n"
msgid "note: random_seed file not updated\n"
msgstr "bilgi: \"random_seed\" dosyası güncel değil\n"
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr "\"%s\" oluşturulamıyor: %s\n"
@@ -406,7 +416,7 @@ msgstr "%d bitten daha küçük bir asal sayı üretilemiyor\n"
msgid "can't generate a prime with less than %d bits\n"
msgstr "%d bitten daha küçük bir asal sayı üretilemiyor\n"
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -414,128 +424,128 @@ msgstr ""
"@Komutlar:\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[dosya]|bir imza yapar"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "bağımsız bir imza yapar"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "veriyi şifreler"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "sadece simetrik şifre ile şifreler"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "veri şifresini açar (öntanımlı)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "bir imzayı doğrular"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "anahtarları listeler"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "anahtarları ve imzaları listeler"
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "anahtar imzalarını kontrol eder"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "anahtarları ve parmak izlerini listeler"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "gizli anahtarları listeler"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "yeni bir anahtar çifti üretir"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "anahtarları genel anahtar zincirinden siler"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "anahtarları gizli anahtar zincirinden siler"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "bir anahtarı imzalar"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "bir anahtarı yerel olarak imzalar"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "bir anahtarı düzenler ve imzalar"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "bir yürürlükten kaldırma sertifikası üretir"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "anahtarları gönderir"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "anahtarları bir anahtar sunucusuna gönderir"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "anahtarları bir anahtar sunucusundan indirir"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "bir anahtar sunucusunda anahtarları arar"
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "anahtarları bir anahtar sunucusundan günceller"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "anahtarları indirir/katıştırır"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "güvence veritabanını günceller"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -545,55 +555,51 @@ msgstr ""
"Seçenekler:\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "ascii zırhlı çıktı oluşturur"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|İSİM|İSİM için şifreleme yapar"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr "imzalamak ya da şifre çözmek için bu kullanıcı kimliği kullanılır"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 ise sıkıştırma yapılmaz)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "kurallı metin kipini kullanır"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "çıktı dosyası olarak kullanılır"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "çok detaylı"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "hiçbir değişiklik yapmaz"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "üzerine yazmadan önce sorar"
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -601,7 +607,7 @@ msgstr ""
"@\n"
"(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -621,15 +627,15 @@ msgstr ""
" --list-keys [isimler] anahtarları listeler\n"
" --fingerprint [isimler] parmak izlerini gösterir\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Yazılım hatalarını lütfen <[email protected]> adresine bildirin.\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -639,7 +645,7 @@ msgstr ""
"imzalama, kontrol, şifreleme veya çözme\n"
"öntanımlı işlem girilen veriye bağımlıdır\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -647,467 +653,461 @@ msgstr ""
"\n"
"Desteklenen algoritmalar:\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr "GenAnah: "
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr "Şifre: "
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr "Hash: "
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
msgid "Compression: "
msgstr "Sıkıştırma: "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "kullanımı: gpg [seçenekler] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "çelişen komutlar\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "grup tanımı \"%s\" içinde = işareti yok\n"
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "UYARI: %s \"%s\" için güvensiz iyelik\n"
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "UYARI: %s \"%s\" için güvensiz iyelik\n"
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "UYARI: %s \"%s\" için güvensiz iyelik\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "UYARI: %s \"%s\" de güvensiz izinler\n"
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "UYARI: %s \"%s\" de güvensiz izinler\n"
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "UYARI: %s \"%s\" de güvensiz izinler\n"
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin iyeliği\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin iyeliği\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin iyeliği\n"
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin izinleri\n"
-#: g10/g10.c:1205
+#: g10/g10.c:1210
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin izinleri\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin izinleri\n"
-#: g10/g10.c:1334
-#, c-format
-msgid "unknown configuration item \"%s\"\n"
+#: g10/g10.c:1354
+#, fuzzy, c-format
+msgid "unknown configuration item `%s'\n"
msgstr "bilinmeyen yapılandırma öğesi \"%s\"\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "BİLGİ: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "seçenek dosyası \"%s\": %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "\"%s\"den seçenekler okunuyor\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "BİLGİ: %s normal kullanım için değil!\n"
-#: g10/g10.c:1887
-#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+#: g10/g10.c:2021
+#, fuzzy, c-format
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr "şifre uzantısı \"%s\" güvensiz izinlerden dolayı yüklenmedi\n"
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "%s geçerli bir karakter seti değil\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "dışsallaştırma seçenekleri geçersiz\n"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
msgid "invalid import options\n"
msgstr "içselleştirme seçenekleri geçersiz\n"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
msgid "invalid export options\n"
msgstr "dışsallaştırma seçenekleri geçersiz\n"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "içselleştirme seçenekleri geçersiz\n"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "dışsallaştırma seçenekleri geçersiz\n"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "UYARI: %s %s'i aşıyor\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ile %s birlikte kullanılmaz!\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s, %s ile etkisiz olur!\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "--pgp2 kipinde sadece ayrık veya sade imzalar yapabilirsiniz\n"
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "--pgp2 kipinde aynı anda hem imzalama hem de şifreleme yapamazsınız\n"
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız.\n"
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "seçilen şifre algoritması geçersiz\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "seçilen özümleme algoritması geçersiz\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "seçilen şifre algoritması geçersiz\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
msgid "selected certification digest algorithm is invalid\n"
msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "öntanımlı sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "asgari sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
msgid "invalid default preferences\n"
msgstr "öntanımlı tercihler geçersiz\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
msgid "invalid personal cipher preferences\n"
msgstr "kişisel şifre tercihleri geçersiz\n"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
msgid "invalid personal digest preferences\n"
msgstr "kişisel özümleme tercihleri geçersiz\n"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
msgid "invalid personal compress preferences\n"
msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s henüz %s ile çalışmıyor\n"
-#: g10/g10.c:2680
-#, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2797
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "%2$s kipindeyken %1$s şifreleme algoritması kullanılamayabilir.\n"
-#: g10/g10.c:2685
-#, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2802
+#, fuzzy, c-format
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "%2$s kipindeyken %1$s özümleme algoritması kullanılamayabilir.\n"
-#: g10/g10.c:2690
-#, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2807
+#, fuzzy, c-format
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "%2$s kipindeyken %1$s sıkıştırma algoritması kullanılamayabilir.\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"UYARI: alıcılar (-r) genel anahtar şifrelemesi kullanılmadan belirtilmiş\n"
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [dosyaismi]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [dosyaismi]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [dosyaismi]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [dosyaismi]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [dosyaismi]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [dosyaismi]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [dosyaismi]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [DOSYA]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [dosyaismi]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [dosyaismi]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key kullanıcı-kimliği"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key kullanıcı-kimliği"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrsign-key KULL-KML"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key KULL-KML"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key kullanıcı-kimliği [komutlar]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "%s açılamadı: %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [kullanıcı-kimliği] [anahtar-zinciri]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "keyserver send başarısızlığa uğradı: %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "keyserver receive başarısızlığa uğradı: %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, c-format
msgid "key export failed: %s\n"
msgstr "key export başarısızlığa uğradı: %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "keyserver search başarısızlığa uğradı: %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "keyserver refresh başarısız: %s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "zırhın kaldırılması başarısız: %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "zırhlama başarısız: %s\n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "`%s' hash algoritması geçersiz\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[dosyaismi]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "İletinizi yazın ...\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "`%s' açılamadı\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@ -1115,48 +1115,48 @@ msgstr ""
"bir niteleme ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
"sonuna bir '=' gelir.\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
msgid "a user notation name must contain the '@' character\n"
msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "bir niteleme değerinde kontrol karakterleri kullanılamaz\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr "belirtilen sertifika güvence adresi geçersiz\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr "belirtilen imza güvence adresi geçersiz\n"
-#: g10/g10.c:3747
+#: g10/g10.c:3863
#, fuzzy
-msgid "the given signature preferred keyserver URL is invalid\n"
+msgid "the given preferred keyserver URL is invalid\n"
msgstr "belirtilen imza güvence adresi geçersiz\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "daha az detaylı"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
msgid "take the keys from this keyring"
msgstr "anahtarlar bu anahtarlıktan alınır"
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
msgid "make timestamp conflicts only a warning"
msgstr "zaman damgası çelişkilerini uyarı olarak bildirir"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr "|FD|durum bilgisini bu FD'ye yazar"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Kullanımı: gpgv [seçenekler] [dosyalar] (yardım için -h)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1190,12 +1190,13 @@ msgid "invalid dash escaped line: "
msgstr "araçizgisi escape'lı satır geçersiz: "
#: g10/armor.c:565
-msgid "unexpected armor:"
+#, fuzzy
+msgid "unexpected armor: "
msgstr "beklenmeyen zırh: "
-#: g10/armor.c:695 g10/armor.c:1276
-#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+#: g10/armor.c:695 g10/armor.c:1280
+#, fuzzy, c-format
+msgid "invalid radix64 character %02X skipped\n"
msgstr "geçersiz radix64 karakteri %02x atlandı\n"
#: g10/armor.c:738
@@ -1206,33 +1207,34 @@ msgstr "dosya sonu belirsiz (CRC yok)\n"
msgid "premature eof (in CRC)\n"
msgstr "dosya sonu belirsiz (CRC içinde)\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "CRC bozulmuş\n"
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC hatası; %06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+#, fuzzy
+msgid "premature eof (in trailer)\n"
msgstr "dosya sonu belirsiz (kuyruk içinde)\n"
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "kuyruk satırında hata\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "geçerli OpenPGP verisi yok\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "geçersiz zırh: satır %d karakterden uzun\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -1288,7 +1290,7 @@ msgstr " den \""
msgid " aka \""
msgstr " den \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1541,96 +1543,116 @@ msgstr "%s: atlandı: genel anahtar iptal edildi\n"
msgid "no valid addressees\n"
msgstr "geçerli adresler yok\n"
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "%c%lu tercihi yinelendi\n"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "`%c' tercih çok fazla\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
#, fuzzy
msgid "too many digest preferences\n"
msgstr "`%c' tercih çok fazla\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
#, fuzzy
msgid "too many compression preferences\n"
msgstr "`%c' tercih çok fazla\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "tercih dizgesindeki karakter geçersiz\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
msgid "writing direct signature\n"
msgstr "doğrudan imza yazılıyor\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "öz-imza yazılıyor\n"
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "anahtarı garantileyen imzayı yazıyor\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA ve ElGamal (öntanımlı)\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (yalnız imzalamak için)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (yalnız şifrelemek için)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (sadece imzalamak için)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (sadece şifrelemek için)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (imzalamak ve şifrelemek için)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, fuzzy, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) RSA (sadece imzalamak için)\n"
+
+#: g10/keygen.c:1224
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) RSA (imzalamak ve şifrelemek için)\n"
+
+#: g10/keygen.c:1226
+#, fuzzy, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) RSA (sadece şifrelemek için)\n"
+
+#: g10/keygen.c:1228
+#, fuzzy, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) RSA (imzalamak ve şifrelemek için)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "Seçiminiz? "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "Seçim geçersiz.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1643,29 +1665,29 @@ msgstr ""
" öntanımlı anahtar uzunluğu: 1024 bit\n"
" önerilebilecek en büyük anahtar uzunluğu: 2048 bit\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "İstediğiniz anahtar uzunluğu nedir? (1024) "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA anahtarının uzunluğu 512 ile 1024 bit arasında olabilir\n"
-#: g10/keygen.c:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr ""
"anahtar uzunluğu çok küçük; RSA anahtarı için en küçük uzunluk: 1024 bit\n"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "anahtar uzunluğu çok küçük; en küçük anahtar uzunluğu 768 bit'tir.\n"
-#: g10/keygen.c:1255
+#: g10/keygen.c:1328
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "anahtar uzunluğu çok büyük; izin verilen en büyük değer: %d bit\n"
-#: g10/keygen.c:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1673,11 +1695,11 @@ msgstr ""
"Hesaplama EPEYCE UZUN zaman alacağından anahtar uzunluklarında\n"
"2048 bitten fazlası tavsiye edilmez.\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "Bu anahtar uzunluğunu istediğinizden emin misiniz? "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1685,17 +1707,17 @@ msgstr ""
"Tamam, ama saldırılara çok duyarlı olan monitör ve klavye ışınımlarından "
"kendinizi uzak tutun! (ne demekse...)\n"
-#: g10/keygen.c:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "İstenen anahtar uzunluğu: %u bit\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "%u bite yuvarlandı\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1711,7 +1733,7 @@ msgstr ""
" <n>m = anahtar n ay geçerli\n"
" <n>y = anahtar n yıl geçerli\n"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1727,29 +1749,29 @@ msgstr ""
" <n>m = imza n ay geçerli\n"
" <n>y = imza n yıl geçerli\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "Anahtar ne kadar geçerli olacak? (0) "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr "İmza ne kadar geçerli olacak? (0) "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "değer hatalı\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s hep geçerli olacak\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr "%s %s sonra geçersiz olacak\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1757,16 +1779,17 @@ msgstr ""
"Sisteminiz 2038 yılından sonraki tarihleri gösteremiyor.\n"
"Ama emin olun ki 2106 yılına kadar elde edilebilecek.\n"
-#: g10/keygen.c:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "Bu doğru mu? (e/h)? "
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
+#, fuzzy
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
@@ -1777,44 +1800,44 @@ msgstr ""
"\t\"Fatih Sultan Mehmed (Padisah) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "Adınız ve Soyadınız: "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "Ad ve soyadınızda geçersiz karakter var\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr "Ad ve soyadınız en az 5 harfli olmalı\n"
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "E-posta adresiniz: "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "geçerli bir E-posta adresi değil\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "Önbilgi: "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "Önbilgi alanında geçersiz karakter var\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1825,29 +1848,29 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
"Lütfen E-posta adresinizi Adı ve Soyadı veya Açıklama alanı içine koymayın\n"
-#: g10/keygen.c:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "AaYyEeTtKk"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
-#: g10/keygen.c:1542
+#: g10/keygen.c:1615
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr ""
"(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
-#: g10/keygen.c:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr "Lütfen önce hatayı düzeltin\n"
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1855,18 +1878,18 @@ msgstr ""
"Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr ""
"ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
"tekrarlanacak"
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1878,7 +1901,7 @@ msgstr ""
"seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
"\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1891,58 +1914,58 @@ msgstr ""
"iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
"üretecine yardımcı olur. \n"
-#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr "pardon, bu betik kipinde yapılamaz\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA anahtar çifti 1024 bit olacak.\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "Anahtar üretimi durduruldu.\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr "genel anahtarı `%s'e yazıyor\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "gizli anahtarı `%s'e yazıyor\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "gizli anahtarı `%s'e yazıyor\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "yazılabilir bir gizli anahtar zinciri yok: %s\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "`%s' genel anahtar zincirine yazılırken hata oluştu: %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "`%s' gixli anahtar zincirine yazılırken hata oluştu: %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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"
@@ -1950,19 +1973,19 @@ msgstr ""
"Bu anahtar şifreleme için kullanılamaz. Şifreleme için ikinci bir anahtarı\n"
"\"--edit-key\" seçeneğini kullanarak üretebilirsiniz.\n"
-#: g10/keygen.c:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
-#: g10/keygen.c:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1970,15 +1993,44 @@ msgstr ""
"anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
"problemi)\n"
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr ""
"BİLGİ: v3 anahtarları için yardımcı anahtar üretimi OpenPGP uyumlu değildir\n"
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "Gerçekten oluşturulsun mu? "
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "anahtar bloğu silinemedi: %s\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "\"%s\" oluşturulamıyor: %s\n"
+
+#: g10/keygen.c:3248
+#, fuzzy, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "BİLGİ: %08lX gizli anahtarının %s tarihinde kullanım süresi doldu\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "--output seçeneği bu komutla çalışmaz\n"
@@ -1989,7 +2041,7 @@ msgstr "--output seçeneği bu komutla çalışmaz\n"
msgid "%s: can't open: %s\n"
msgstr "%s: açılamıyor: %s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "anahtar parolası oluşturulurken hata: %s\n"
@@ -2019,6 +2071,11 @@ msgstr ""
"--pgp2 kipinde sadece 2048 bitlik RSA anahtarları ile şifreleme "
"yapabilirsiniz\n"
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "%s açılamadı: %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -2029,25 +2086,34 @@ msgid ""
"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
msgstr "tüm anahtarları şifrelemek için IDEA şifresi kullanılamaz.\n"
-#: g10/encode.c:526 g10/encode.c:721
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#: g10/encode.c:526
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr ""
"alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı zorlanıyor\n"
-#: g10/encode.c:634 g10/sign.c:863
-#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+#: g10/encode.c:634 g10/sign.c:864
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
msgstr ""
"alıcının tercihleriyle çelişen %s (%d) sıkıştırma algoritması kullanılmak "
"isteniyor\n"
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+"alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı zorlanıyor\n"
+
#: g10/encode.c:818
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s \"%s\" için şifrelendi\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "anahtar `%s' yok: %s\n"
@@ -2080,8 +2146,9 @@ msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "pk belleğinde çok fazla girdi - iptal edildi\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+#, fuzzy
+msgid "[User ID not found]"
msgstr "[Kullanıcı kimliği bulunamadı]"
#: g10/getkey.c:1614
@@ -2237,7 +2304,7 @@ msgstr "anahtar %08lX: HKP yardımcı anahtar bozulması giderildi\n"
#: g10/import.c:722
#, fuzzy, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "anahtar %08lX: öz-imzalı olmayan kullanıcı kimliği '%s' kabul edildi\n"
#: g10/import.c:728
@@ -2264,7 +2331,7 @@ msgstr "anahtar %08lX: yeni anahtar - atlandı\n"
msgid "no writable keyring found: %s\n"
msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "\"%s\"e yazıyor\n"
@@ -2379,14 +2446,14 @@ msgstr "anahtar %08lX: imza için kullanıcı kimliği yok\n"
#: g10/import.c:1299
#, fuzzy, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"anahtar %08lX: genel anahtar algoritması, kullanıcı kimliği \"%s\" için "
"desteklenmiyor\n"
#: g10/import.c:1301
#, fuzzy, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "anahtar %08lX: kullanıcı kimliği \"%s\" için öz-imza geçersiz\n"
#: g10/import.c:1319
@@ -2428,7 +2495,7 @@ msgstr ""
#: g10/import.c:1439
#, fuzzy, c-format
-msgid "key %s: skipped user ID '%s'\n"
+msgid "key %s: skipped user ID \"%s\"\n"
msgstr "anahtar %08lX: kullanıcı kimliği atlandı: '"
#: g10/import.c:1460
@@ -2438,7 +2505,7 @@ msgstr "anahtar %08lX: yardımcı anahtar atlandı\n"
#: g10/import.c:1487
#, fuzzy, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "anahtar %08lX: imza gönderilebilir değil (%02x sınıfı) - atlandı\n"
#: g10/import.c:1497
@@ -2475,114 +2542,114 @@ msgstr ""
"UYARI: anahtar %08lX yürürlükten kaldırılmış olmalı: yürürlükten kaldırma "
"anahtarı %08lX alınıyor\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"UYARI: anahtar %08lX yürürlükten kaldırılmış olabilir: yürürlükten kaldırma "
"anahtarı %08lX mevcut değil.\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "anahtar %08lX: \"%s\" yürürlükten kaldırma sertifikası eklendi\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "anahtar %08lX: doğrudan anahtar imzası eklendi\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[yürürlükten kaldırma]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[öz-imza]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "1 kötü imza\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d kötü imza\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "%d imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "1 imza bir hata yüzünden kontrol edilmedi\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "%d imza hatalardan dolayı kontrol edilmedi\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "1 öz-imzası geçersiz kullanıcı kimliği saptandı\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "%d öz-imzası geçersiz kullanıcı kimliği saptandı\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, fuzzy, c-format
msgid " (%d) I trust marginally\n"
msgstr " %d = Şöyle böyle güveniyorum\n"
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, fuzzy, c-format
msgid " (%d) I trust fully\n"
msgstr " %d = Tamamen güveniyorum\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr " İmzalanamıyor.\n"
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Kullanıcı kimliği \"%s\" zamanaşımına uğradı."
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Kullanıcı kimliği \"%s\" öz-imzalı değil."
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2591,11 +2658,11 @@ msgstr ""
"\"%s\" üzerindeki öz-imza\n"
"bir PGP 2.x tarzı imza.\n"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Bir OpenPGP öz-imzası haline getirilmesini istiyor musunuz? (e/H) "
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2604,12 +2671,12 @@ msgstr ""
"\"%s\" üzerindeki imzanızın\n"
"kullanım süresi dolmuş.\n"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"Yeni imzanızın süresi dolmuş biriyle değiştirilmesini ister misiniz? (e/H) "
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2618,44 +2685,44 @@ msgstr ""
"\"%s\" üzerindeki imzanız\n"
"dahili bir imza.\n"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
"Bu imzanın dışarda da geçerli hale getirilmesini istiyor musunuz? (e/H) "
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" zaten %08lX anahtarıyla yerel olarak imzalanmış\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" zaten %08lX anahtarıyla imzalanmış\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "%08lX anahtarı ile imzalanacak hiçbir şey yok\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "Bu anahtarın kullanım süresi dolmuş!"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Bu anahtarın geçerliliği %s de bitiyor.\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "İmzanızın da bu kadar süre geçerli olmasını ister misiniz? (E/h) "
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
@@ -2663,11 +2730,11 @@ msgstr ""
"--pgp2 kipinde bir PGP 2.x anahtarlara bir OpenPGP imzası "
"uygulanamayabilir.\n"
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "Bu, anahtarı PGP 2.x için kullanışsız yapacak.\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2676,31 +2743,31 @@ msgstr ""
"Bu anahtarın ismi yukarda yazılı kişiye ait olduğunu ne kadar dikkatli\n"
"doğruladınız? Bu sorunun cevabını bilmiyorsanız \"0\" yazın.\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Cevabı bilmiyorum. %s\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Tamamen kontrol edildi.%s\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) İlişkisel denetim yaptım.%s\n"
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Çok dikkatli bir denetim yaptım.%s\n"
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr "Seçiminiz? (bilgi için '?' giriniz): "
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2708,7 +2775,7 @@ msgstr ""
"Bu anahtarı kendi anahtarınızla imzalamak istediğinize gerçekten\n"
"emin misiniz?: \""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2716,7 +2783,7 @@ msgstr ""
"\n"
"Bu bir öz-imza olacak.\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2724,7 +2791,7 @@ msgstr ""
"\n"
"UYARI: imza dışarı gönderilemez olarak imlenmeyecek.\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2732,7 +2799,7 @@ msgstr ""
"\n"
"UYARI: imza yürürlükten kaldırılamaz olarak imlenmeyecek.\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2740,7 +2807,7 @@ msgstr ""
"\n"
"İmza dışarı gönderilemez olarak imlenecek.\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2748,7 +2815,7 @@ msgstr ""
"\n"
"İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2756,7 +2823,7 @@ msgstr ""
"\n"
"Her şeyiyle bu anahtarı kontrol edemedim.\n"
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2764,7 +2831,7 @@ msgstr ""
"\n"
"Bu anahtarı karşılaştırmalı kontrol ettim.\n"
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2772,34 +2839,34 @@ msgstr ""
"\n"
"Bu anahtarı çok dikkatli kontrol ettim.\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "Gerçekten imzalayacak mısınız? "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "imzalama başarısız: %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "Bu anahtar korunmamış.\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "Anahtar korunmuş.\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "Bu anahtar üzerinde düzenleme yapılamaz: %s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2807,7 +2874,7 @@ msgstr ""
"Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2815,547 +2882,569 @@ msgstr ""
"Bir anahtar parolası vermediniz - bu çok *kötü* bir fikir!\n"
"\n"
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "Gerçekten bunu yapmak istiyor musunuz? "
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "bir anahtar imzası doğru yere taşınıyor\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "bu menüden çık"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "k"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "save"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "kaydet ve çık"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "help"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "bunu gösterir "
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "parmak izini gösterir"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "list"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "anahtarı ve kullanıcı kimliğini gösterir"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "N kullanıcı kimliğini seçer"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "key"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "N yardımcı anahtarını seçer"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "check"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "imzaları listeler"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "k"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "anahtarı imzalar"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "i"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "tsign"
msgstr "sign"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "make a trust signature"
msgstr "bağımsız bir imza yapar"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "anahtarı yerel olarak imzala"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr "yürürlükten kaldırılamayan imza yapar"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "sign the key locally and non-revocably"
msgstr "yürürlükten kaldırılamayan yerel imza yapar"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "bir kullanıcı kimliği ekler"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr "addphoto"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr "bir foto kimliği ekler"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "kullanıcı kimliğini siler"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr "delphoto"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "bir yardımcı anahtar ekler"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+#, fuzzy
+msgid "addcardkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "bir yardımcı anahtar siler"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "addrevoker"
msgstr "addrevoker"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "add a revocation key"
msgstr "bir yürürlükten kaldırma anahtarı ekler"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "imzaları siler"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "son kullanım tarihini değiştirir"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr "primary"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr "kullanıcı kimliğini asıl olarak imler"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "genel ve gizli anahtar listeleri arasında yer değiştirir"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "b"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr "tercihleri listeler (uzman)"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr "tercihleri listeler (ayrıntılı)"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr "tercih listesi oluşturmak için"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr "güncelenmiş tercihler"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "keyserver"
msgstr "anahtar sunucusu hatası"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "set preferred keyserver URL"
msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "anahtar parolasını değiştirir"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "sahibiningüvencesini değiştirir"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "imzaları yürürlükten kaldırır"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revuid"
msgstr "revuid"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revoke a user ID"
msgstr "bir kullanıcı kimliği yürürlükten kaldırır"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "bir yardımcı anahtarı yürürlükten kaldırır"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "bir anahtarı iptal eder"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "bir anahtarı kullanıma sokar"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr "showphoto"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr "foto kimliğini gösterir"
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "bu önceden belirlenmiş işlemler kipinde (in batchmode) yapılamaz\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "gizli anahtar bloğu `%s' okunurken hata oluştu: %s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "Gizli anahtar mevcut.\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "Komut> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr "lütfen önce \"seçmece\" komutunu kullanın.\n"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
msgid "Key is revoked."
msgstr "Anahtar yürürlükten kaldırıldı."
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "Tüm kullanıcı kimlikleri gerçekten imzalanacak mı? "
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "İpucu: İmzalamak için bir kullanıcı kimliği seçiniz\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "%s kipindeyken bu komut kullanılamaz.\n"
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten silinecek mi? "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+#, fuzzy
+msgid "Really move the primary key? "
+msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? "
+
+#: g10/keyedit.c:1598
+#, fuzzy
+msgid "You must select exactly one key.\n"
+msgstr "En az bir anahtar seçmelisiniz.\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "En az bir anahtar seçmelisiniz.\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
msgid "Really revoke all selected user IDs? "
msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten iptal edilecek mi? "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
msgid "Really revoke this user ID? "
msgstr "Bu kullanıcı kimliği gerçekten iptal edilecek mi? "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "Seçilen anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "Bu anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
#, fuzzy
msgid "Set preference list to:\n"
msgstr "tercih listesi oluşturmak için"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr ""
"Seçilen kullanıcı kimlik için tercihleri gerçekten güncellemek istiyor "
"musunuz? "
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? "
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "Değişiklikler kaydedilecek mi? "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "Kaydetmeden çıkılsın mı? "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "güncelleme başarısız: %s\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "gizliyi güncelleme başarısız: %s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "Komut geçersiz (\"yardım\" komutunu deneyin)\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr "Özümlenen: "
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr "Özellikler: "
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keyedit.c:2219
#, c-format
msgid "This key may be revoked by %s key "
msgstr ""
"Bu anahtar %s tarafından şu anahtarla yürürlükten kaldırılmış olabilir: "
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr " (duyarlı)"
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "%s oluşturulamıyor: %s\n"
-#: g10/keyedit.c:2084
-#, fuzzy, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
msgstr "[yürürlükten kaldırıldı] "
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
-msgstr "[son kullanma tarihi: %s]"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
+msgstr "expire"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2246
#, fuzzy, c-format
-msgid "expires: %s"
-msgstr "[son kullanma tarihi: %s]"
+msgid "usage: %s"
+msgstr " güvencesi: %c/%c"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, fuzzy, c-format
msgid "trust: %s"
msgstr " güvencesi: %c/%c"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "Bu anahtar iptal edilmişti"
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "yürkal! yardımcı anahtar yürürlülükten kaldırıldı: %s\n"
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
-msgstr "yürkal- sahte yürürlükten kaldırma sertifikası bulundu\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr "yürkal? Yürürlükten kaldırma denetlenirken problem: %s\n"
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-#, fuzzy
-msgid "revoked"
-msgstr "[yürürlükten kaldırıldı] "
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-#, fuzzy
-msgid "expired"
-msgstr "expire"
+#: g10/keyedit.c:2300
+msgid "card-no: "
+msgstr ""
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "Bir PGP 2.x tarzı kullanıcı kimliğine uygun tercih yok.\n"
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3363,15 +3452,7 @@ msgstr ""
"Gösterilen anahtarın, uygulamayı yeniden başlatıncaya kadar, gerekli\n"
"doğrulukta olmayacağını lütfen gözönüne alınız.\n"
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-msgid "[revoked] "
-msgstr "[yürürlükten kaldırıldı] "
-
-#: g10/keyedit.c:2274
-msgid "[expired] "
-msgstr "[süresi doldu] "
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@ -3380,7 +3461,7 @@ msgstr ""
" başka bir kullanıcı kimliğinin birincil varsayılmasına sebep "
"olabilir.\n"
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3389,45 +3470,45 @@ msgstr ""
"UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliği eklenmesi bu anahtarın\n"
" bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n"
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Onu yine de eklemek istiyor musunuz? (e/H) "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "PGP2 tarzı bir anahtara bir foto kimliği ekleyemeyebilirsiniz.\n"
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "Bu doğru imza silinsin mi? (e/H/k)"
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Bu geçersiz imza silinsin mi? (e/H/k)"
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k)"
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "Bu öz-imza gerçekten silinecek mi? (e/H)"
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d imza silindi.\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d imza silindi.\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "Hiçbir şey silinmedi.\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3437,99 +3518,109 @@ msgstr ""
" eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
" ile sonuçlanabilir.\n"
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"PGP2 tarzı bir anahtara tasarlanmış bir yürürlükten kaldırıcı "
"ekleyemeyebilirsiniz.\n"
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
msgid "Enter the user ID of the designated revoker: "
msgstr ""
"Tasarlanmış yürürlükten kaldırma anahtarının kullanıcı kimliğini giriniz: "
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"bir PGP 2.x tarzı anahtar bir tasarlanmış yürürlükten kaldırma anahtarı "
"olarak atanamaz\n"
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
"bir anahtarı kendisini yürürlükten kaldıracak anahtar olarak "
"kullanamazsınız\n"
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "UYARI: Bu anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"UYARI: yürürlükten kaldıran olarak tasarlanmış bir anahtar başka amaçla\n"
" kullanılamaz!\n"
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr ""
"bir anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
"misiniz? (e/H): "
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "Asıl anahtar için son kullanma tarihi değiştiriliyor.\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
msgid "Please select exactly one user ID.\n"
msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
-#, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "kullanıcı kimliği \"%s\" için v3 öz-imzası atlanıyor\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+#, fuzzy
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H) "
+
+#: g10/keyedit.c:3480
+#, fuzzy
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H) "
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "%d endeksine sahip yardımcı anahtar yok\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "Kullanıcı kimliği: \""
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3538,7 +3629,7 @@ msgstr ""
"\"\n"
" %08lX anahtarınızla %s de imzalandı\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3547,146 +3638,130 @@ msgstr ""
"\"\n"
"%08lX anahtarınızla %s de yerel olarak imzalı\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Onu yine de yürürlükten kaldırmak istiyor musunuz? (e/H) "
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr ""
"Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H) "
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "Bu kullanıcı kimliklerini imzalamışsınız:\n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid " signed by %s on %s%s%s\n"
msgstr " %08lX ile %s%s%s de imzalanmış\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid " revoked by %s on %s\n"
msgstr " %08lX tarafından %s de yürürlükten kaldırılmış\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, fuzzy, c-format
msgid " signed by %s on %s%s\n"
msgstr " %08lX ile %s%s de imzalanmış\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr " (dışarda geçersiz)"
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
msgid "Really create the revocation certificates? (y/N) "
msgstr ""
"Bu yürürlükten kaldırma sertifikalarını gerçekten oluşturacak mısınız? (e/H) "
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "gizli anahtar yok\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "UYARI: bir kullanıcı kimliği imzası %d saniye gelecekte oluşturuldu\n"
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
"Anahtar 0x%3$08lX (kull-kiml %4$d) için %2$ld uzunluktaki %1$s foto kimliği "
"gösteriliyor\n"
-#: g10/keylist.c:179
+#: g10/keylist.c:180
msgid "Critical signature policy: "
msgstr "Kritik imza guvencesi: "
-#: g10/keylist.c:181
+#: g10/keylist.c:182
msgid "Signature policy: "
msgstr "imza guvencesi: "
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "UYARI: geçersiz niteleme verisi bulundu\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
msgid "Critical signature notation: "
msgstr "Kritik imza niteleyici: "
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr "imza niteleyici: "
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr "insan okuyabilir değil"
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr "Anahtar Zinciri"
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr "[son kullanma tarihi: %s]"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr "[son kullanma tarihi: %s]"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, fuzzy, c-format
-msgid " [revoked: %s]"
-msgstr "[yürürlükten kaldırıldı] "
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
msgid "Primary key fingerprint:"
msgstr "Birincil anahtar parmak izi:"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
msgid " Subkey fingerprint:"
msgstr "Yardımcı anahtar parmak izi:"
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
msgid " Primary key fingerprint:"
msgstr "Birincil anahtar parmak izi:"
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
msgid " Subkey fingerprint:"
msgstr "Yardımcı anahtar parmak izi:"
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr " Anahtar parmak izi ="
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3895,25 +3970,25 @@ msgstr "eski stil (PGP 2.x) imza\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "proc_tree() içinde geçersiz kök paket saptandı\n"
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "\"core\" oluşumu iptal edilemedi: %s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "Deneysel algoritmalar kullanılmamalı!\n"
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
"bu şifre algoritması standart dışı; lütfen daha standart birini kullanın!\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr "IDEA şifre eklentisi yok\n"
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr ""
@@ -3921,55 +3996,55 @@ msgstr ""
"adresine\n"
"bakınız.\n"
-#: g10/misc.c:491
+#: g10/misc.c:517
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: \"%s\" seçeneği kullanımdan kaldırılmak üzere.\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "lütfen yerine \"%s%s\" kullanınız\n"
-#: g10/misc.c:508
+#: g10/misc.c:534
msgid "Uncompressed"
msgstr "Sıkıştırılmamış"
-#: g10/misc.c:533
+#: g10/misc.c:559
#, fuzzy
msgid "uncompressed|none"
msgstr "Sıkıştırılmamış"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "bu ileti %s tarafından kullanılamayabilir\n"
-#: g10/misc.c:777
+#: g10/misc.c:826
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "\"%s\"den seçenekler okunuyor\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "öntanımlı alıcı `%s' bilinmiyor\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "%d genel anahtar algoritması kullanılamadı\n"
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
@@ -4008,7 +4083,7 @@ msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "gpg-agent ile haberleşme problemi\n"
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr "vekil ile problem - vekil kullanımı iptal ediliyor\n"
@@ -4044,24 +4119,24 @@ msgstr "Parola çok uzun\n"
msgid "invalid response from agent\n"
msgstr "yanıt geçersiz\n"
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "kullanıcı tarafından durduruldu\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "vekil ile sorun var: vekil 0x%lx ile sonuçlandı\n"
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "önceden tanımlanmış işlemler kipinde (batchmode) parola sorgulanamaz\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "Anahtar parolasını girin: "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4071,24 +4146,24 @@ msgstr ""
"Gizli anahtarın kilidini açmak için bir anahtar parolasına ihtiyacınız var.\n"
"Anahtarın sahibi: \""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr ""
"%u bitlik %s anahtarı, %08lX kimliği ile\n"
"%s tarihinde üretilmiş"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (asıl anahtar kimliği %08lX)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "Tekrar: "
@@ -4311,29 +4386,40 @@ msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
"--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla ayrık imza yapabilirsiniz\n"
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
-msgstr "%s oluşturulamıyor: %s\n"
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
+msgstr "\"%s\" oluşturulamıyor: %s\n"
-#: g10/sign.c:794
-#, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+#: g10/sign.c:771 g10/sign.c:1008
+#, fuzzy, c-format
+msgid "writing to file `%s'\n"
+msgstr "\"%s\"e yazıyor\n"
+
+#: g10/sign.c:795
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
"alıcının tercihleriyle çelişen %s (%d) özümleme algoritması kullanılmak "
"isteniyor\n"
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr "imzalanıyor:"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "dosya açılamadı: %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr ""
"--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla açık imzalama "
"yapabilirsiniz\n"
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s şifrelemesi kullanılmayacak\n"
@@ -4730,7 +4816,7 @@ msgstr ""
"simetrik şifre için zayıf anahtarın önlenmesi mümkün olamadı: %d kere "
"denendi!\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA, 160 bitlik bir hash algoritması kullanılmasını gerektiriyor\n"
@@ -5084,17 +5170,17 @@ msgstr "yardım mevcut değil"
msgid "No help available for `%s'"
msgstr "\"%s\" için yardım mevcut değil"
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "`%s' anahtar zinciri oluşturulurken hata: %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr "`%s' anahtar zinciri oluşturuldu\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "anahtar zinciri belleği yeniden oluşturulurken hata: %s\n"
@@ -5137,8 +5223,7 @@ msgstr "%lu anahtar denetlendi (%lu imza)\n"
msgid "%s: keyring created\n"
msgstr "%s: anahtar zinciri oluşturuldu\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5152,29 +5237,34 @@ msgstr ""
"bir resim kullanırsanız genel anahtarınız da çok büyük olacaktır. Resim\n"
"boyutlarının 240x288 civarında seçilmesi uygun olacaktır.\n"
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr "Foto kimliği için JPEG dosya ismini giriniz: "
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "\"%s\" resmi açılamıyor: %s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
msgid "Are you sure you want to use it (y/N)? "
msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H) "
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr "\"%s\" bir JPEG dosyası değil\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Is this photo correct (y/N/q)? "
msgstr "Bu foto doğru mu? (e/H/ç)? "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
msgid "unable to display photo ID!\n"
msgstr "foto kimliği gösterilemiyor!\n"
@@ -5195,44 +5285,50 @@ msgstr ""
"edildi\n"
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
+#, fuzzy
+msgid "this platform requires temporary files when calling external programs\n"
msgstr ""
"bu platformda, dış uygulamalar çalıştırılırken geçici dosyalar gerekiyor\n"
-#: g10/exec.c:432
-#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
msgstr " %s \"%s\" çalıştırılamıyor: %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:436
+#, fuzzy, c-format
+msgid "unable to execute shell `%s': %s\n"
+msgstr " %s \"%s\" çalıştırılamıyor: %s\n"
+
+#: g10/exec.c:515
#, c-format
msgid "system error while calling external program: %s\n"
msgstr "dış uygulama çalıştırılırken sistem hatası: %s\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr "Dış uygulamamnın doğal olmayan çıkışı\n"
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr "dış uygulama çalıştırılamıyor\n"
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr "dış uygulamanın yanıtı okunamıyor: %s\n"
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr "UYARI: geçici dosya silinemiyor (%s) `%s': %s\n"
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "UYARI: %s geçici dizini silinemiyor: %s\n"
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr "asla "
@@ -5388,6 +5484,47 @@ msgstr "güvence kaydını ararken hata: %s\n"
msgid "read error: %s\n"
msgstr "okuma hatası: %s\n"
+#, fuzzy
+#~ msgid "revoked: %s"
+#~ msgstr "[yürürlükten kaldırıldı] "
+
+#, fuzzy
+#~ msgid "expired: %s"
+#~ msgstr "[son kullanma tarihi: %s]"
+
+#, fuzzy
+#~ msgid "expires: %s"
+#~ msgstr "[son kullanma tarihi: %s]"
+
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "yürkal! yardımcı anahtar yürürlülükten kaldırıldı: %s\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "yürkal- sahte yürürlükten kaldırma sertifikası bulundu\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "yürkal? Yürürlükten kaldırma denetlenirken problem: %s\n"
+
+#~ msgid "[revoked] "
+#~ msgstr "[yürürlükten kaldırıldı] "
+
+#~ msgid "[expired] "
+#~ msgstr "[süresi doldu] "
+
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr "[son kullanma tarihi: %s]"
+
+#~ msgid " [expires: %s]"
+#~ msgstr "[son kullanma tarihi: %s]"
+
+#, fuzzy
+#~ msgid " [revoked: %s]"
+#~ msgstr "[yürürlükten kaldırıldı] "
+
+#~ msgid "can't create %s: %s\n"
+#~ msgstr "%s oluşturulamıyor: %s\n"
+
#~ msgid ""
#~ "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n"
#~ msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6e87ecd58..394f57db5 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
"PO-Revision-Date: 2004-07-20 15:50+0200\n"
"Last-Translator: Meng Jie <[email protected]>\n"
"Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -47,7 +47,7 @@ msgstr "no"
msgid "nN"
msgstr "nN"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "quit"
@@ -280,6 +280,16 @@ msgstr "�����õ�˽Կ"
msgid "keyserver error"
msgstr "��Կ����������"
+#: util/errors.c:108
+#, fuzzy
+msgid "canceled"
+msgstr "ȡ��"
+
+#: util/errors.c:109
+#, fuzzy
+msgid "no card"
+msgstr "�����"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr ""
@@ -302,7 +312,7 @@ msgstr "���ҵ�һ������ȱ���ˡ���(%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "��ⲻ�������Ѽ�ģ��\n"
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "�޷��򿪡�%s���� %s\n"
@@ -334,7 +344,7 @@ msgstr "�޷���ȡ��%s����%s\n"
msgid "note: random_seed file not updated\n"
msgstr "ע�⣺����������ļ�δ������\n"
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr "�޷�������%s����%s\n"
@@ -402,7 +412,7 @@ msgstr "�޷����ɶ��� %d λ������\n"
msgid "can't generate a prime with less than %d bits\n"
msgstr "�޷����ɶ��� %d λ������\n"
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -410,128 +420,128 @@ msgstr ""
"@ָ�\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[�ļ���]|����һ��ǩ��"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[�ļ���]|����һ������ǩ��"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "����һ�ݷ����ǩ��"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "��������"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "��ʹ�öԳƼ���"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "��������(Ĭ��)"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "��֤ǩ��"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "�г���Կ"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "�г���Կ��ǩ��"
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "�����Կǩ��"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "�г���Կ��ָ��"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "�г�˽Կ"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "����һ���µ���Կ��"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "�ӹ�ԿԿ�׻���ɾ����Կ"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "��˽ԿԿ�׻���ɾ����Կ"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "Ϊij����Կ����ǩ��"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "Ϊij����Կ���ӱ���ǩ��"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "�༭ij����Կ��Ϊ������ǩ��"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "����һ�ݵ���֤��"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "������Կ"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "����Կ������ij����Կ��������"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "�ӹ�Կ�������ϵ�����Կ"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "�ڹ�Կ����������Ѱ��Կ"
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "�ӹ�Կ�������������еı�����Կ"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "����/�ϲ���Կ"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "�������ζ����ݿ�"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|�㷨�� [�ļ���]|��ӡ����ɢ��ֵ��ʹ��ָ����ɢ���㷨"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -541,55 +551,51 @@ msgstr ""
"ѡ�\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "����� ASCII ��װ"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|ij��|Ϊ�ռ��ߡ�ij�ס�����"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr "ʹ������û���ʶ��ǩ�ֻ����"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr "|N|�趨ѹ���ȼ�Ϊ N(0 ��ʾ��ѹ��)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "ʹ�ñ�׼���ı�ģʽ"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "ָ������ļ�"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "��ϸģʽ"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "��Ҫ���κθı�"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "����ǰ��ѯ��"
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -597,7 +603,7 @@ msgstr ""
"@\n"
"(��ο�����˵���Ի�����������ѡ��������嵥)\n"
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -617,15 +623,15 @@ msgstr ""
" --list-keys [ij��] ��ʾ��Կ\n"
" --fingerprint [ij��] ��ʾָ��\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr "���� <[email protected]> �������ȱ�ݡ�\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "�÷��� gpg [ѡ��] [�ļ�] (�� -h ����)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -635,7 +641,7 @@ msgstr ""
"ǩ�֡���顢���ܻ����\n"
"Ĭ�ϵIJ������������ݶ���\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -643,513 +649,507 @@ msgstr ""
"\n"
"֧�ֵ��㷨��\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr "��Կ��"
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr "�ԳƼ��ܣ�"
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr "ɢ�У�"
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
msgid "Compression: "
msgstr "ѹ����"
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "�÷���gpg [ѡ��] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "��ͻ��ָ��\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "�ڡ�%s���鶨�����Ҳ����Ⱥ�(=)\n"
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "���棺%s ������Ȩ����ȫ��%s��\n"
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "���棺%s ������Ȩ����ȫ��%s��\n"
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "���棺%s ������Ȩ����ȫ��%s��\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "���棺%s ��Ȩ�޲���ȫ��%s��\n"
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "���棺%s ��Ȩ�޲���ȫ��%s��\n"
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "���棺%s ��Ȩ�޲���ȫ��%s��\n"
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "���棺%s �Ĺر�Ŀ¼����Ȩ����ȫ��%s��\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "���棺%s �Ĺر�Ŀ¼����Ȩ����ȫ��%s��\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "���棺%s �Ĺر�Ŀ¼����Ȩ����ȫ��%s��\n"
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "���棺%s �Ĺر�Ŀ¼Ȩ�޲���ȫ��%s��\n"
-#: g10/g10.c:1205
+#: g10/g10.c:1210
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "���棺%s �Ĺر�Ŀ¼Ȩ�޲���ȫ��%s��\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "���棺%s �Ĺر�Ŀ¼Ȩ�޲���ȫ��%s��\n"
-#: g10/g10.c:1334
-#, c-format
-msgid "unknown configuration item \"%s\"\n"
+#: g10/g10.c:1354
+#, fuzzy, c-format
+msgid "unknown configuration item `%s'\n"
msgstr "δ֪�������%s��\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "ע�⣺��ʽ��Ĭ�������ļ���%s���ѱ�����\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "ע�⣺û��Ĭ�������ļ���%s��\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "�������%s����%s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "�ӡ�%s����ȡѡ��\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "ע�⣺һ������²����õ� %s��\n"
-#: g10/g10.c:1887
-#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+#: g10/g10.c:2021
+#, fuzzy, c-format
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr "�ԳƼ����ܷ���չģ�顰%s����ΪȨ�޲���ȫ��δ������\n"
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "%s ����һ����Ч���ַ���\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "�޷�������Կ������ URI\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s��%d����Ч�ĵ���ѡ��\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "��Ч�ĵ���ѡ��\n"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s��%d����Ч�ĵ���ѡ��\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
msgid "invalid import options\n"
msgstr "��Ч�ĵ���ѡ��\n"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s��%d����Ч�ĵ���ѡ��\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
msgid "invalid export options\n"
msgstr "��Ч�ĵ���ѡ��\n"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s��%d����Ч�ĵ���ѡ��\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "��Ч�ĵ���ѡ��\n"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s��%d����Ч�ĵ���ѡ��\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "��Ч�ĵ���ѡ��\n"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "�޷�������·����� %s\n"
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "���棺������ܻᴴ�������ڴ�ת����\n"
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "���棺%s ��ʹ�� %s ʧЧ\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ������ %s ����\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s �� %s ���������壡\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "��ֻ���� --pgp2 ģʽ�²���������ʽ������ǩ��\n"
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "���� --pgp2 ģʽ��ʱ������ͬʱǩ�ֺͼ���\n"
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "���� --pgp2 ʱ��Ӧ��ֻʹ���ļ������ǹܵ�\n"
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "�� --pgp2 ģʽ�¼��ܱ�����Ҫ IDEA �㷨\n"
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "��ѡ�ĶԳƼ����㷨��Ч\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "��ѡ��ɢ���㷨��Ч\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "��ѡ�ĶԳƼ����㷨��Ч\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
msgid "selected certification digest algorithm is invalid\n"
msgstr "��ѡ��֤��ɢ���㷨��Ч\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr "��Ҫ����ȫ����ǩ����һ��Ҫ���� 0\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr "��Ҫ����ǿ����ǩ����һ��Ҫ���� 1\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "�����֤���һ��Ҫ���� 1 �� 255 ֮��\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "��Ч��Ĭ����֤��Σ�һ��Ҫ�� 0��1��2 �� 3\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "��Ч����С��֤��Σ�һ��Ҫ�� 0��1��2 �� 3\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "ע�⣺ǿ�Ҳ�����ʹ�ü򵥵� S2K ģʽ(0)\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "��Ч�� S2K ģʽ�������� 0��1 �� 3\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
msgid "invalid default preferences\n"
msgstr "��Ч��Ĭ����ѡ��\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
msgid "invalid personal cipher preferences\n"
msgstr "��Ч�ĸ��˶ԳƼ����㷨��ѡ��\n"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
msgid "invalid personal digest preferences\n"
msgstr "��Ч�ĸ���ɢ���㷨��ѡ��\n"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
msgid "invalid personal compress preferences\n"
msgstr "��Ч�ĸ���ѹ���㷨��ѡ��\n"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s Ŀǰ�޷��� %s ����\n"
-#: g10/g10.c:2680
-#, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2797
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "�����ý��ԳƼ����㷨��%s������ %s ģʽ��\n"
-#: g10/g10.c:2685
-#, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2802
+#, fuzzy, c-format
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "�����ý�ɢ���㷨��%s������ %s ģʽ��\n"
-#: g10/g10.c:2690
-#, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+#: g10/g10.c:2807
+#, fuzzy, c-format
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "�����ý�ѹ���㷨��%s������ %s ģʽ��\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "��ʼ�����ζ����ݿ�ʧ�ܣ�%s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "���棺�������ռ���(-r)����δʹ�ù�Կ����\n"
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [���]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [���]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [���]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [���]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "�����ý� %s ���� %s ģʽ��\n"
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [���]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [���]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [���]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "�����ý� %s ���� %s ģʽ��\n"
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [���]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [���]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [���]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key �û���ʶ"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key �û���ʶ"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrsign-key �û���ʶ"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key �û���ʶ"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key �û���ʶ [ָ��]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "�޷��� %s��%s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [�û���ʶ] [Կ�׻�]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "�޷����͵���Կ��������%s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "�޷��ӹ�Կ���������գ�%s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, c-format
msgid "key export failed: %s\n"
msgstr "�޷�������Կ��%s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "�޷��ڹ�Կ��������������%s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "�޷��ӹ�Կ�������ϸ��£�%s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "�⿪ ASCII ��װʧ�ܣ�%s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "���� ASCII ��װʧ�ܣ�%s\n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "��Ч�ġ�%s��ɢ���㷨\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[���]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "�뿪ʼ�������ı��ġ���\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "�޷��򿪡�%s��\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
msgstr "������Ʊ���ֻ���пɴ�ӡ���ַ���ո񣬲���һ����=������β\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
msgid "a user notation name must contain the '@' character\n"
msgstr "�û��������һ��Ҫ���С�@���ַ�\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "���ֵһ������ʹ���κεĿ����ַ�\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr "�����ĵ���֤���� URL ��Ч\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr "������ǩ�ֲ��� URL ��Ч\n"
-#: g10/g10.c:3747
+#: g10/g10.c:3863
#, fuzzy
-msgid "the given signature preferred keyserver URL is invalid\n"
+msgid "the given preferred keyserver URL is invalid\n"
msgstr "������ǩ�ֲ��� URL ��Ч\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "����������ʾ��Ϣ"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
msgid "take the keys from this keyring"
msgstr "�����Կ�׻���ȡ����Կ"
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
msgid "make timestamp conflicts only a warning"
msgstr "��ʱ���ì�ܽ���Ϊ����"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr "|FD|��״̬��Ϣд���ļ������� FD"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "�÷���gpgv [ѡ��] [�ļ�] (�� -h ����)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1183,12 +1183,13 @@ msgid "invalid dash escaped line: "
msgstr "��Ч�����ֺ������У�"
#: g10/armor.c:565
-msgid "unexpected armor:"
+#, fuzzy
+msgid "unexpected armor: "
msgstr "��Ԥ�ڲ����� ASCII ��װ��"
-#: g10/armor.c:695 g10/armor.c:1276
-#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+#: g10/armor.c:695 g10/armor.c:1280
+#, fuzzy, c-format
+msgid "invalid radix64 character %02X skipped\n"
msgstr "������Ч�� 64 �����ַ� %02x\n"
#: g10/armor.c:738
@@ -1199,33 +1200,34 @@ msgstr "�ļ�����Ԥ�ڽ���(û�� CRC ����)\n"
msgid "premature eof (in CRC)\n"
msgstr "�ļ�����Ԥ�ڽ���(CRC ����δ����)\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "�쳣�� CRC\n"
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC ����%06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+#, fuzzy
+msgid "premature eof (in trailer)\n"
msgstr "�ļ�����Ԥ�ڽ���(�ڽ�β��)\n"
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "���������\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "�Ҳ�����Ч�� OpenPGP ���ݡ�\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "��Ч�� ASCII ��װ��һ�г��� %d �ַ�\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr "��װ��������ϵĿɴ�ӡ�ַ�������������ȱ�ݵ��ż����������ɵ�\n"
@@ -1280,7 +1282,7 @@ msgstr " �༴ \""
msgid " aka \""
msgstr " �༴ \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1524,96 +1526,116 @@ msgstr "%s������������Կ�ѱ�����\n"
msgid "no valid addressees\n"
msgstr "û����Ч�ĵ�ַ\n"
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "��ѡ�� %c%lu �ظ�\n"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "̫����ѡ�%c��\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
#, fuzzy
msgid "too many digest preferences\n"
msgstr "̫����ѡ�%c��\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
#, fuzzy
msgid "too many compression preferences\n"
msgstr "̫����ѡ�%c��\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "��ѡ���ַ���������Ч���ַ�\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
msgid "writing direct signature\n"
msgstr "����д��ֱ��ǩ��\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "����д������ǩ��\n"
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "����д����Կ��ǩ��\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "��Կ�ߴ���Ч������ %u �ֽ�\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "��Կ�ߴ����뵽 %u �ֽ�\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "��ѡ����Ҫʹ�õ���Կ���ࣺ\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA �� ElGamal (Ĭ��)\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (������ǩ��)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (�����ڼ���)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (������ǩ��)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (�����ڼ���)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (����ǩ�ּ�����)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, fuzzy, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) RSA (������ǩ��)\n"
+
+#: g10/keygen.c:1224
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) RSA (����ǩ�ּ�����)\n"
+
+#: g10/keygen.c:1226
+#, fuzzy, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) RSA (�����ڼ���)\n"
+
+#: g10/keygen.c:1228
+#, fuzzy, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) RSA (����ǩ�ּ�����)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "����ѡ�� "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "��Ч��ѡ��\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1626,28 +1648,28 @@ msgstr ""
" Ĭ�ϵ���Կ�ߴ��� 1024�ֽ�\n"
" �Ƽ��������Կ�ߴ��� 2048�ֽ�\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "����Ҫ�ö�����Կ�ߴ磿(1024)"
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA����Կ�ߴ�ֻ�ܽ��� 512 �� 1024 ֮��\n"
-#: g10/keygen.c:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "��Կ�ߴ�̫С��RSA ��Կ�ߴ�����Ҫ�� 1024��\n"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "��Կ�ߴ�̫С������Ҫ�� 768��\n"
-#: g10/keygen.c:1255
+#: g10/keygen.c:1328
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "��Կ�ߴ�̫�����ֻ�ܹ��õ� %d��\n"
-#: g10/keygen.c:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1655,27 +1677,27 @@ msgstr ""
"������ʹ�óߴ���� 2048 ����Կ��\n"
"��Ϊ������ĻỨȥ�ܶ�ʱ�䣡\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "��ȷ��Ҫ�������Կ�ߴ��� "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
msgstr "�ðɣ��������ס������Ļ�ͼ���Ҳ���൱�ױ����ӵģ�\n"
-#: g10/keygen.c:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "����Ҫ�����Կ�ߴ��� %u �ֽ�\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "���뵽 %u �ֽ�\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1691,7 +1713,7 @@ msgstr ""
" <n>m = ��Կ�� n �º����\n"
" <n>y = ��Կ�� n ������\n"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1707,29 +1729,29 @@ msgstr ""
" <n>m = ǩ���� n �º����\n"
" <n>y = ǩ���� n ������\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "��Կ����Ч�����ǣ�(0) "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr "ǩ�ֵ���Ч�����Ƕ�ã�(0) "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "��Ч����ֵ\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s ��Զ�������\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr "%s ���� %s ����\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1737,16 +1759,17 @@ msgstr ""
"����ϵͳ�޷���ʾ 2038 ���Ժ�����ڡ�\n"
"��������������ȷ���� 2106 ��֮ǰ����ݡ�\n"
-#: g10/keygen.c:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "������ȷ��(y/n)"
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
+#, fuzzy
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
@@ -1756,44 +1779,44 @@ msgstr ""
" ��Heinrich Heine (Der Dichter) <[email protected]>��\n"
"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "��ʵ������"
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "����������Ч���ַ�\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr "���������������ֿ�ͷ\n"
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr "��������Ҫ������ַ���\n"
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "�����ʼ���ַ��"
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "�����ʼ���ַ��Ч\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "ע�ͣ�"
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "ע�ͺ�����Ч���ַ�\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "������ʹ�á�%s���ַ�����\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1804,27 +1827,27 @@ msgstr ""
" ��%s��\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "�벻Ҫ�ѵ����ʼ���ַ�Ž�������ʵ������ע����\n"
-#: g10/keygen.c:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "��������(N)��ע��(C)�������ʼ���ַ(E)���˳�(Q)��"
-#: g10/keygen.c:1542
+#: g10/keygen.c:1615
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "��������(N)��ע��(C)�������ʼ���ַ(E)��ȷ��(O)/�˳�(Q)��"
-#: g10/keygen.c:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr "���ȸ�������\n"
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1832,16 +1855,16 @@ msgstr ""
"����Ҫһ����������������˽Կ��\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr "�����ٴ�����ʱ���״����벻����������һ��"
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1853,7 +1876,7 @@ msgstr ""
"����Ҫ�ٴ�ִ��������򣬲���ʹ�á�--edit-key��ѡ��ɡ�\n"
"\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1864,58 +1887,58 @@ msgstr ""
"(�����ô���̡��ƶ���ꡢ��дӲ��֮���)\n"
"�����������ַ������и��õĻ������㹻��������\n"
-#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr "��Ǹ����������ģʽ���޷���ɴ˲���\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA ��Կ�Ի��� 1024 �ֽڡ�\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "��Կ������ȡ����\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr "���ڽ���Կд��`%s'\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "���ڽ�˽Կд��`%s'\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "���ڽ�˽Կд��`%s'\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "�Ҳ�����д�Ĺ�ԿԿ�׻���%s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "�Ҳ�����д��˽ԿԿ�׻���%s\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "д�빫ԿԿ�׻���%s��ʱ�������� %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "д��˽ԿԿ�׻���%s��ʱ�������� %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "��Կ��˽Կ�Ѿ����ɲ���ǩ�֡�\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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"
@@ -1923,31 +1946,60 @@ msgstr ""
"��ע�������Կ�������������ܣ����������á�--edit-key��ָ��\n"
"�������ڼ��ܵ���Կ��\n"
-#: g10/keygen.c:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr "������Կʧ�ܣ�%s\n"
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "��Կ���� %lu ����δ�����ɵ�(��������Ϊʱ��Ť����ʱ�ӵ�����)\n"
-#: g10/keygen.c:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "��Կ���� %lu ����δ�����ɵ�(��������Ϊʱ��Ť����ʱ�ӵ�����)\n"
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "ע�⣺Ϊ v3 ��Կ������Կ��ʧȥ OpenPGP ������\n"
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "���Ҫ������ "
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "ɾ����Կ����ʱʧ�ܣ�%s\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "�޷�������%s����%s\n"
+
+#: g10/keygen.c:3248
+#, fuzzy, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "ע�⣺˽Կ %08lX ���� %s ����\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "--output ����������������\n"
@@ -1958,7 +2010,7 @@ msgstr "--output ����������������\n"
msgid "%s: can't open: %s\n"
msgstr "%s���޷��򿪣�%s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "���������ʱ��������%s\n"
@@ -1986,6 +2038,11 @@ msgstr "%s�����棺���ļ�\n"
msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
msgstr "�� --pgp2 ģʽ�У���ֻ��ʹ�� 2048 �ֽڼ����µ� RSA ��Կ����\n"
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "�޷��� %s��%s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -1996,22 +2053,30 @@ msgid ""
"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
msgstr "����Ҫ�������ܵ�������Կ������ʹ�� IDEA �㷨��\n"
-#: g10/encode.c:526 g10/encode.c:721
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#: g10/encode.c:526
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "ǿ��ʹ�õ� %s (%d)�ԳƼ����㷨�����ռ��ߵ���ѡ����\n"
-#: g10/encode.c:634 g10/sign.c:863
-#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+#: g10/encode.c:634 g10/sign.c:864
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
msgstr "ǿ��ʹ�õ� %s (%d)ѹ���㷨�����ռ��ߵ���ѡ����\n"
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "ǿ��ʹ�õ� %s (%d)�ԳƼ����㷨�����ռ��ߵ���ѡ����\n"
+
#: g10/encode.c:818
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s �Ѿ����ܸ�����%s��\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "�Ҳ�����%s����Կ��%s\n"
@@ -2045,8 +2110,9 @@ msgstr "���棺û�е����κζ���\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "pk ��������Ŀ̫�ࡪ���ѽ���\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+#, fuzzy
+msgid "[User ID not found]"
msgstr "[�Ҳ����û���ʶ]"
#: g10/getkey.c:1614
@@ -2199,7 +2265,7 @@ msgstr "��Կ %08lX������� HKP ��Կ�ѱ��޸�\n"
#: g10/import.c:722
#, fuzzy, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "��Կ %08lX����������ǩ�ֵ��û���ʶ��%s���ѱ�����\n"
#: g10/import.c:728
@@ -2226,7 +2292,7 @@ msgstr "��Կ %08lX������Կ����������\n"
msgid "no writable keyring found: %s\n"
msgstr "�Ҳ�����д��Կ�׻���%s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "����д�롮%s��\n"
@@ -2338,12 +2404,12 @@ msgstr "��Կ %08lX��ǩ��û���û���ʶ\n"
#: g10/import.c:1299
#, fuzzy, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "��Կ %08lX���û���ʶ��%s��ʹ���˲�֧�ֵĹ�Կ�㷨\n"
#: g10/import.c:1301
#, fuzzy, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "��Կ %08lX���û���ʶ��%s������ǩ����Ч\n"
#: g10/import.c:1319
@@ -2383,7 +2449,7 @@ msgstr "��Կ %08lX��������Կ������ɾ��\n"
#: g10/import.c:1439
#, fuzzy, c-format
-msgid "key %s: skipped user ID '%s'\n"
+msgid "key %s: skipped user ID \"%s\"\n"
msgstr "��Կ %08lX���������û���ʶ��"
#: g10/import.c:1460
@@ -2397,7 +2463,7 @@ msgstr "��Կ %08lX����Կ������\n"
# * seems that this makes sense
#: g10/import.c:1487
#, fuzzy, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "��Կ %08lX�����ɵ�����ǩ��(�ȼ� %02x)����������\n"
#: g10/import.c:1497
@@ -2430,112 +2496,112 @@ msgstr "��Կ %08lX����⵽�ظ����û���ʶ�����Ѻϲ�\n"
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "���棺��Կ %08lX ���ܱ������ˣ�����ȡ�ص�����Կ %08lX\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "���棺��Կ %08lX ���ܱ������ˣ�������Կ %08lX �����ڡ�\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "��Կ %08lX������������֤�顰%s��\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "��Կ %08lX��������ֱ����Կǩ��\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[����]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[����ǩ��]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "1 ���𻵵�ǩ��\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d ���𻵵�ǩ��\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "�� 1 ��ǩ����Ϊ��ʧ��Կ��δ�����\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "�� %d ��ǩ����Ϊ��ʧ��Կ��δ�����\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "�� 1 ��ǩ����Ϊij�������δ�����\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "�� %d ��ǩ����ΪijЩ�����δ�����\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "��⵽ 1 ��û����Ч����ǩ�ֵ��û���ʶ\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "��⵽ %d ��û����Ч����ǩ�ֵ��û���ʶ\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, fuzzy, c-format
msgid " (%d) I trust marginally\n"
msgstr " %d = ����ǿ����\n"
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, fuzzy, c-format
msgid " (%d) I trust fully\n"
msgstr " %d = ����ȫ����\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "�û���ʶ��%s���ѱ�������"
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "����Ȼ��ҪΪ��ǩ����(y/N)"
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr " �޷�����ǩ�֡�\n"
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "�û���ʶ��%s���ѹ��ڡ�"
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "���棺�û���ʶ��%s����������ǩ�֡�"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2544,11 +2610,11 @@ msgstr ""
"��%s���������ǩ��\n"
"�� PGP 2.x ��ʽ��ǩ�֡�\n"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "���Ƿ���Ҫ���������� OpenPGP ������ǩ�֣�(y/N)"
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2557,11 +2623,11 @@ msgstr ""
"��ĿǰΪ��%s����ǩ��\n"
"�Ѿ������ˡ�\n"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "����Ҫ����һ���µ�ǩ����ȡ���ѹ��ڵ���һ����(y/N)"
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2570,53 +2636,53 @@ msgstr ""
"��Ŀǰ�ڡ�%s����ǩ��\n"
"��һ�ݱ���ǩ�֡�\n"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "���Ƿ���Ҫ���������ɿ�����ȫ������ǩ�֣�(y/N)"
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "��%s���Ѿ���Կ %08lX �ڱ���ǩ��\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "��%s���Ѿ���Կ %08lX ǩ��\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "����Ȼ��ҪΪ���ٴ�ǩ����(y/N)"
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "û�ж�����������Կ %08lX ǩ��\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "�����Կ�Ѿ����ڣ�"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "�����Կ���� %s ���ڡ�\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "����Ҫ������ǩ��Ҳͬʱ������ (Y/n) "
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
msgstr "�������� --pgp2 ģʽ�£��� PGP 2.x ��Կ���� OpenPGP ǩ�֡�\n"
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "����������Կ�� PGP 2.x ģʽ�²���ʹ�á�\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2625,31 +2691,31 @@ msgstr ""
"���ж�ô�����ؼ�����Ҫǩ�ֵ���Կ�Ƿ�ȷʵ�������������Ƶ��������أ�\n"
"�������֪���������Ĵ𰸣������롰0����\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) �Ҳ����� %s\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) �Ҹ���û�м����� %s\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) ����������� %s\n"
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) �ҷdz�С�ĵؼ����� %s\n"
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr "����ѡ��(���� ��?�� �Ի�ø������Ϣ)��"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2657,7 +2723,7 @@ msgstr ""
"�����ȷ��Ҫǩ�������Կ\n"
"ʹ��������Կ��\""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2665,7 +2731,7 @@ msgstr ""
"\n"
"�⽫��������ǩ�֡�\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2673,7 +2739,7 @@ msgstr ""
"\n"
"���棺���ǩ�ֲ��ᱻ���Ϊ���ɵ�����\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2681,7 +2747,7 @@ msgstr ""
"\n"
"���棺���ǩ�ֲ��ᱻ��dzɲ��ɵ�����\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2689,7 +2755,7 @@ msgstr ""
"\n"
"���ǩ�ֻᱻ��dzɲ��ɵ�����\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2697,7 +2763,7 @@ msgstr ""
"\n"
"���ǩ�ֻᱻ��dzɲ��ɵ�����\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2705,7 +2771,7 @@ msgstr ""
"\n"
"�Ҹ���û�м��������Կ��\n"
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2713,7 +2779,7 @@ msgstr ""
"\n"
"��������������Կ��\n"
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2721,34 +2787,34 @@ msgstr ""
"\n"
"�ҷdz�С�ĵؼ��������Կ��\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "���Ҫǩ���� "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "ǩ��ʱʧ�ܣ� %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "�����Կû�б�������\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr "��Կ��˽Կ�����޷�ȡ�á�\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "��Կ�������ˡ�\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "�޷��༭�����Կ�� %s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2756,7 +2822,7 @@ msgstr ""
"����Ҫ�����˽Կ�õ������롣\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2764,546 +2830,566 @@ msgstr ""
"������Ҫ�����롪�������Ǹ������⣡\n"
"\n"
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "�������Ҫ��ô���� "
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "���ڰ���Կ��ǩ���ƶ�����ȷ��λ��ȥ\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "�뿪����˵�"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "q"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "save"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "���沢�뿪"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "help"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "��ʾ�������˵��"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "��ʾָ��"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "list"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "�г���Կ���û���ʶ"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "ѡ���û���ʶN"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "key"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "ѡ����Կ N"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "check"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "�г�ǩ��"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "c"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "Ϊ��Կ����ǩ��"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "s"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "tsign"
msgstr "sign"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "make a trust signature"
msgstr "����һ�ݷ����ǩ��"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "Ϊ��Կ���ӱ���ǩ��"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr "Ϊ��Կ���Ӳ��ɵ���ǩ��"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "sign the key locally and non-revocably"
msgstr "Ϊ��Կ���Ӳ��ɵ����ı���ǩ��"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "����һ���û���ʶ"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr "addphoto"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr "����һ����Ƭ��ʶ"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "ɾ��һ���û�/��Ƭ��ʶ"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr "delphoto"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "����һ����Կ"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+#, fuzzy
+msgid "addcardkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "ɾ��һ����Կ"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "addrevoker"
msgstr "addrevoker"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "add a revocation key"
msgstr "����һ�ѵ�����Կ"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "ɾ��ǩ��"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "����ʹ������"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr "primary"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr "�趨��ѡ�û���ʶ"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "��˽Կ�͹�Կ�嵥���л�"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "t"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr "�г���ѡ��(ר��ģʽ)"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr "�г���ѡ��(��ϸģʽ)"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr "�趨��ѡ��"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr "���¹�����ѡ��"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "keyserver"
msgstr "��Կ����������"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "set preferred keyserver URL"
msgstr "�޷�������Կ������ URI\n"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "��������"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "�������ζ�"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "����ǩ��"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revuid"
msgstr "revuid"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revoke a user ID"
msgstr "����һ���û���ʶ"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "����һ����Կ"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "����һ����Կ"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "����һ����Կ"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr "showphoto"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr "��ʾ��Ƭ��ʶ"
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "�ò����޷���������ģʽ�н���\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "��ȡ��Կ���顮%s��ʱ������%s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "˽Կ���á�\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "����> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "Ҫ��˽Կ������ô����\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr "����ʹ�á�toggle��ָ�\n"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
msgid "Key is revoked."
msgstr "��Կ�ѱ�������"
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "���Ϊ���е��û���ʶǩ���� "
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "��ʾ��ѡ��Ҫ����ǩ�ֵ��û���ʶ\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "�� %s ģʽ�в�����ʹ�����ָ�\n"
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "�����ٵ�ѡ��һ���û���ʶ��\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "������ɾ�����һ���û���ʶ��\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "���Ҫɾ�����б�ѡ����û���ʶ�� "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "���Ҫɾ������û���ʶ�� "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+#, fuzzy
+msgid "Really move the primary key? "
+msgstr "���Ҫɾ������û���ʶ�� "
+
+#: g10/keyedit.c:1598
+#, fuzzy
+msgid "You must select exactly one key.\n"
+msgstr "������ѡ������һ����Կ��\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "������ѡ������һ����Կ��\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "�������Ҫɾ����ѡ�����Կ�� "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "�����Ҫɾ�������Կ�� "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
msgid "Really revoke all selected user IDs? "
msgstr "���Ҫ�������б�ѡ����û���ʶ�� "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
msgid "Really revoke this user ID? "
msgstr "���Ҫ��������û���ʶ�� "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "�������Ҫ������Щ��ѡ�����Կ�� "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "�������Ҫ���������Կ�� "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
#, fuzzy
msgid "Set preference list to:\n"
msgstr "�趨��ѡ��"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr "���Ҫ���±�ѡ���û���ʶ����ѡ���� "
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr "���Ҫ������ѡ���� "
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "Ҫ����䶯�� "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "Ҫ��������뿪�� "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "����ʧ�ܣ�%s\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "����˽Կʧ�ܣ�%s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "��Կû�б䶯���Բ���Ҫ���¡�\n"
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "��Ч��ָ��(���ԡ�help��)\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr "ɢ�У�"
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr "�ص㣺"
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keyedit.c:2219
#, c-format
msgid "This key may be revoked by %s key "
msgstr "�����Կ�ɱ��� %s ��Կ������"
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr " (���е�)"
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "�޷����� %s��%s\n"
-#: g10/keyedit.c:2084
-#, fuzzy, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
msgstr "[�ѵ���]"
-# of subkey
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
-msgstr " [��������%s]"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
-# of subkey
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
+msgstr "expire"
+
+#: g10/keyedit.c:2246
#, fuzzy, c-format
-msgid "expires: %s"
-msgstr " [��������%s]"
+msgid "usage: %s"
+msgstr " ���ζȣ� %c/%c"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, fuzzy, c-format
msgid "trust: %s"
msgstr " ���ζȣ� %c/%c"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "�����Կ�Ѿ�������"
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! ��Կ�Ѿ���������%s\n"
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
-msgstr "rev- ����α��ĵ���\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? ������ʱ�������⣺%s\n"
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-#, fuzzy
-msgid "revoked"
-msgstr "[�ѵ���]"
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-#, fuzzy
-msgid "expired"
-msgstr "expire"
+#: g10/keyedit.c:2300
+msgid "card-no: "
+msgstr ""
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x ��ʽ���û���ʶû����ѡ�\n"
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3311,15 +3397,7 @@ msgstr ""
"��ע�⣬������������֮ǰ��\n"
"��ʾ����Կ��Ч��δ����ȷ��\n"
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-msgid "[revoked] "
-msgstr "[�ѵ���]"
-
-#: g10/keyedit.c:2274
-msgid "[expired] "
-msgstr "[�ѹ���]"
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@ -3327,7 +3405,7 @@ msgstr ""
"���棺û��һ���û���ʶ�����Ϊ��ѡ�û���ʶ����������ܼٶ�һ����ͬ\n"
" ���û���ʶ����ѡ�û���ʶ��\n"
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3336,45 +3414,45 @@ msgstr ""
"���棺����һ�� PGP2 ��ʽ����Կ��\n"
" ������Ƭ��ʶ���ܻᵼ��ijЩ�汾�� PGP ����ʶ�������Կ��\n"
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
msgid "Are you sure you still want to add it? (y/N) "
msgstr "��ȷ����Ȼ��Ҫ������(y/N)"
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "�������԰���Ƭ��ʶ���ӵ� PGP2 ��ʽ����Կ�\n"
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "ɾ�������õ�ǩ����(y/N/q)"
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "ɾ�������Ч��ǩ����(y/N/q)"
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "ɾ�����δ֪��ǩ����(y/N/q)"
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "���Ҫɾ���������ǩ����(y/N)"
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "�Ѿ�ɾ���� %d ��ǩ�֡�\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "�Ѿ�ɾ���� %d ��ǩ�֡�\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "û�ж�����ɾ����\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3383,91 +3461,101 @@ msgstr ""
"���棺����һ�� PGP2 ��ʽ����Կ��\n"
" ����ָ�������߿��ܻᵼ��ijЩ�汾�� PGP �޷�ʶ�������Կ��\n"
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "��������Ϊ PGP 2.x ��ʽ����Կ����ָ�������ߡ�\n"
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
msgid "Enter the user ID of the designated revoker: "
msgstr "����ָ�������ߵ��û���ʶ��"
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "�޷��� PGP 2.x ��ʽ����Կ��Ϊָ��������\n"
# This actually causes no harm (after all, a key that
# designates itself as a revoker is the same as a
# regular key), but it's easy enough to check.
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "�����ܽ�ij����Կ��Ϊ���Լ���ָ��������\n"
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "���棺�����Կ�Ѿ�������ָ�������ߵ����ˣ�\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "���棺��ij����Կָ��Ϊָ�������ߵIJ����޷�������\n"
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr "��ȷ��Ҫ�������Կ��Ϊָ����������(y/N)��"
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "���˽Կ��ɾ��ѡ��\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "������ѡ��һ����Կ��\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "���ڱ����Կ��ʹ�����ޡ�\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "���ڱ����Կ��ʹ�����ޡ�\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "�����ܱ��v3��Կ��ʹ������\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "��˽Կ����û��һ�µ�ǩ��\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
msgid "Please select exactly one user ID.\n"
msgstr "�뾫ȷ��ѡ��һ���û���ʶ��\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
-#, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "���������û���ʶ��%s���� v3 ����ǩ��\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+#, fuzzy
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "��ȷ��Ҫ������(y/N)"
+
+#: g10/keyedit.c:3480
+#, fuzzy
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "��ȷ��Ҫ������(y/N)"
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "û������Ϊ %d ���û���ʶ\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "û������Ϊ %d ����Կ\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "�û���ʶ����"
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3476,7 +3564,7 @@ msgstr ""
"��\n"
"�Ѿ�ʹ��������Կ %08lX �� %s ����ǩ��\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3485,145 +3573,127 @@ msgstr ""
"��\n"
"�Ѿ�ʹ��������Կ %08lX �� %s ���ӱ���ǩ��\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, c-format
msgid "This signature expired on %s.\n"
msgstr "���ǩ������ %s ���ڡ�\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "��ȷ������Ȼ��Ҫ��������(y/N)"
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "ҪΪ���ǩ������һ�ݵ���֤����(y/N)"
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "���Ѿ�Ϊ��Щ�û���ʶ����ǩ�֣�\n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid " signed by %s on %s%s%s\n"
msgstr " �� %08lX �� %s%s%s ����ǩ��\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid " revoked by %s on %s\n"
msgstr " �� %08lX ������ %s\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "�����ڵ�����Щǩ�֣�\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, fuzzy, c-format
msgid " signed by %s on %s%s\n"
msgstr " �� %08lX �� %s%s ����ǩ��\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr " (���ɵ���)"
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
msgid "Really create the revocation certificates? (y/N) "
msgstr "���Ҫ���ɵ���֤����(y/N)"
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "û��˽Կ\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "�û���ʶ��%s���Ѿ���������\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "���棺��һ���û���ʶǩ�ֵ����ڱ��Ϊ %d ����δ��\n"
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "������ʾ %s ��Ƭ��ʶ(��СΪ %ld��������Կ 0x%08lX���û���ʶ %d)\n"
-#: g10/keylist.c:179
+#: g10/keylist.c:180
msgid "Critical signature policy: "
msgstr "�ؼ�ǩ�ֲ��ԣ�"
-#: g10/keylist.c:181
+#: g10/keylist.c:182
msgid "Signature policy: "
msgstr "ǩ�ֲ��ԣ�"
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "���棺�ҵ���Ч�ı������\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
msgid "Critical signature notation: "
msgstr "�ؼ�ǩ�ֱ�ǣ�"
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr "ǩ�ֱ�ǣ�"
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr "���������ܶ�����"
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr "Կ�׻�"
-# of subkey
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr " [��������%s]"
-
-# of subkey
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr " [��������%s]"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, fuzzy, c-format
-msgid " [revoked: %s]"
-msgstr "[�ѵ���]"
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
msgid "Primary key fingerprint:"
msgstr "��Կָ�ƣ�"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
msgid " Subkey fingerprint:"
msgstr "��Կָ�ƣ�"
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
msgid " Primary key fingerprint:"
msgstr " ��Կָ�ƣ�"
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
msgid " Subkey fingerprint:"
msgstr " ��Կָ�ƣ�"
# use tty
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr " ��Կָ�� ="
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3828,77 +3898,77 @@ msgstr "��ʽ(PGP 2.x)ǩ��\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "�� proc_tree() �м�⵽��Ч�ĸ���\n"
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "�޷����ú����ڴ�ת����%s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "��Ӧʹ��ʵ���Ե��㷨��\n"
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr "���Ƽ�ʹ����������㷨���뻻�ø����ϱ�׼���㷨��\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr "IDEA �㷨���������\n"
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr "����� http://www.gnupg.org/why-not-idea.html �Ի�ø���ϸ����Ϣ\n"
-#: g10/misc.c:491
+#: g10/misc.c:517
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d�����鲻ʹ�õ�ѡ�%s��\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "���棺��%s��ѡ���Ѳ�����ʹ��\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "���ԡ�%s%s������\n"
-#: g10/misc.c:508
+#: g10/misc.c:534
msgid "Uncompressed"
msgstr "δ��ѹ��"
-#: g10/misc.c:533
+#: g10/misc.c:559
#, fuzzy
msgid "uncompressed|none"
msgstr "δ��ѹ��"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "%s Ҳ������ʹ���������\n"
-#: g10/misc.c:777
+#: g10/misc.c:826
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "�ӡ�%s����ȡѡ��\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "δ֪��Ĭ���ռ��ߡ�%s��\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "�޷�������Կ�㷨 %d\n"
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "���棺����DZ�ڰ�ȫ��в�ĶԳƼ��ܻỰ��Կ\n"
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d �����Ӱ��趨�˹ؼ��ֽ�\n"
@@ -3937,7 +4007,7 @@ msgstr "�޷���������%s����%s\n"
msgid "communication problem with gpg-agent\n"
msgstr "�� gpg-agent ͨѶ������\n"
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr "������������⡪������ͣ�ô�������\n"
@@ -3973,24 +4043,24 @@ msgstr "����̫��\n"
msgid "invalid response from agent\n"
msgstr "����������Ӧ��Ч\n"
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "�û�ȡ��\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "������������⣺�������򷵻� 0x%lx\n"
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "��������ģʽ���޷�ѯ������\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "���������룺"
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -4000,22 +4070,22 @@ msgstr ""
"����Ҫ����ʹ���ߵ����룬���ܽ⿪˽Կ��\n"
"\""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u �ֽڵ� %s ��Կ��Կ�׺� %08lX�������� %s"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr "(��Կ�׺� %08lX)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "��������һ�����룺"
@@ -4221,25 +4291,36 @@ msgstr "���棺��%s����һ�����ļ�\n"
msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "���� --pgp2 ģʽ��ֻ�ܹ�ʹ�� PGP 2.x ��ʽ����Կ��������ǩ��\n"
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
-msgstr "�޷����� %s��%s\n"
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
+msgstr "�޷�������%s����%s\n"
-#: g10/sign.c:794
-#, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+#: g10/sign.c:771 g10/sign.c:1008
+#, fuzzy, c-format
+msgid "writing to file `%s'\n"
+msgstr "����д�롮%s��\n"
+
+#: g10/sign.c:795
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "ǿ��ʹ�õ� %s (%d)ɢ���㷨�����ռ��ߵ���ѡ����\n"
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr "����ǩ�֣�"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "�޷����ļ���%s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "���� --pgp2 ģʽ��ֻ�ܹ�ʹ�� PGP 2.x ��ʽ����Կ��������ǩ��\n"
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s ���ܽ�������\n"
@@ -4630,7 +4711,7 @@ msgstr "����������Կ������������\n"
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr "�ԳƼ����޷�������������Կ���Ѿ����� %d �Σ�\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA Ҫ��ʹ�� 160 �ֽڵ�ɢ���㷨\n"
@@ -4981,17 +5062,17 @@ msgstr "û�п��õİ���"
msgid "No help available for `%s'"
msgstr "��%s��û�п��õİ���"
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "����Կ�׻���%s��ʱ��������%s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr "Կ�׻���%s���ѽ���\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "���½���Կ�׻�����ʧ�ܣ� %s\n"
@@ -5034,8 +5115,7 @@ msgstr "�Ѽ�� %lu ����Կ(%lu ��ǩ��)\n"
msgid "%s: keyring created\n"
msgstr "%s��Կ�׻��ѽ���\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5049,29 +5129,34 @@ msgstr ""
"������ԿҲ���ɷdz���\n"
"�뾡����ͼƬ�ߴ������240x288���ң����Ǹ�����ijߴ硣\n"
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr "����Ҫ������Ƭ��ʶ��JPEG�ļ����� "
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "�޷�����Ƭ��%s����%s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
msgid "Are you sure you want to use it (y/N)? "
msgstr "��ȷ��Ҫ������(y/N)"
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr "��%s������һ�� JPEG �ļ�\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Is this photo correct (y/N/q)? "
msgstr "������Ƭ��ȷ��(y/N/q)"
-#: g10/photoid.c:331
+#: g10/photoid.c:332
msgid "unable to display photo ID!\n"
msgstr "�޷���ʾ��Ƭ��ʶ��\n"
@@ -5090,43 +5175,49 @@ msgid ""
msgstr "���������ļ�Ȩ�޲���ȫ���ⲿ������ñ�����\n"
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
+#, fuzzy
+msgid "this platform requires temporary files when calling external programs\n"
msgstr "���������ƽ̨�ϵ����ⲿ����ʱ��Ҫ��ʱ�ļ�\n"
-#: g10/exec.c:432
-#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
msgstr "�޷�ִ��%s��%s����%s\n"
-#: g10/exec.c:513
+#: g10/exec.c:436
+#, fuzzy, c-format
+msgid "unable to execute shell `%s': %s\n"
+msgstr "�޷�ִ��%s��%s����%s\n"
+
+#: g10/exec.c:515
#, c-format
msgid "system error while calling external program: %s\n"
msgstr "�����ⲿ����ʱ����ϵͳ����%s\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr "�ⲿ�����쳣�˳�\n"
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr "�޷�ִ���ⲿ����\n"
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr "�޷���ȡ�ⲿ������Ӧ��%s\n"
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr "���棺�޷�ɾ����ʱ�ļ�(%s)��%s����%s\n"
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "���棺�޷�ɾ����ʱĿ¼��%s����%s\n"
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr "��������"
@@ -5282,6 +5373,51 @@ msgstr "Ѱ�����ζȼ�¼ʱ������%s\n"
msgid "read error: %s\n"
msgstr "��ȡ����%s\n"
+#, fuzzy
+#~ msgid "revoked: %s"
+#~ msgstr "[�ѵ���]"
+
+# of subkey
+#, fuzzy
+#~ msgid "expired: %s"
+#~ msgstr " [��������%s]"
+
+# of subkey
+#, fuzzy
+#~ msgid "expires: %s"
+#~ msgstr " [��������%s]"
+
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "rev! ��Կ�Ѿ���������%s\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "rev- ����α��ĵ���\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "rev? ������ʱ�������⣺%s\n"
+
+#~ msgid "[revoked] "
+#~ msgstr "[�ѵ���]"
+
+#~ msgid "[expired] "
+#~ msgstr "[�ѹ���]"
+
+# of subkey
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr " [��������%s]"
+
+# of subkey
+#~ msgid " [expires: %s]"
+#~ msgstr " [��������%s]"
+
+#, fuzzy
+#~ msgid " [revoked: %s]"
+#~ msgstr "[�ѵ���]"
+
+#~ msgid "can't create %s: %s\n"
+#~ msgstr "�޷����� %s��%s\n"
+
#~ msgid ""
#~ "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n"
#~ msgstr "���棺ɢ���㷨��%s�������� OpenPGP ��һ���֡���Ҫʹ�ã�����Ը���\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0dcadacdb..64df8a8c1 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"POT-Creation-Date: 2004-10-01 10:36+0200\n"
"PO-Revision-Date: 2003-05-13 15:48+0800\n"
"Last-Translator: Jedi <[email protected]>\n"
"Language-Team: Chinese (traditional) <[email protected]>\n"
@@ -50,7 +50,7 @@ msgstr "no"
msgid "nN"
msgstr "nN"
-#: util/miscutil.c:348 g10/keyedit.c:1138
+#: util/miscutil.c:348 g10/keyedit.c:1232
msgid "quit"
msgstr "quit"
@@ -283,6 +283,16 @@ msgstr "���i���p�_"
msgid "keyserver error"
msgstr "���_���A�����~"
+#: util/errors.c:108
+#, fuzzy
+msgid "canceled"
+msgstr "����"
+
+#: util/errors.c:109
+#, fuzzy
+msgid "no card"
+msgstr "���Q�[�K"
+
#: util/logger.c:183
msgid "ERROR: "
msgstr ""
@@ -305,7 +315,7 @@ msgstr "�p���@�ӷ岫�F ... (%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "��������üƻ`���Ҳ�\n"
-#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
msgstr "�L�k�}�� `%s' �G %s\n"
@@ -337,7 +347,7 @@ msgstr "�L�k�� `%s' �G %s\n"
msgid "note: random_seed file not updated\n"
msgstr "�Ъ`�N�G random_seed �ɮץ��Q��s\n"
-#: cipher/random.c:473 g10/exec.c:481
+#: cipher/random.c:473
#, c-format
msgid "can't create `%s': %s\n"
msgstr "�L�k�إ� `%s' �G %s\n"
@@ -405,7 +415,7 @@ msgstr ""
msgid "can't generate a prime with less than %d bits\n"
msgstr ""
-#: g10/g10.c:354
+#: g10/g10.c:358
msgid ""
"@Commands:\n"
" "
@@ -413,128 +423,128 @@ msgstr ""
"@���O�G\n"
" "
-#: g10/g10.c:356
+#: g10/g10.c:360
msgid "|[file]|make a signature"
msgstr "|[�ɮ�]|�إߤ@��ñ��"
-#: g10/g10.c:357
+#: g10/g10.c:361
msgid "|[file]|make a clear text signature"
msgstr "|[�ɮ�]|�إߤ@������ñ��"
-#: g10/g10.c:358
+#: g10/g10.c:362
msgid "make a detached signature"
msgstr "�إߤ@��������ñ��"
-#: g10/g10.c:359
+#: g10/g10.c:363
msgid "encrypt data"
msgstr "�[�K���"
-#: g10/g10.c:361
+#: g10/g10.c:365
msgid "encryption only with symmetric cipher"
msgstr "�Ȩϥι�٦��s�K�k�ӥ[�K"
-#: g10/g10.c:363
+#: g10/g10.c:367
msgid "decrypt data (default)"
msgstr "��ƸѱK(�w�])"
-#: g10/g10.c:365
+#: g10/g10.c:369
msgid "verify a signature"
msgstr "���ҬY��ñ��"
-#: g10/g10.c:367
+#: g10/g10.c:371
msgid "list keys"
msgstr "�C�X���_"
-#: g10/g10.c:369
+#: g10/g10.c:373
msgid "list keys and signatures"
msgstr "�C�X���_�Mñ��"
-#: g10/g10.c:370
+#: g10/g10.c:374
#, fuzzy
msgid "list and check key signatures"
msgstr "�ˬd���_ñ��"
-#: g10/g10.c:371
+#: g10/g10.c:375
msgid "list keys and fingerprints"
msgstr "�C�X���_�M����"
-#: g10/g10.c:372
+#: g10/g10.c:376
msgid "list secret keys"
msgstr "�C�X�p�_"
-#: g10/g10.c:373
+#: g10/g10.c:377
msgid "generate a new key pair"
msgstr "���ͤ@���s�����_��"
-#: g10/g10.c:374
+#: g10/g10.c:378
msgid "remove keys from the public keyring"
msgstr "�q���_�_�Ͱ�̲��h���_"
-#: g10/g10.c:376
+#: g10/g10.c:380
msgid "remove keys from the secret keyring"
msgstr "�q�p�_�_�Ͱ�̲��h���_"
-#: g10/g10.c:377
+#: g10/g10.c:381
msgid "sign a key"
msgstr "ñ�p�Y����_"
-#: g10/g10.c:378
+#: g10/g10.c:382
msgid "sign a key locally"
msgstr "�Ȧb���añ�p�Y����_"
-#: g10/g10.c:381
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "ñ�p�νs��Y����_"
-#: g10/g10.c:382
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "���ͤ@���M�P����"
-#: g10/g10.c:384
+#: g10/g10.c:388
msgid "export keys"
msgstr "�ץX���_"
-#: g10/g10.c:385
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "����_�ץX�ܬY�Ӫ��_���A���W"
-#: g10/g10.c:386
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "�q�Y�Ӫ��_���A���W�פJ���_"
-#: g10/g10.c:388
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "�b�Y�Ӫ��_���A���W�j�M���_"
-#: g10/g10.c:390
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "�q�Y�Ӫ��_���A���W��s�Ҧ������_"
-#: g10/g10.c:393
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "�פJ/�X�֪��_"
-#: g10/g10.c:396
+#: g10/g10.c:400
msgid "print the card status"
msgstr ""
-#: g10/g10.c:397
+#: g10/g10.c:401
msgid "change data on a card"
msgstr ""
-#: g10/g10.c:398
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr ""
-#: g10/g10.c:406
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "��s�H����Ʈw"
-#: g10/g10.c:413
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|�t��k [�ɮ�]|�L�X�T���K�n"
-#: g10/g10.c:417 g10/gpgv.c:64
+#: g10/g10.c:421 g10/gpgv.c:65
msgid ""
"@\n"
"Options:\n"
@@ -544,55 +554,51 @@ msgstr ""
"�ﶵ�G\n"
" "
-#: g10/g10.c:419
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "�إߥH ASCII �ʸ˹L����X"
-#: g10/g10.c:421
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|�W�r|�H�u�W�r�v�@���[�K��H"
-#: g10/g10.c:432
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr "�ϥγo�ӨϥΪ� ID ��ñ�p�θѱK"
-#: g10/g10.c:433
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr "|N|�]�w���Y���Ŭ� N (0 ���ܤ����Y)"
-#: g10/g10.c:438
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "�ϥμзǪ���r�Ҧ�"
-#: g10/g10.c:448
+#: g10/g10.c:452
msgid "use as output file"
msgstr "���@��X�ɮרӨϥ�"
-#: g10/g10.c:450 g10/gpgv.c:66
+#: g10/g10.c:454 g10/gpgv.c:67
msgid "verbose"
msgstr "�o���Ҧ�"
-#: g10/g10.c:461
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "���n���������"
-#: g10/g10.c:462
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "�мg�e���߰�"
-#: g10/g10.c:507
+#: g10/g10.c:511
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/g10.c:508
+#: g10/g10.c:512
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/g10.c:530
-msgid "allow the use of admin card commands"
-msgstr ""
-
-#: g10/g10.c:535
+#: g10/g10.c:537
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -600,7 +606,7 @@ msgstr ""
"@\n"
"(�аѷӽu�W���������Ө��o�Ҧ��R�O�M�ﶵ������M��)\n"
-#: g10/g10.c:538
+#: g10/g10.c:540
msgid ""
"@\n"
"Examples:\n"
@@ -620,15 +626,15 @@ msgstr ""
" --list-keys [�W�r] ��ܪ��_\n"
" --fingerprint [�W�r] ��ܫ���\n"
-#: g10/g10.c:713 g10/gpgv.c:91
+#: g10/g10.c:718 g10/gpgv.c:92
msgid "Please report bugs to <[email protected]>.\n"
msgstr "�ЦV <[email protected]> �^���{���岫�C\n"
-#: g10/g10.c:730
+#: g10/g10.c:735
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "�Ϊk�G gpg [�ﶵ] [�ɮ�] (�Υ� -h �D�U)"
-#: g10/g10.c:733
+#: g10/g10.c:738
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -638,7 +644,7 @@ msgstr ""
"ñ�p�B�ˬd�B�[�K�θѱK\n"
"�w�]���ާ@�|�̿�J��Ʀөw\n"
-#: g10/g10.c:744
+#: g10/g10.c:749
msgid ""
"\n"
"Supported algorithms:\n"
@@ -646,515 +652,509 @@ msgstr ""
"\n"
"�w�Q�䴩���t��k�G\n"
-#: g10/g10.c:747
+#: g10/g10.c:752
msgid "Pubkey: "
msgstr "���_�G "
-#: g10/g10.c:753 g10/keyedit.c:1737
+#: g10/g10.c:758 g10/keyedit.c:1883
msgid "Cipher: "
msgstr "�s�K�k�G "
-#: g10/g10.c:759
+#: g10/g10.c:764
msgid "Hash: "
msgstr "����G "
-#: g10/g10.c:765 g10/keyedit.c:1783
+#: g10/g10.c:770 g10/keyedit.c:1929
msgid "Compression: "
msgstr "���Y�G "
-#: g10/g10.c:848
+#: g10/g10.c:853
msgid "usage: gpg [options] "
msgstr "�Ϊk�G gpg [�ﶵ] "
-#: g10/g10.c:951
+#: g10/g10.c:956
msgid "conflicting commands\n"
msgstr "���O�����٬�\n"
-#: g10/g10.c:969
+#: g10/g10.c:974
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "�b�u%s�v�s�թw�q�̧䤣�� = �O��\n"
-#: g10/g10.c:1166
+#: g10/g10.c:1171
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "ĵ�i�G %s \"%s\" ���Ҧ��v�ä��w��\n"
-#: g10/g10.c:1169
+#: g10/g10.c:1174
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "ĵ�i�G %s \"%s\" ���Ҧ��v�ä��w��\n"
-#: g10/g10.c:1172
+#: g10/g10.c:1177
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "ĵ�i�G %s \"%s\" ���Ҧ��v�ä��w��\n"
-#: g10/g10.c:1178
+#: g10/g10.c:1183
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "ĵ�i�G %s \"%s\" ���\�i�ä��w��\n"
-#: g10/g10.c:1181
+#: g10/g10.c:1186
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "ĵ�i�G %s \"%s\" ���\�i�ä��w��\n"
-#: g10/g10.c:1184
+#: g10/g10.c:1189
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "ĵ�i�G %s \"%s\" ���\�i�ä��w��\n"
-#: g10/g10.c:1190
+#: g10/g10.c:1195
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��Ҧ��v�ä��w��\n"
-#: g10/g10.c:1193
+#: g10/g10.c:1198
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��Ҧ��v�ä��w��\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1201
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��Ҧ��v�ä��w��\n"
-#: g10/g10.c:1202
+#: g10/g10.c:1207
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��\�i�ä��w��\n"
-#: g10/g10.c:1205
+#: g10/g10.c:1210
#, fuzzy, c-format
msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
-"\"\n"
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��\�i�ä��w��\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1213
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��\�i�ä��w��\n"
-#: g10/g10.c:1334
+#: g10/g10.c:1354
#, fuzzy, c-format
-msgid "unknown configuration item \"%s\"\n"
+msgid "unknown configuration item `%s'\n"
msgstr "�s���]�w�� `%s' �Q�إߤF\n"
-#: g10/g10.c:1601
+#: g10/g10.c:1732
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "�Ъ`�N�G�¦����w�]�ﶵ�� `%s' �w�Q����\n"
-#: g10/g10.c:1637
+#: g10/g10.c:1768
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "�Ъ`�N�G�S���w�]�ﶵ�� `%s'\n"
-#: g10/g10.c:1641
+#: g10/g10.c:1772
#, c-format
msgid "option file `%s': %s\n"
msgstr "�ﶵ�� `%s' �G %s\n"
-#: g10/g10.c:1648
+#: g10/g10.c:1779
#, c-format
msgid "reading options from `%s'\n"
msgstr "�q `%s' Ū���ﶵ\n"
-#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "�Ъ`�N�G�@�뱡�p�U���|�Ψ� %s�I\n"
-#: g10/g10.c:1887
-#, c-format
-msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+#: g10/g10.c:2021
+#, fuzzy, c-format
+msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr "�s�K�k�����Ҳ� \"%s\" �]���\�i���w���ӥ��Q���J\n"
-#: g10/g10.c:2099
-#, c-format
-msgid "%s is not a valid character set\n"
+#: g10/g10.c:2233
+#, fuzzy, c-format
+msgid "`%s' is not a valid character set\n"
msgstr "%s ���O�@�Ӧ��Ī��r����\n"
-#: g10/g10.c:2118 g10/keyedit.c:3228
+#: g10/g10.c:2252 g10/keyedit.c:3418
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "�L�k���R���_���A�� URI\n"
-#: g10/g10.c:2124
+#: g10/g10.c:2258
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: �L�Ī��ץX�ﶵ\n"
-#: g10/g10.c:2127
+#: g10/g10.c:2261
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "�L�Ī��ץX�ﶵ\n"
-#: g10/g10.c:2134
+#: g10/g10.c:2268
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: �L�Ī��פJ�ﶵ\n"
-#: g10/g10.c:2137
+#: g10/g10.c:2271
msgid "invalid import options\n"
msgstr "�L�Ī��פJ�ﶵ\n"
-#: g10/g10.c:2144
+#: g10/g10.c:2278
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: �L�Ī��ץX�ﶵ\n"
-#: g10/g10.c:2147
+#: g10/g10.c:2281
msgid "invalid export options\n"
msgstr "�L�Ī��ץX�ﶵ\n"
-#: g10/g10.c:2172
+#: g10/g10.c:2288
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: �L�Ī��פJ�ﶵ\n"
-#: g10/g10.c:2175
+#: g10/g10.c:2291
#, fuzzy
msgid "invalid list options\n"
msgstr "�L�Ī��פJ�ﶵ\n"
-#: g10/g10.c:2198
+#: g10/g10.c:2313
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: �L�Ī��ץX�ﶵ\n"
-#: g10/g10.c:2201
+#: g10/g10.c:2316
#, fuzzy
msgid "invalid verify options\n"
msgstr "�L�Ī��ץX�ﶵ\n"
-#: g10/g10.c:2208
+#: g10/g10.c:2323
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "�L�k������ɸ��|�]�� %s\n"
-#: g10/g10.c:2398
+#: g10/g10.c:2513
msgid "WARNING: program may create a core file!\n"
msgstr "ĵ�i�G�{���i��|�ɦL�X�֤��ɡI\n"
-#: g10/g10.c:2402
+#: g10/g10.c:2517
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ĵ�i�G %s �|�ϱo %s ����\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2526
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ���Q���\�� %s �֥�\n"
-#: g10/g10.c:2414
+#: g10/g10.c:2529
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s �� %s ��b�@�_�S���N�q�I\n"
-#: g10/g10.c:2435
+#: g10/g10.c:2550
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "�p�馳�b --pgp2 �Ҧ��U�ׯవ�X�������Ω���ñ��\n"
-#: g10/g10.c:2441
+#: g10/g10.c:2556
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "�p�b --pgp2 �Ҧ��U�ɡA����P��ñ�p�M�[�K\n"
-#: g10/g10.c:2447
+#: g10/g10.c:2562
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "�ҥ� --pgp2 �ɩp�����Өϥ��ɮסA�ӫD�޹D\n"
-#: g10/g10.c:2460
+#: g10/g10.c:2575
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "�b --pgp2 �Ҧ��U�[�K�T���ݭn IDEA �s�K�k\n"
-#: g10/g10.c:2528 g10/g10.c:2552
+#: g10/g10.c:2645 g10/g10.c:2669
msgid "selected cipher algorithm is invalid\n"
msgstr "�ҿ諸�s�K�t��k�L��\n"
-#: g10/g10.c:2534 g10/g10.c:2558
+#: g10/g10.c:2651 g10/g10.c:2675
msgid "selected digest algorithm is invalid\n"
msgstr "�ҿ諸�K�n�t��k�L��\n"
-#: g10/g10.c:2540
+#: g10/g10.c:2657
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "�ҿ諸�s�K�t��k�L��\n"
-#: g10/g10.c:2546
+#: g10/g10.c:2663
msgid "selected certification digest algorithm is invalid\n"
msgstr "�ҿ諸���ҺK�n�t��k�L��\n"
-#: g10/g10.c:2561
+#: g10/g10.c:2678
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed �@�w�n�j�� 0\n"
-#: g10/g10.c:2563
+#: g10/g10.c:2680
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed �@�w�n�j�� 1\n"
-#: g10/g10.c:2565
+#: g10/g10.c:2682
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth �@�w�n���� 1 �M 255 ����\n"
-#: g10/g10.c:2567
+#: g10/g10.c:2684
#, fuzzy
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "�L�� default-check-level �F�@�w�n�O 0 �B 1 �B 2 �� 3\n"
-#: g10/g10.c:2569
+#: g10/g10.c:2686
#, fuzzy
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "�L�� default-check-level �F�@�w�n�O 0 �B 1 �B 2 �� 3\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2689
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "�Ъ`�N�G�j�P����ij�ϥγ�ª� S2K �Ҧ� (0)\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2693
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "�L�Ī� S2K �Ҧ��F�@�w�n�O 0 �B 1 �� 3\n"
-#: g10/g10.c:2583
+#: g10/g10.c:2700
msgid "invalid default preferences\n"
msgstr "�L���w�]���n\n"
-#: g10/g10.c:2592
+#: g10/g10.c:2709
msgid "invalid personal cipher preferences\n"
msgstr "�L�Ī��ӤH�s�K�k���n\n"
-#: g10/g10.c:2596
+#: g10/g10.c:2713
msgid "invalid personal digest preferences\n"
msgstr "�L�Ī��ӤH�K�n���n\n"
-#: g10/g10.c:2600
+#: g10/g10.c:2717
msgid "invalid personal compress preferences\n"
msgstr "�L�Ī��ӤH���Y���n\n"
-#: g10/g10.c:2633
+#: g10/g10.c:2750
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s �� %s ��b�@�_�S���N�q�I\n"
-#: g10/g10.c:2680
+#: g10/g10.c:2797
#, fuzzy, c-format
-msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
-#: g10/g10.c:2685
+#: g10/g10.c:2802
#, fuzzy, c-format
-msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
-#: g10/g10.c:2690
+#: g10/g10.c:2807
#, fuzzy, c-format
-msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
-#: g10/g10.c:2778
+#: g10/g10.c:2895
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "�H����Ʈw�ҩl���ѡG %s\n"
-#: g10/g10.c:2789
+#: g10/g10.c:2906
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "ĵ�i�G���w������� (-r) ���ϥΤ��_�[�K\n"
-#: g10/g10.c:2800
+#: g10/g10.c:2917
msgid "--store [filename]"
msgstr "--store [�ɦW]"
-#: g10/g10.c:2807
+#: g10/g10.c:2924
msgid "--symmetric [filename]"
msgstr "--symmetric [�ɦW]"
-#: g10/g10.c:2819
+#: g10/g10.c:2936
msgid "--encrypt [filename]"
msgstr "--encrypt [�ɦW]"
-#: g10/g10.c:2832
+#: g10/g10.c:2949
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [�ɦW]"
-#: g10/g10.c:2834
+#: g10/g10.c:2951
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2837
+#: g10/g10.c:2954
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
-#: g10/g10.c:2855
+#: g10/g10.c:2972
msgid "--sign [filename]"
msgstr "--sign [�ɦW]"
-#: g10/g10.c:2868
+#: g10/g10.c:2985
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [�ɦW]"
-#: g10/g10.c:2883
+#: g10/g10.c:3000
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [�ɦW]"
-#: g10/g10.c:2885
+#: g10/g10.c:3002
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/g10.c:2888
+#: g10/g10.c:3005
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
-#: g10/g10.c:2908
+#: g10/g10.c:3025
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [�ɦW]"
-#: g10/g10.c:2917
+#: g10/g10.c:3034
msgid "--clearsign [filename]"
msgstr "--clearsign [�ɦW]"
-#: g10/g10.c:2942
+#: g10/g10.c:3059
msgid "--decrypt [filename]"
msgstr "--decrypt [�ɦW]"
-#: g10/g10.c:2950
+#: g10/g10.c:3067
msgid "--sign-key user-id"
msgstr "--sign-key �ϥΪ�ID"
-#: g10/g10.c:2954
+#: g10/g10.c:3071
msgid "--lsign-key user-id"
msgstr "--lsign-key �ϥΪ�ID"
-#: g10/g10.c:2958
+#: g10/g10.c:3075
msgid "--nrsign-key user-id"
msgstr "--nrsign-key �ϥΪ�ID"
-#: g10/g10.c:2962
+#: g10/g10.c:3079
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key �ϥΪ�ID"
-#: g10/g10.c:2986
+#: g10/g10.c:3103
msgid "--edit-key user-id [commands]"
msgstr "--edit-key �ϥΪ�ID [���O]"
-#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
-#, c-format
-msgid "can't open %s: %s\n"
-msgstr "�L�k�}�� %s: %s\n"
-
-#: g10/g10.c:3057
+#: g10/g10.c:3174
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [�ϥΪ�ID] [�_�Ͱ�]"
-#: g10/g10.c:3094
+#: g10/g10.c:3211
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "���ͪ��_���ѡG %s\n"
-#: g10/g10.c:3096
+#: g10/g10.c:3213
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "���ͪ��_���ѡG %s\n"
-#: g10/g10.c:3098
+#: g10/g10.c:3215
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "���ͪ��_���ѡG %s\n"
-#: g10/g10.c:3109
+#: g10/g10.c:3226
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "���ͪ��_���ѡG %s\n"
-#: g10/g10.c:3119
+#: g10/g10.c:3236
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "��s�p�_���ѡG %s\n"
-#: g10/g10.c:3160
+#: g10/g10.c:3277
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "�Ѷ}�ʸ˥��ѡG %s\n"
-#: g10/g10.c:3168
+#: g10/g10.c:3285
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "�i��ʸ˥��ѡG %s\n"
-#: g10/g10.c:3255
+#: g10/g10.c:3372
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "�L�� `%s' ����t��k\n"
-#: g10/g10.c:3378
+#: g10/g10.c:3495
msgid "[filename]"
msgstr "[�ɦW]"
-#: g10/g10.c:3382
+#: g10/g10.c:3499
msgid "Go ahead and type your message ...\n"
msgstr "�ж}�l��J�p���T�� ...\n"
-#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3502 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "�L�k�}�� `%s'\n"
-#: g10/g10.c:3659
+#: g10/g10.c:3776
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
msgstr "�аO�W�٤@�w�n�ĥΥi�L�X���r�ũΪťաA�åH�@�ӡu=�v�ӵ���\n"
-#: g10/g10.c:3668
+#: g10/g10.c:3784
msgid "a user notation name must contain the '@' character\n"
msgstr "�ϥΪ̼аO�W�٤@�w�n�t���u@�v�r��\n"
-#: g10/g10.c:3678
+#: g10/g10.c:3794
msgid "a notation value must not use any control characters\n"
msgstr "�аO�Ȥ@�w����ϥΥ��󪺱���r��\n"
-#: g10/g10.c:3712
+#: g10/g10.c:3828
msgid "the given certification policy URL is invalid\n"
msgstr "���w�������ҭ�h URL �L��\n"
-#: g10/g10.c:3714
+#: g10/g10.c:3830
msgid "the given signature policy URL is invalid\n"
msgstr "���w����h URL �L��\n"
-#: g10/g10.c:3747
+#: g10/g10.c:3863
#, fuzzy
-msgid "the given signature preferred keyserver URL is invalid\n"
+msgid "the given preferred keyserver URL is invalid\n"
msgstr "���w����h URL �L��\n"
-#: g10/gpgv.c:67
+#: g10/gpgv.c:68
msgid "be somewhat more quiet"
msgstr "�ɶq�w�R��"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
msgid "take the keys from this keyring"
msgstr "�q�o���_�Ͱ�̨��Ϊ��_"
-#: g10/gpgv.c:70
+#: g10/gpgv.c:71
msgid "make timestamp conflicts only a warning"
msgstr "�ȧ�ɶ��W�L�٬޵���ĵ�i"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "|FD|write status info to this FD"
msgstr "|�ɮ״y�z|�⪬�A��T�g�J���ɮ״y�z"
-#: g10/gpgv.c:95
+#: g10/gpgv.c:96
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "�Ϊk�G gpgv [�ﶵ] [�ɮ�] (�Υ� -h �D�U)"
-#: g10/gpgv.c:98
+#: g10/gpgv.c:99
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1188,12 +1188,13 @@ msgid "invalid dash escaped line: "
msgstr "�L�Ī��}�鸹�h�X�C�G "
#: g10/armor.c:565
-msgid "unexpected armor:"
+#, fuzzy
+msgid "unexpected armor: "
msgstr "���w�����ʸˡG"
-#: g10/armor.c:695 g10/armor.c:1276
-#, c-format
-msgid "invalid radix64 character %02x skipped\n"
+#: g10/armor.c:695 g10/armor.c:1280
+#, fuzzy, c-format
+msgid "invalid radix64 character %02X skipped\n"
msgstr "�L�� 64 �i��r�� %02x �Q���L�F\n"
#: g10/armor.c:738
@@ -1204,33 +1205,34 @@ msgstr "�ɮץ��w��������(�S�� CRC ������)\n"
msgid "premature eof (in CRC)\n"
msgstr "�ɮץ��w��������(CRC ������������)\n"
-#: g10/armor.c:776
+#: g10/armor.c:780
msgid "malformed CRC\n"
msgstr "CRC �Q�ܳy�L\n"
-#: g10/armor.c:780 g10/armor.c:1313
-#, c-format
-msgid "CRC error; %06lx - %06lx\n"
+#: g10/armor.c:784 g10/armor.c:1317
+#, fuzzy, c-format
+msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC ���~�F %06lx - %06lx\n"
-#: g10/armor.c:800
-msgid "premature eof (in Trailer)\n"
+#: g10/armor.c:804
+#, fuzzy
+msgid "premature eof (in trailer)\n"
msgstr "�ɮץ��w�������� (�󵲧��B)\n"
-#: g10/armor.c:804
+#: g10/armor.c:808
msgid "error in trailer line\n"
msgstr "�����C�����D\n"
-#: g10/armor.c:1091
+#: g10/armor.c:1095
msgid "no valid OpenPGP data found.\n"
msgstr "�䤣�즳�Ī� OpenPGP ��ơC\n"
-#: g10/armor.c:1096
+#: g10/armor.c:1100
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "�L�Ī��ʸˡG�C���W�X %d �r��\n"
-#: g10/armor.c:1100
+#: g10/armor.c:1104
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr "�ʸ˸̥X�{�Q�޸��A�����i�C�L�r�� �w �i��O���岫���e�H�{���y����\n"
@@ -1284,7 +1286,7 @@ msgstr " ��Y \""
msgid " aka \""
msgstr " ��Y \""
-#: g10/pkclist.c:246 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:404
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1530,96 +1532,116 @@ msgstr "%s: �w���L�G���_�w�g�Q�T�ΤF\n"
msgid "no valid addressees\n"
msgstr "�S�������a�}\n"
-#: g10/keygen.c:207
+#: g10/keygen.c:249
#, fuzzy, c-format
msgid "preference `%s' duplicated\n"
msgstr "���n�]�w %c%lu ���ƤF\n"
-#: g10/keygen.c:214
+#: g10/keygen.c:256
#, fuzzy
msgid "too many cipher preferences\n"
msgstr "���n�]�w `%c' �Ӧh\n"
-#: g10/keygen.c:216
+#: g10/keygen.c:258
#, fuzzy
msgid "too many digest preferences\n"
msgstr "���n�]�w `%c' �Ӧh\n"
-#: g10/keygen.c:218
+#: g10/keygen.c:260
#, fuzzy
msgid "too many compression preferences\n"
msgstr "���n�]�w `%c' �Ӧh\n"
-#: g10/keygen.c:315
+#: g10/keygen.c:357
#, fuzzy, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "���n�]�w�r��̦��L�Ī��r��\n"
-#: g10/keygen.c:738
+#: g10/keygen.c:783
msgid "writing direct signature\n"
msgstr "���b�g�J����ñ��\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:822
msgid "writing self signature\n"
msgstr "���b�g�J�ۧ�ñ��\n"
-#: g10/keygen.c:823
+#: g10/keygen.c:868
msgid "writing key binding signature\n"
msgstr "���b�g�J���_ñ��\n"
-#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "���_�ؤo�L�ġF��� %u �줸\n"
-#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "���_�ؤo�W�j�� %u �줸\n"
-#: g10/keygen.c:1165
+#: g10/keygen.c:1210
msgid "Please select what kind of key you want:\n"
msgstr "�п�ܩp�n�ϥΪ����_�����G\n"
-#: g10/keygen.c:1167
+#: g10/keygen.c:1212
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA �M ElGamal (�w�])\n"
-#: g10/keygen.c:1168
+#: g10/keygen.c:1213
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (�ȯ�ñ�p��)\n"
-#: g10/keygen.c:1170
+#: g10/keygen.c:1215
#, fuzzy, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (�ȯ�[�K��)\n"
-#: g10/keygen.c:1171
+#: g10/keygen.c:1216
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (�ȯ�ñ�p��)\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1218
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (�ȯ�[�K��)\n"
-#: g10/keygen.c:1175
+#: g10/keygen.c:1220
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (��ñ�p�Υ[�K)\n"
-#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1222
+#, fuzzy, c-format
+msgid " (%d) RSA (auth only)\n"
+msgstr " (%d) RSA (�ȯ�ñ�p��)\n"
+
+#: g10/keygen.c:1224
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and auth)\n"
+msgstr " (%d) RSA (��ñ�p�Υ[�K)\n"
+
+#: g10/keygen.c:1226
+#, fuzzy, c-format
+msgid " (%d) RSA (encrypt and auth)\n"
+msgstr " (%d) RSA (�ȯ�[�K��)\n"
+
+#: g10/keygen.c:1228
+#, fuzzy, c-format
+msgid " (%d) RSA (sign, encrypt and auth)\n"
+msgstr " (%d) RSA (��ñ�p�Υ[�K)\n"
+
+#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448
msgid "Your selection? "
msgstr "�p�n����@�ӡH "
-#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "�L�Ī���ܡC\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1298
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1632,28 +1654,28 @@ msgstr ""
" �w�]�����_�ؤo�O 1024 �줸\n"
" ��ij���̤j���_�ؤo�O 2048 �줸\n"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1307
msgid "What keysize do you want? (1024) "
msgstr "�p�Q�n�Φh�j�����_�ؤo�H (1024) "
-#: g10/keygen.c:1239
+#: g10/keygen.c:1312
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA �����_�ؤo��श�� 512 �M 1024 ����\n"
-#: g10/keygen.c:1241
+#: g10/keygen.c:1314
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "���_�ؤo�Ӥp�F RSA �����_�ؤo�̰_�X�����n�� 1024 �C\n"
-#: g10/keygen.c:1244
+#: g10/keygen.c:1317
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "���_�ؤo�Ӥp�F�̰_�X�����n�� 768 �C\n"
-#: g10/keygen.c:1255
+#: g10/keygen.c:1328
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "���_�ؤo�Ӥj�F�̤j�����Ψ� %d �C\n"
-#: g10/keygen.c:1260
+#: g10/keygen.c:1333
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1661,27 +1683,27 @@ msgstr ""
"����ij�ϥΤj�� 2048 �����_�ؤo�A\n"
"�]���p�� *�u��* �|��h�ܦh�ɶ��I\n"
-#: g10/keygen.c:1263
+#: g10/keygen.c:1336
msgid "Are you sure that you want this keysize? "
msgstr "�p�T�w�n�γo�Ӫ��_�ؤo�ܡH "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1337
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
msgstr "�n�A���O�аO���p���ù��M��L�]�O�۷��e���Q�s�����z�I�I\n"
-#: g10/keygen.c:1273
+#: g10/keygen.c:1346
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "�p�ҭn�D�����_�ؤo�O %u �줸\n"
-#: g10/keygen.c:1276 g10/keygen.c:1280
+#: g10/keygen.c:1349 g10/keygen.c:1353
#, c-format
msgid "rounded up to %u bits\n"
msgstr "�[�j�� %u �줸\n"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1404
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1697,7 +1719,7 @@ msgstr ""
" <n>m = ���_�b n ���|�L��\n"
" <n>y = ���_�b n �~��|�L��\n"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1413
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1713,29 +1735,29 @@ msgstr ""
" <n>m = �b n ���|�L��\n"
" <n>y = �b n �~��|�L��\n"
-#: g10/keygen.c:1362
+#: g10/keygen.c:1435
msgid "Key is valid for? (0) "
msgstr "���_�����Ĵ����O�h�[�H (0) "
-#: g10/keygen.c:1364
+#: g10/keygen.c:1437
msgid "Signature is valid for? (0) "
msgstr "ñ�������Ĵ����O�h�[�H (0) "
-#: g10/keygen.c:1369
+#: g10/keygen.c:1442
msgid "invalid value\n"
msgstr "�L�Ī��ƭ�\n"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1447
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s �������|�L��\n"
-#: g10/keygen.c:1381
+#: g10/keygen.c:1454
#, c-format
msgid "%s expires at %s\n"
msgstr "%s �N�|�b %s �L��\n"
-#: g10/keygen.c:1387
+#: g10/keygen.c:1460
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1743,16 +1765,17 @@ msgstr ""
"�p���t�εL�k��� 2038 �~�H�᪺����C\n"
"���L�A���i�H���T�B�z���� 2106 �~���e���~���C\n"
-#: g10/keygen.c:1392
+#: g10/keygen.c:1465
msgid "Is this correct (y/n)? "
msgstr "�H�W���T�ܡH (y/n) "
-#: g10/keygen.c:1435
+#: g10/keygen.c:1508
+#, fuzzy
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user "
-"id\n"
-"from Real Name, Comment and Email Address in this form:\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
msgstr ""
@@ -1762,44 +1785,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1447
+#: g10/keygen.c:1520
msgid "Real name: "
msgstr "�u��m�W�G "
-#: g10/keygen.c:1455
+#: g10/keygen.c:1528
msgid "Invalid character in name\n"
msgstr "�m�W�t���L���r��\n"
-#: g10/keygen.c:1457
+#: g10/keygen.c:1530
msgid "Name may not start with a digit\n"
msgstr "�m�W���i�H�μƦr�}�Y\n"
-#: g10/keygen.c:1459
+#: g10/keygen.c:1532
msgid "Name must be at least 5 characters long\n"
msgstr "�m�W�ܤ֭n�����Ӧr�Ū�\n"
-#: g10/keygen.c:1467
+#: g10/keygen.c:1540
msgid "Email address: "
msgstr "�q�l�l��a�}�G "
-#: g10/keygen.c:1478
+#: g10/keygen.c:1551
msgid "Not a valid email address\n"
msgstr "���O�����q�l�l��a�}\n"
-#: g10/keygen.c:1486
+#: g10/keygen.c:1559
msgid "Comment: "
msgstr "�����G "
-#: g10/keygen.c:1492
+#: g10/keygen.c:1565
msgid "Invalid character in comment\n"
msgstr "�����t���L���r��\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1588
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "�p���b�ϥ� `%s' �r�����C\n"
-#: g10/keygen.c:1521
+#: g10/keygen.c:1594
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1810,27 +1833,27 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1599
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "�Ф��n��q�l�l��a�}��i�p���u��m�W�ε�����\n"
-#: g10/keygen.c:1531
+#: g10/keygen.c:1604
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1541
+#: g10/keygen.c:1614
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "�ܧ�m�W(N) �B����(C) �B�q�l�l��a�}(E)�ΰh�X(Q)�H "
-#: g10/keygen.c:1542
+#: g10/keygen.c:1615
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "�ܧ�m�W(N) �B����(C) �B�q�l�l��a�}(E)�νT�w(O)/�h�X(Q)�H "
-#: g10/keygen.c:1561
+#: g10/keygen.c:1634
msgid "Please correct the error first\n"
msgstr "���q�����~\n"
-#: g10/keygen.c:1600
+#: g10/keygen.c:1674
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1838,16 +1861,16 @@ msgstr ""
"�p�ݭn�@�ӱK�X��ӫO�@�p���p�_�C\n"
"\n"
-#: g10/keygen.c:1609 g10/keyedit.c:1021
+#: g10/keygen.c:1683 g10/keyedit.c:1114
msgid "passphrase not correctly repeated; try again"
msgstr "�K�X��A����J�ɨS�����T���ơF�ЦA�դ@��"
-#: g10/keygen.c:1610
+#: g10/keygen.c:1684
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1616
+#: g10/keygen.c:1690
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"
@@ -1859,7 +1882,7 @@ msgstr ""
"�Ȼݭn�A������o�ӵ{���A�åB�ϥ� \"--edit-key\" �ﶵ�Y�i�C\n"
"\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1712
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"
@@ -1870,58 +1893,58 @@ msgstr ""
"�]���O�V����L�B���ʷƹ��BŪ�g�w�Ф������^\n"
"�o�|���H���Ʀr���;�����h�����|��o���h���üơC\n"
-#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2284 g10/revoke.c:215 g10/revoke.c:415
msgid "sorry, can't do this in batch mode\n"
msgstr "��p�A�L�k�b�妸�Ҧ����o�˰�\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2354
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA ���_��|�� 1024 �줸�C\n"
-#: g10/keygen.c:2335
+#: g10/keygen.c:2422
msgid "Key generation canceled.\n"
msgstr "�w�������_���͡C\n"
-#: g10/keygen.c:2451 g10/keygen.c:2576
+#: g10/keygen.c:2618 g10/keygen.c:2755
#, c-format
msgid "writing public key to `%s'\n"
msgstr "���b�N���_�g�� `%s'\n"
-#: g10/keygen.c:2453 g10/keygen.c:2579
+#: g10/keygen.c:2620 g10/keygen.c:2758
#, fuzzy, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "���b�N�p�_�g�� `%s'\n"
-#: g10/keygen.c:2456 g10/keygen.c:2582
+#: g10/keygen.c:2623 g10/keygen.c:2761
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "���b�N�p�_�g�� `%s'\n"
-#: g10/keygen.c:2565
+#: g10/keygen.c:2744
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "�䤣��i�g�����_�_�Ͱ�G %s\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2750
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "�䤣��i�g���p�_�_�Ͱ�G %s\n"
-#: g10/keygen.c:2589
+#: g10/keygen.c:2768
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "�g�J���_�_�Ͱ� `%s' �ɵo�Ϳ��~�G %s\n"
-#: g10/keygen.c:2596
+#: g10/keygen.c:2775
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "�g�J�p�_�_�Ͱ� `%s' �ɵo�Ϳ��~�G %s\n"
-#: g10/keygen.c:2619
+#: g10/keygen.c:2798
msgid "public and secret key created and signed.\n"
msgstr "���_�M�p�_�w�g�Q�إߤ�ñ�p�F�C\n"
-#: g10/keygen.c:2630
+#: g10/keygen.c:2809
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"
@@ -1929,31 +1952,60 @@ msgstr ""
"�Ъ`�N�o����_����Ψӥ[�K���ΡC�p������ \"--edit-key\" ���O\n"
"�Ӳ��ͦ��_�צ�C\n"
-#: g10/keygen.c:2642 g10/keygen.c:2755
+#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049
#, c-format
msgid "Key generation failed: %s\n"
msgstr "���ͪ��_���ѡG %s\n"
-#: g10/keygen.c:2691 g10/sign.c:290
+#: g10/keygen.c:2870 g10/keygen.c:2985 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "���_�w�g�b %lu ���᪺���ӻs�y�X�ӤF (�i��O�]���ɥ��Ȧ�ή��������D)\n"
-#: g10/keygen.c:2693 g10/sign.c:292
+#: g10/keygen.c:2872 g10/keygen.c:2987 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "���_�w�g�b %lu ���᪺���ӻs�y�X�ӤF (�i��O�]���ɥ��Ȧ�ή��������D)\n"
-#: g10/keygen.c:2702
+#: g10/keygen.c:2881 g10/keygen.c:2998
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "�Ъ`�N�G�� v3 ���_�s�y�l�_�|���h OpenPGP �ۮe��\n"
-#: g10/keygen.c:2730
+#: g10/keygen.c:2909 g10/keygen.c:3031
msgid "Really create? "
msgstr "�u���n�إ߶ܡH "
+#: g10/keygen.c:3184
+#, fuzzy, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "�R�����_�϶��ɥ��ѤF�G %s\n"
+
+#: g10/keygen.c:3225
+#, fuzzy, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "�L�k�إ� `%s' �G %s\n"
+
+#: g10/keygen.c:3248
+#, fuzzy, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "�Ъ`�N�G�p�_ %08lX �b %s �L���F\n"
+
+#: g10/keygen.c:3315
+#, c-format
+msgid "length of RSA modulus is not %d\n"
+msgstr ""
+
+#: g10/keygen.c:3321
+msgid "public exponent too large (more than 32 bits)\n"
+msgstr ""
+
+#: g10/keygen.c:3327 g10/keygen.c:3333
+#, c-format
+msgid "length of an RSA prime is not %d\n"
+msgstr ""
+
#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "--output �b�o�өR�O���S���@��\n"
@@ -1964,7 +2016,7 @@ msgstr "--output �b�o�өR�O���S���@��\n"
msgid "%s: can't open: %s\n"
msgstr "%s: �L�k�}�ҡG %s\n"
-#: g10/encode.c:203 g10/sign.c:1144
+#: g10/encode.c:203 g10/sign.c:1146
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "�إ߱K�X�ꪺ�ɭԵo�Ϳ��~�G %s\n"
@@ -1992,6 +2044,11 @@ msgstr "%s: ĵ�i�G�o�O���ɮ�\n"
msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
msgstr "�b --pgp2 �Ҧ����A�p���H 2048 �줸�H�U�� RSA ���_�[�K\n"
+#: g10/encode.c:474
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "�L�k�}�� %s: %s\n"
+
#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
@@ -2002,22 +2059,30 @@ msgid ""
"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
msgstr "�p���n�Ψӥ[�K���Ҧ����_������ϥ� IDEA �s�K�k�C\n"
-#: g10/encode.c:526 g10/encode.c:721
-#, c-format
-msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+#: g10/encode.c:526
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "�j���ϥ� %s (%d) ��٦��s�K�k�|�H�Ϧ���̰��n�]�w\n"
-#: g10/encode.c:634 g10/sign.c:863
-#, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+#: g10/encode.c:634 g10/sign.c:864
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
msgstr "�j���ϥ� %s (%d) ���Y�t��k�|�H�Ϧ���̰��n�]�w\n"
+#: g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "�j���ϥ� %s (%d) ��٦��s�K�k�|�H�Ϧ���̰��n�]�w\n"
+
#: g10/encode.c:818
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s �w�g�[�K���G \"%s\"\n"
-#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2902 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "�䤣�� `%s' ���_�G %s\n"
@@ -2050,8 +2115,9 @@ msgstr "ĵ�i�G�S���ץX����F��\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "pk �֨��̦��Ӧh���� �w �w�T��\n"
-#: g10/getkey.c:186 g10/getkey.c:2693
-msgid "[User id not found]"
+#: g10/getkey.c:186 g10/getkey.c:2691
+#, fuzzy
+msgid "[User ID not found]"
msgstr "[�䤣��ϥΪ� ID]"
#: g10/getkey.c:1614
@@ -2204,7 +2270,7 @@ msgstr "���_ %08lX: HKP �l�_���_�~�w�Q�״_\n"
#: g10/import.c:722
#, fuzzy, c-format
-msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "���_ %08lX: �D�ۧ�ñ�p���ϥΪ� ID `%s' �w�Q����\n"
#: g10/import.c:728
@@ -2231,7 +2297,7 @@ msgstr "���_ %08lX: �s���_ �w �w���L\n"
msgid "no writable keyring found: %s\n"
msgstr "�䤣��i�g���_�Ͱ�G %s\n"
-#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#: g10/import.c:760 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
msgstr "���b�g�� `%s'\n"
@@ -2343,12 +2409,12 @@ msgstr "���_ %08lX: ñ���S���ϥΪ� ID\n"
#: g10/import.c:1299
#, fuzzy, c-format
-msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "���_ %08lX: �ϥΪ� ID \"%s\" �ϥΤF���Q�䴩�����}���_�t��k\n"
#: g10/import.c:1301
#, fuzzy, c-format
-msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "���_ %08lX: �ϥΪ� ID \"%s\" ���L�Ī��ۧ�ñ��\n"
#: g10/import.c:1319
@@ -2388,7 +2454,7 @@ msgstr "���_ %08lX: �h���l�_�M�P�w����\n"
#: g10/import.c:1439
#, fuzzy, c-format
-msgid "key %s: skipped user ID '%s'\n"
+msgid "key %s: skipped user ID \"%s\"\n"
msgstr "���_ %08lX: �w���L�ϥΪ� ID '"
#: g10/import.c:1460
@@ -2398,7 +2464,7 @@ msgstr "���_ %08lX: �l�_�w���L\n"
#: g10/import.c:1487
#, fuzzy, c-format
-msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "���_ %08lX: ���i�ץX��ñ�� (���� %02x) �w �w���L\n"
#: g10/import.c:1497
@@ -2431,112 +2497,112 @@ msgstr "���_ %08lX: �����쭫�ƪ��ϥΪ� ID �w �w�X��\n"
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "ĵ�i�G���_ %08lX �i��Q�M�P�F�G���b���^�M�P���_ %08lX\n"
-#: g10/import.c:1711
+#: g10/import.c:1712
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "ĵ�i�G���_ %08lX �i��Q�M�P�F�G�M�P���_ %08lX ���X�{�C\n"
-#: g10/import.c:1770
+#: g10/import.c:1771
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "���_ %08lX: �w�s�W�M�P���� \"%s\"\n"
-#: g10/import.c:1804
+#: g10/import.c:1805
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "���_ %08lX: �w�s�W�������_ñ��\n"
-#: g10/keyedit.c:159
+#: g10/keyedit.c:253
msgid "[revocation]"
msgstr "[�M�P]"
-#: g10/keyedit.c:160
+#: g10/keyedit.c:254
msgid "[self-signature]"
msgstr "[�ۧ�ñ��]"
-#: g10/keyedit.c:237 g10/keylist.c:319
+#: g10/keyedit.c:332 g10/keylist.c:320
msgid "1 bad signature\n"
msgstr "1 �ӷl�a��ñ��\n"
-#: g10/keyedit.c:239 g10/keylist.c:321
+#: g10/keyedit.c:334 g10/keylist.c:322
#, c-format
msgid "%d bad signatures\n"
msgstr "%d �ӷl�a��ñ��\n"
-#: g10/keyedit.c:241 g10/keylist.c:323
+#: g10/keyedit.c:336 g10/keylist.c:324
msgid "1 signature not checked due to a missing key\n"
msgstr "�� 1 ��ñ���]���򥢪��_�ӥ��Q�ˬd\n"
-#: g10/keyedit.c:243 g10/keylist.c:325
+#: g10/keyedit.c:338 g10/keylist.c:326
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "�� %d ��ñ���]���򥢪��_�ӥ��Q�ˬd\n"
-#: g10/keyedit.c:245 g10/keylist.c:327
+#: g10/keyedit.c:340 g10/keylist.c:328
msgid "1 signature not checked due to an error\n"
msgstr "�� 1 ��ñ���]���Y�ӿ��~�ӥ��Q�ˬd\n"
-#: g10/keyedit.c:247 g10/keylist.c:329
+#: g10/keyedit.c:342 g10/keylist.c:330
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "�� %d ��ñ���]���Y�ǿ��~�ӥ��Q�ˬd\n"
-#: g10/keyedit.c:249
+#: g10/keyedit.c:344
msgid "1 user ID without valid self-signature detected\n"
msgstr "������ 1 �ӨS�����Ħۧ�ñ�����ϥΪ� ID\n"
-#: g10/keyedit.c:251
+#: g10/keyedit.c:346
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "������ %d �ӨS�����Ħۧ�ñ�����ϥΪ� ID\n"
-#: g10/keyedit.c:314
+#: g10/keyedit.c:407
#, fuzzy, c-format
msgid " (%d) I trust marginally\n"
msgstr " %d = �ګj�j�H��\n"
-#: g10/keyedit.c:315
+#: g10/keyedit.c:408
#, fuzzy, c-format
msgid " (%d) I trust fully\n"
msgstr " %d = �ڧ����H��\n"
-#: g10/keyedit.c:334
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-#: g10/keyedit.c:350
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
-#: g10/keyedit.c:493
+#: g10/keyedit.c:586
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "�ϥΪ� ID \"%s\" �w�g�Q�M�P�F�C"
-#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
-#: g10/keyedit.c:766 g10/keyedit.c:1370
+#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801
+#: g10/keyedit.c:859 g10/keyedit.c:1469
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "�p���M�Q�nñ�p���ܡH (y/N) "
-#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807
+#: g10/keyedit.c:1475
msgid " Unable to sign.\n"
msgstr " �L�kñ�p�C\n"
-#: g10/keyedit.c:519
+#: g10/keyedit.c:612
#, fuzzy, c-format
msgid "User ID \"%s\" is expired."
msgstr "�ϥΪ� ID \"%s\" �w�g�Q�M�P�F�C"
-#: g10/keyedit.c:545
+#: g10/keyedit.c:638
#, fuzzy, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "ĵ�i�G�ϥΪ� ID \"%s\" ���g�ۧ�ñ�p�C\n"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:677
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2545,11 +2611,11 @@ msgstr ""
"\"%s\" �̪��ۧ�ñ��\n"
"�O PGP 2.x ���A���C\n"
-#: g10/keyedit.c:593
+#: g10/keyedit.c:686
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "�p�O�_�Q�n�N���ɯŦ� OpenPGP �ۧ�ñ���H (y/N) "
-#: g10/keyedit.c:607
+#: g10/keyedit.c:700
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2558,11 +2624,11 @@ msgstr ""
"�p�ثe�b \"%s\" ��ñ��\n"
"�w�g�L���F�C\n"
-#: g10/keyedit.c:611
+#: g10/keyedit.c:704
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "�p�Q�n�o�G�@���s��ñ���Ө��N�w�L�������@�ӶܡH (y/N) "
-#: g10/keyedit.c:632
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2571,53 +2637,53 @@ msgstr ""
"�p�ثe�b \"%s\" ��ñ��\n"
"�O�@�����a�C\n"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:729
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "�p�O�_�Q�n��L�ɯŦ��i�H�����ץX��ñ���H (y/N) "
-#: g10/keyedit.c:657
+#: g10/keyedit.c:750
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" �w�g�Q���_ %08lX �b���añ�p�F\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:753
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" �w�g�Q���_ %08lX ñ�p�F\n"
-#: g10/keyedit.c:665
+#: g10/keyedit.c:758
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "�p���M�Q�n�A��ñ�p���ܡH (y/N) "
-#: g10/keyedit.c:687
+#: g10/keyedit.c:780
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "�S���F��i�H�����_ %08lX ñ�p\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:795
msgid "This key has expired!"
msgstr "�o����_�w�g�L���F�I"
-#: g10/keyedit.c:722
+#: g10/keyedit.c:815
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "�o����_�N�b %s �L���C\n"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "�p�Q�n���p��ñ���]�b�P�@�ӮɭԹL���ܡH (Y/n) "
-#: g10/keyedit.c:759
+#: g10/keyedit.c:852
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
msgstr "�p����b --pgp2 �Ҧ��U�A�� PGP 2.x ���_���X OpenPGP ñ���C\n"
-#: g10/keyedit.c:761
+#: g10/keyedit.c:854
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "�o�|���o����_�b PGP 2.x �Ҧ��U���i�ϥΡC\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:879
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2626,31 +2692,31 @@ msgstr ""
"�p���h�ԷV�ˬd���nñ�p�����_�T���ݩ�W�����ӤH���W�r�O�H\n"
"�p�G�p�����D�o�Ӱ��D�����סA�п�J�u0�v�C\n"
-#: g10/keyedit.c:791
+#: g10/keyedit.c:884
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) �ڤ��@���C %s\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:886
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) �ڮڥ��S���ˬd�L�C %s\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:888
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) ���H�N�ˬd�L�F�C %s\n"
-#: g10/keyedit.c:797
+#: g10/keyedit.c:890
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) �ګD�`�p�ߦa�ˬd�L�F�C %s\n"
-#: g10/keyedit.c:803
+#: g10/keyedit.c:896
msgid "Your selection? (enter '?' for more information): "
msgstr ""
-#: g10/keyedit.c:826
+#: g10/keyedit.c:919
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2658,7 +2724,7 @@ msgstr ""
"�p�u���T�w�nñ�p�o����_\n"
"�Ωp�����_�G \""
-#: g10/keyedit.c:835
+#: g10/keyedit.c:928
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2666,7 +2732,7 @@ msgstr ""
"\n"
"�o�N�|�O�ۧ�ñ���C\n"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:932
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2674,7 +2740,7 @@ msgstr ""
"\n"
"ĵ�i�G�o��ñ�����|�Q�аO�����i�ץX�C\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:937
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2682,7 +2748,7 @@ msgstr ""
"\n"
"ĵ�i�G�o��ñ�����|�Q�аO�����i�M�P�C\n"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:944
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2690,7 +2756,7 @@ msgstr ""
"\n"
"�o��ñ���|�Q�аO�����i�ץX�C\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:948
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2698,7 +2764,7 @@ msgstr ""
"\n"
"�o��ñ���|�Q�аO�����i�M�P�C\n"
-#: g10/keyedit.c:860
+#: g10/keyedit.c:953
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2706,7 +2772,7 @@ msgstr ""
"\n"
"�ڮڥ��S���ˬd�L�o����_�C\n"
-#: g10/keyedit.c:864
+#: g10/keyedit.c:957
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2714,7 +2780,7 @@ msgstr ""
"\n"
"���H�N�ˬd�L�o����_�F�C\n"
-#: g10/keyedit.c:868
+#: g10/keyedit.c:961
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2722,34 +2788,34 @@ msgstr ""
"\n"
"�ګD�`�p�ߦa�ˬd�L�o����_�F�C\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:970
msgid "Really sign? "
msgstr "�u���nñ�p�ܡH "
-#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023
#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "ñ�p�ɥ��ѤF�G %s\n"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1071
msgid "This key is not protected.\n"
msgstr "�o����_�S���Q�O�@�C\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1075
msgid "Secret parts of primary key are not available.\n"
msgstr "�D�_���p�_�����S��k���ΡC\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1079
msgid "Key is protected.\n"
msgstr "���_�Q�O�@�F�C\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1099
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "�L�k�s��o����_�G %s\n"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1105
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2757,7 +2823,7 @@ msgstr ""
"��J�n���o��p�_���s�K�X��C\n"
"\n"
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1119
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2765,544 +2831,566 @@ msgstr ""
"�p���Q�n�αK�X�� �w �o�j���O�� *�V* �I�l�I\n"
"\n"
-#: g10/keyedit.c:1029
+#: g10/keyedit.c:1122
msgid "Do you really want to do this? "
msgstr "�p�u���Q�n�o�򰵶ܡH "
-#: g10/keyedit.c:1095
+#: g10/keyedit.c:1188
msgid "moving a key signature to the correct place\n"
msgstr "���b����_��ñ���h���쥿�T����m�h\n"
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1232
msgid "quit this menu"
msgstr "���}�o�ӿ��"
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1233
msgid "q"
msgstr "q"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save"
msgstr "save"
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1234
msgid "save and quit"
msgstr "�x�s�����}"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "help"
msgstr "help"
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1235
msgid "show this help"
msgstr "��ܳo���u�W����"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1237
msgid "show fingerprint"
msgstr "��ܫ���"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list"
msgstr "list"
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1238
msgid "list key and user IDs"
msgstr "�C�X���_�M�ϥΪ� ID"
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1239
msgid "l"
msgstr "l"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1240
msgid "select user ID N"
msgstr "�ϥΪ� ID ��F N"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "key"
msgstr "key"
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1241
msgid "select secondary key N"
msgstr "��ܦ��_ N"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "check"
msgstr "check"
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1242
msgid "list signatures"
msgstr "�C�Xñ��"
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1243
msgid "c"
msgstr "c"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1244
msgid "sign the key"
msgstr "ñ�p���_"
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1245
msgid "s"
msgstr "s"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "tsign"
msgstr "sign"
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1246
#, fuzzy
msgid "make a trust signature"
msgstr "�إߤ@��������ñ��"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1247
msgid "sign the key locally"
msgstr "�Ȧb���añ�p���_"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1248
msgid "sign the key non-revocably"
msgstr "�H���i�M�P�Ҧ�ñ�p���_"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1249
msgid "sign the key locally and non-revocably"
msgstr "�H���i�M�P�Ҧ��b���añ�p���_"
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1250
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1251
msgid "add a user ID"
msgstr "�W�[�@�ӨϥΪ� ID"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "addphoto"
msgstr "addphoto"
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1252
msgid "add a photo ID"
msgstr "�W�[�@�ӷӤ� ID"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1253
msgid "delete user ID"
msgstr "�R���@�ӨϥΪ� ID"
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1255
msgid "delphoto"
msgstr "delphoto"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1256
msgid "add a secondary key"
msgstr "�W�[�@�⦸�_"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1258
+#, fuzzy
+msgid "addcardkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:1258
+msgid "add a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "keytocard"
+msgstr ""
+
+#: g10/keyedit.c:1259
+msgid "move a key to a smartcard"
+msgstr ""
+
+#: g10/keyedit.c:1261
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1261
msgid "delete a secondary key"
msgstr "�R���@�⦸�_"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "addrevoker"
msgstr "addrevoker"
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1262
msgid "add a revocation key"
msgstr "�W�[�@��M�P���_"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1263
msgid "delete signatures"
msgstr "�R��ñ��"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1264
msgid "change the expire date"
msgstr "���ϥδ���"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "primary"
msgstr "primary"
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1265
msgid "flag user ID as primary"
msgstr "��ϥΪ� ID �аO���D�n"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:1168
+#: g10/keyedit.c:1266
msgid "toggle between secret and public key listing"
msgstr "��p�_�M���_�M��ô�b�@�_"
-#: g10/keyedit.c:1170
+#: g10/keyedit.c:1268
msgid "t"
msgstr "t"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:1171
+#: g10/keyedit.c:1269
msgid "list preferences (expert)"
msgstr "�C�X���n (�M�a�Ҧ�)"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:1172
+#: g10/keyedit.c:1270
msgid "list preferences (verbose)"
msgstr "�C�X���n (�o���Ҧ�)"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1271
msgid "set preference list"
msgstr "�]�w���n�M��"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1272
msgid "updated preferences"
msgstr "��s�L�����n"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "keyserver"
msgstr "���_���A�����~"
-#: g10/keyedit.c:1175
+#: g10/keyedit.c:1273
#, fuzzy
msgid "set preferred keyserver URL"
msgstr "�L�k���R���_���A�� URI\n"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1274
msgid "change the passphrase"
msgstr "���K�X��"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1275
msgid "change the ownertrust"
msgstr "���D�[�H��"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1276
msgid "revoke signatures"
msgstr "�M�Pñ��"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revuid"
msgstr "revuid"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1277
msgid "revoke a user ID"
msgstr "�M�P�@�ӨϥΪ� ID"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1278
msgid "revoke a secondary key"
msgstr "�M�P�@�⦸�_"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:1181
+#: g10/keyedit.c:1279
msgid "disable a key"
msgstr "�T�Τ@����_"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1280
msgid "enable a key"
msgstr "�ҥΤ@����_"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "showphoto"
msgstr "showphoto"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1281
msgid "show photo ID"
msgstr "��ܷӤ� ID"
-#: g10/keyedit.c:1202 g10/delkey.c:120
+#: g10/keyedit.c:1300 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "�L�k�b�妸�Ҧ������˰�\n"
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1331
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "Ū�����_�϶� `%s' �ɵo�Ϳ��~�G %s\n"
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1348
msgid "Secret key is available.\n"
msgstr "�p�_�i�ΡC\n"
-#: g10/keyedit.c:1282
+#: g10/keyedit.c:1380
msgid "Command> "
msgstr "���O> "
-#: g10/keyedit.c:1312
+#: g10/keyedit.c:1410
msgid "Need the secret key to do this.\n"
msgstr "�n���p�_�ׯ�o�򰵡C\n"
-#: g10/keyedit.c:1316
+#: g10/keyedit.c:1415
msgid "Please use the command \"toggle\" first.\n"
msgstr "�Х��ϥ� \"toggle\" ���O�C\n"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1463
msgid "Key is revoked."
msgstr "���_�w�g�Q�M�P�F�C"
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1482
msgid "Really sign all user IDs? "
msgstr "�u���nñ�p�Ҧ����ϥΪ� ID �ܡH "
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1483
msgid "Hint: Select the user IDs to sign\n"
msgstr "���ܡG��ܭnñ�p���ϥΪ� ID\n"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1508
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "�b %s �Ҧ��������\�ϥγo�ӫ��O�C\n"
-#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654
msgid "You must select at least one user ID.\n"
msgstr "�p�ܤֱo��ܤ@�ӨϥΪ� ID �C\n"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1532
msgid "You can't delete the last user ID!\n"
msgstr "�p����R���̫�@�ӨϥΪ� ID �I\n"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1535
msgid "Really remove all selected user IDs? "
msgstr "�u���n�����Ҧ��Q��ܪ��ϥΪ� ID �ܡH "
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1536
msgid "Really remove this user ID? "
msgstr "�u���n�����o�ӨϥΪ� ID �ܡH "
-#: g10/keyedit.c:1475 g10/keyedit.c:1530
+#: g10/keyedit.c:1586
+#, fuzzy
+msgid "Really move the primary key? "
+msgstr "�u���n�����o�ӨϥΪ� ID �ܡH "
+
+#: g10/keyedit.c:1598
+#, fuzzy
+msgid "You must select exactly one key.\n"
+msgstr "�p�ܤ֥�����ܤ@����_�C\n"
+
+#: g10/keyedit.c:1618 g10/keyedit.c:1673
msgid "You must select at least one key.\n"
msgstr "�p�ܤ֥�����ܤ@����_�C\n"
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1621
msgid "Do you really want to delete the selected keys? "
msgstr "�p�u���Q�n�R���Q��ܪ����_�ܡH "
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1622
msgid "Do you really want to delete this key? "
msgstr "�p�u���n�R���o����_�ܡH "
-#: g10/keyedit.c:1514
+#: g10/keyedit.c:1657
msgid "Really revoke all selected user IDs? "
msgstr "�u���n�M�P�Ҧ��Q��ܪ��ϥΪ� ID �ܡH "
-#: g10/keyedit.c:1515
+#: g10/keyedit.c:1658
msgid "Really revoke this user ID? "
msgstr "�u���n�M�P�o�ӨϥΪ� ID �ܡH "
-#: g10/keyedit.c:1534
+#: g10/keyedit.c:1677
msgid "Do you really want to revoke the selected keys? "
msgstr "�p�u���Q�n�M�P�o�dzQ��ܪ����_�ܡH "
-#: g10/keyedit.c:1535
+#: g10/keyedit.c:1678
msgid "Do you really want to revoke this key? "
msgstr "�p�u���Q�n�M�P�o����_�ܡH "
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1717
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1749
#, fuzzy
msgid "Set preference list to:\n"
msgstr "�]�w���n�M��"
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1755
msgid "Really update the preferences for the selected user IDs? "
msgstr "�u���n��s�Q��ܨϥΪ� ID �����n�ܡH "
-#: g10/keyedit.c:1614
+#: g10/keyedit.c:1757
msgid "Really update the preferences? "
msgstr "�u���n��s���n�ܡH "
-#: g10/keyedit.c:1662
+#: g10/keyedit.c:1805
msgid "Save changes? "
msgstr "�n�x�s�ܧ�ܡH "
-#: g10/keyedit.c:1665
+#: g10/keyedit.c:1808
msgid "Quit without saving? "
msgstr "�n���x�s�����}�ܡH "
-#: g10/keyedit.c:1675
+#: g10/keyedit.c:1818
#, c-format
msgid "update failed: %s\n"
msgstr "��s���ѡG %s\n"
-#: g10/keyedit.c:1682
+#: g10/keyedit.c:1825
#, c-format
msgid "update secret failed: %s\n"
msgstr "��s�p�_���ѡG %s\n"
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1832
msgid "Key not changed so no update needed.\n"
msgstr "���_�S���ܧ�ҥH���ݭn��s�C\n"
-#: g10/keyedit.c:1701
+#: g10/keyedit.c:1844
msgid "Invalid command (try \"help\")\n"
msgstr "�L�Ī����O (�ոլ� \"help\")\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1906
msgid "Digest: "
msgstr "�K�n�G "
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1958
msgid "Features: "
msgstr "�S�I�G "
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1969
msgid "Keyserver no-modify"
msgstr ""
-#: g10/keyedit.c:2063
+#: g10/keyedit.c:1979 g10/keylist.c:223
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keyedit.c:2219
#, c-format
msgid "This key may be revoked by %s key "
msgstr "�o����_�i��Q %s ���_�M�P�F "
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2223
msgid " (sensitive)"
msgstr " �]���K���^"
-#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434
#, fuzzy, c-format
msgid "created: %s"
msgstr "�L�k�إ� %s: %s\n"
-#: g10/keyedit.c:2084
-#, fuzzy, c-format
-msgid "revoked: %s"
+#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692
+#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551
+#: g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
msgstr "[�w�M�P]"
-#: g10/keyedit.c:2086
-#, fuzzy, c-format
-msgid "expired: %s"
-msgstr " [���Ĵ����G %s]"
+#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671
+#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553
+#: g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436
+#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820
+#: g10/mainproc.c:932
+#, fuzzy
+msgid "expires"
+msgstr "expire"
-#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#: g10/keyedit.c:2246
#, fuzzy, c-format
-msgid "expires: %s"
-msgstr " [���Ĵ����G %s]"
+msgid "usage: %s"
+msgstr " �H���G %c/%c"
-#: g10/keyedit.c:2103
+#: g10/keyedit.c:2261
#, fuzzy, c-format
msgid "trust: %s"
msgstr " �H���G %c/%c"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2265
#, c-format
msgid "validity: %s"
msgstr ""
-#: g10/keyedit.c:2114
+#: g10/keyedit.c:2272
msgid "This key has been disabled"
msgstr "�o����_�w�g�Q�T�ΤF"
-#: g10/keyedit.c:2146
-#, c-format
-msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! �l�_�w�g�Q�M�P�F�G %s\n"
-
-#: g10/keyedit.c:2149
-msgid "rev- faked revocation found\n"
-msgstr "rev- �o�{�Q���y���M�P\n"
-
-#: g10/keyedit.c:2151
-#, c-format
-msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? �ˬd�M�P�ɵo�Ͱ��D�G %s\n"
-
-#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
-#, fuzzy
-msgid "revoked"
-msgstr "[�w�M�P]"
-
-#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
-#, fuzzy
-msgid "expired"
-msgstr "expire"
+#: g10/keyedit.c:2300
+msgid "card-no: "
+msgstr ""
-#: g10/keyedit.c:2199
+#: g10/keyedit.c:2381
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x ���A���ϥΪ� ID �S�����n�C\n"
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2389
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3310,21 +3398,13 @@ msgstr ""
"�Ъ`�N��ܥX�Ӫ����_���ĩʤ��ݭn�󥿡A\n"
"���D�p���s����{���C\n"
-#: g10/keyedit.c:2272 g10/mainproc.c:930
-msgid "[revoked] "
-msgstr "[�w�M�P]"
-
-#: g10/keyedit.c:2274
-msgid "[expired] "
-msgstr "[�w�L��]"
-
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2520
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
msgstr ""
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2580
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3333,45 +3413,45 @@ msgstr ""
"ĵ�i�G�o�O�@�� PGP2 ���A�����_�C\n"
" �W�[�Ӥ� ID �i��|�ɭP�Y�Ǫ����� PGP ��^�o����_�C\n"
-#: g10/keyedit.c:2404 g10/keyedit.c:2677
+#: g10/keyedit.c:2585 g10/keyedit.c:2863
msgid "Are you sure you still want to add it? (y/N) "
msgstr "�p�T�w���M�Q�n�W�[�ܡH (y/N) "
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2591
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "�p���i�H��Ӥ� ID �W�[�� PGP2 ���A�����_�̡C\n"
-#: g10/keyedit.c:2545
+#: g10/keyedit.c:2731
msgid "Delete this good signature? (y/N/q)"
msgstr "�R���o�ӧ��n��ñ���ܡH (y/N/q)"
-#: g10/keyedit.c:2555
+#: g10/keyedit.c:2741
msgid "Delete this invalid signature? (y/N/q)"
msgstr "�R���o�ӵL�Ī�ñ���ܡH (y/N/q)"
-#: g10/keyedit.c:2559
+#: g10/keyedit.c:2745
msgid "Delete this unknown signature? (y/N/q)"
msgstr "�R���o�ӥ�����ñ���ܡH (y/N/q)"
-#: g10/keyedit.c:2565
+#: g10/keyedit.c:2751
msgid "Really delete this self-signature? (y/N)"
msgstr "�u���n�R���o�Ӧۧ�ñ���ܡH (y/N)"
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2765
#, c-format
msgid "Deleted %d signature.\n"
msgstr "�w�g�R���F %d ���C\n"
-#: g10/keyedit.c:2580
+#: g10/keyedit.c:2766
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "�w�g�R���F %d ���C\n"
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2769
msgid "Nothing deleted.\n"
msgstr "�S���F��Q�R���C\n"
-#: g10/keyedit.c:2672
+#: g10/keyedit.c:2858
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3380,88 +3460,98 @@ msgstr ""
"ĵ�i�G�o�O�@�� PGP2 ���A�����_�C\n"
" �W�[���w�M�P�̥i��|�ɭP�Y�Ǫ����� PGP ��^�o����_�C\n"
-#: g10/keyedit.c:2683
+#: g10/keyedit.c:2869
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "�p���i�H����w�M�P�̼W�[�� PGP2 ���A�����_�̡C\n"
-#: g10/keyedit.c:2703
+#: g10/keyedit.c:2889
msgid "Enter the user ID of the designated revoker: "
msgstr "��J���w�M�P�̪��ϥΪ� ID �G "
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2912
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "�L�k�N PGP 2.x ���A�����_���������w�M�P��\n"
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2927
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "�p��������Y����_�����ۤv�����w�M�P��\n"
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2949
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "ĵ�i�G�o����_�w�g�Q���������H�M�P�F�I\n"
-#: g10/keyedit.c:2782
+#: g10/keyedit.c:2968
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "ĵ�i�G�@����Y����_���������w�M�P�̫�A�N�L�k�Ϯ��F�I\n"
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2974
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr "�p�T�w�n�����o����_�����w�M�P�̶ܡH (y/N): "
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:3035
msgid "Please remove selections from the secret keys.\n"
msgstr "�бq�p�_��������ܡC\n"
-#: g10/keyedit.c:2855
+#: g10/keyedit.c:3041
msgid "Please select at most one secondary key.\n"
msgstr "�Цܦh��ܤ@�⦸�_�C\n"
-#: g10/keyedit.c:2859
+#: g10/keyedit.c:3045
msgid "Changing expiration time for a secondary key.\n"
msgstr "���b�ܧ�Y�⦸�_���ϥδ����C\n"
-#: g10/keyedit.c:2862
+#: g10/keyedit.c:3048
msgid "Changing expiration time for the primary key.\n"
msgstr "���b�ܧ�D�_���ϥδ����C\n"
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:3094
msgid "You can't change the expiration date of a v3 key\n"
msgstr "�p�����ܧ� v3 ���_���ϥδ���\n"
-#: g10/keyedit.c:2924
+#: g10/keyedit.c:3110
msgid "No corresponding signature in secret ring\n"
msgstr "�b�p�_��̨S���@�P��ñ��\n"
-#: g10/keyedit.c:3004
+#: g10/keyedit.c:3190
msgid "Please select exactly one user ID.\n"
msgstr "�к�T�a��ܤ@�ӨϥΪ� ID �C\n"
-#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
-#, c-format
-msgid "skipping v3 self-signature on user id \"%s\"\n"
+#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "���b�ϥΪ� ID \"%s\" ���L v3 �ۧ�ñ��\n"
-#: g10/keyedit.c:3215
+#: g10/keyedit.c:3400
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3479
+#, fuzzy
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "�p�T�w�n�Υ��ܡH (y/N) "
+
+#: g10/keyedit.c:3480
+#, fuzzy
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "�p�T�w�n�Υ��ܡH (y/N) "
+
+#: g10/keyedit.c:3542
#, c-format
msgid "No user ID with index %d\n"
msgstr "���� %d �S���ϥΪ� ID\n"
-#: g10/keyedit.c:3377
+#: g10/keyedit.c:3588
#, c-format
msgid "No secondary key with index %d\n"
msgstr "���� %d �S�����_\n"
-#: g10/keyedit.c:3491
+#: g10/keyedit.c:3702
msgid "user ID: \""
msgstr "�ϥΪ� ID�G \""
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3707
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3470,7 +3560,7 @@ msgstr ""
"\"\n"
"�w�g�Q�p�����_ %08lX ñ�p�� %s\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3710
#, fuzzy, c-format
msgid ""
"\"\n"
@@ -3479,142 +3569,126 @@ msgstr ""
"\"\n"
"�w�g�Q�p�����_ %08lX �b���añ�p�� %s\n"
-#: g10/keyedit.c:3504
+#: g10/keyedit.c:3715
#, c-format
msgid "This signature expired on %s.\n"
msgstr "�o��ñ�p�w�g�b %s �L���F�C\n"
-#: g10/keyedit.c:3508
+#: g10/keyedit.c:3719
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "�p�T�w�p���M�Q�n�M�P���ܡH (y/N) "
-#: g10/keyedit.c:3512
+#: g10/keyedit.c:3723
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "�n���o��ñ���إߤ@���M�P���ҶܡH (y/N) "
-#: g10/keyedit.c:3537
+#: g10/keyedit.c:3748
msgid "You have signed these user IDs:\n"
msgstr "�p�w�gñ�p�F�o�ǨϥΪ� ID�G \n"
-#: g10/keyedit.c:3558
+#: g10/keyedit.c:3769
#, fuzzy, c-format
msgid " signed by %s on %s%s%s\n"
msgstr " �� %08lX ñ�p�� %s%s%s\n"
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3778
#, fuzzy, c-format
msgid " revoked by %s on %s\n"
msgstr " �� %08lX �M�P�� %s\n"
-#: g10/keyedit.c:3587
+#: g10/keyedit.c:3798
msgid "You are about to revoke these signatures:\n"
msgstr "�p���b�M�P�o���G\n"
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3808
#, fuzzy, c-format
msgid " signed by %s on %s%s\n"
msgstr " �� %08lX ñ�p�� %s%s\n"
-#: g10/keyedit.c:3599
+#: g10/keyedit.c:3810
msgid " (non-exportable)"
msgstr " (���i�ץX)"
-#: g10/keyedit.c:3606
+#: g10/keyedit.c:3817
msgid "Really create the revocation certificates? (y/N) "
msgstr "�u���n�إߺM�P���ҶܡH (y/N) "
-#: g10/keyedit.c:3636
+#: g10/keyedit.c:3847
msgid "no secret key\n"
msgstr "�S���p�_\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3917
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "�ϥΪ� ID \"%s\" �w�g�Q�M�P�F�C\n"
-#: g10/keyedit.c:3723
+#: g10/keyedit.c:3934
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "ĵ�i�G���@���ϥΪ� ID ñ��������аO�� %d ���᪺����\n"
-#: g10/keyedit.c:3892
+#: g10/keyedit.c:4103
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "���b��� %s �ؤo�� %ld �����_ 0x%08lX (uid %d) ���Ӥ� ID\n"
-#: g10/keylist.c:179
+#: g10/keylist.c:180
msgid "Critical signature policy: "
msgstr "������h�G "
-#: g10/keylist.c:181
+#: g10/keylist.c:182
msgid "Signature policy: "
msgstr "��h�G "
-#: g10/keylist.c:220
+#: g10/keylist.c:221
msgid "Critical preferred keyserver: "
msgstr ""
-#: g10/keylist.c:222
-msgid "Preferred keyserver: "
-msgstr ""
-
-#: g10/keylist.c:268 g10/keylist.c:312
+#: g10/keylist.c:269 g10/keylist.c:313
msgid "WARNING: invalid notation data found\n"
msgstr "ĵ�i�G���L�Ī��аO���\n"
-#: g10/keylist.c:286
+#: g10/keylist.c:287
msgid "Critical signature notation: "
msgstr "����ñ���аO�G "
-#: g10/keylist.c:288
+#: g10/keylist.c:289
msgid "Signature notation: "
msgstr "ñ���аO�G "
-#: g10/keylist.c:299
+#: g10/keylist.c:300
msgid "not human readable"
msgstr "���O�H�����o����"
-#: g10/keylist.c:400
+#: g10/keylist.c:401
msgid "Keyring"
msgstr "�_�Ͱ�"
-#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr " [���Ĵ����G %s]"
-
-#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
-#: g10/mainproc.c:932
-#, c-format
-msgid " [expires: %s]"
-msgstr " [���Ĵ����G %s]"
-
-#: g10/keylist.c:646 g10/keylist.c:743
-#, fuzzy, c-format
-msgid " [revoked: %s]"
-msgstr "[�w�M�P]"
-
-#: g10/keylist.c:1357
+#: g10/keylist.c:1412
msgid "Primary key fingerprint:"
msgstr "�D�_�����G"
-#: g10/keylist.c:1359
+#: g10/keylist.c:1414
msgid " Subkey fingerprint:"
msgstr " �l�_�����G"
-#: g10/keylist.c:1366
+#: g10/keylist.c:1421
msgid " Primary key fingerprint:"
msgstr " �D�_�����G"
-#: g10/keylist.c:1368
+#: g10/keylist.c:1423
msgid " Subkey fingerprint:"
msgstr " �l�_�����G"
-#: g10/keylist.c:1372 g10/keylist.c:1376
+#: g10/keylist.c:1427 g10/keylist.c:1431
#, fuzzy
msgid " Key fingerprint ="
msgstr " ���_���� ="
+#: g10/keylist.c:1498
+msgid " Card serial no. ="
+msgstr ""
+
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
@@ -3821,78 +3895,78 @@ msgstr "�«� (PGP 2.x) ñ��\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "�b proc_tree() ��������L�Ī� root �ʥ]\n"
-#: g10/misc.c:82
+#: g10/misc.c:83
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "�L�k���t�ΰ���ɦL�֤��ɡG %s\n"
-#: g10/misc.c:146
+#: g10/misc.c:147
msgid "Experimental algorithms should not be used!\n"
msgstr "���Өϥι���ʪ��t��k�I\n"
-#: g10/misc.c:176
+#: g10/misc.c:177
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr "����ij�ϥγo�ӽs�K�t��k�F�д��Χ󥿦����I\n"
-#: g10/misc.c:282
+#: g10/misc.c:283
msgid "the IDEA cipher plugin is not present\n"
msgstr "IDEA �s�K�k�~���Ҳդ��s�b\n"
-#: g10/misc.c:283
+#: g10/misc.c:284
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr "�аѦ� http://www.gnupg.org/why-not-idea.html ���o��h��T\n"
-#: g10/misc.c:491
+#: g10/misc.c:517
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: ����ij�ϥΪ��ﶵ \"%s\"\n"
-#: g10/misc.c:495
+#: g10/misc.c:521
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "ĵ�i�G \"%s\" �ﶵ�w����ij�ϥ�\n"
-#: g10/misc.c:497
+#: g10/misc.c:523
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "��H \"%s%s\" �N��\n"
-#: g10/misc.c:508
+#: g10/misc.c:534
#, fuzzy
msgid "Uncompressed"
msgstr "���Q�B�z"
-#: g10/misc.c:533
+#: g10/misc.c:559
#, fuzzy
msgid "uncompressed|none"
msgstr "���Q�B�z"
-#: g10/misc.c:643
+#: g10/misc.c:669
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "�o�ӰT���]�\���O %s �ү�Ϊ�\n"
-#: g10/misc.c:777
+#: g10/misc.c:826
#, fuzzy, c-format
msgid "ambiguous option `%s'\n"
msgstr "�q `%s' Ū���ﶵ\n"
-#: g10/misc.c:802
+#: g10/misc.c:851
#, fuzzy, c-format
msgid "unknown option `%s'\n"
msgstr "�������w�]����� `%s'\n"
-#: g10/parse-packet.c:120
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "�L�k�ާ@���}���_�t��k %d\n"
-#: g10/parse-packet.c:703
+#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
-#: g10/parse-packet.c:1128
+#: g10/parse-packet.c:1113
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d ���O���l�ʥ]�]�w�F����줸\n"
@@ -3931,7 +4005,7 @@ msgstr "�L�k�s���� `%s' �G %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "gpg-agent ���q�T���D\n"
-#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994
msgid "problem with the agent - disabling agent use\n"
msgstr "�N�z�{�������D �w ���b���ΥN�z�{��\n"
@@ -3967,24 +4041,24 @@ msgstr "�K�X��Ӫ�\n"
msgid "invalid response from agent\n"
msgstr "�N�z�{���Ǧ^�L�Ī��^��\n"
-#: g10/passphrase.c:781 g10/passphrase.c:874
+#: g10/passphrase.c:781 g10/passphrase.c:876
msgid "cancelled by user\n"
msgstr "�ѨϥΪ̨����F\n"
-#: g10/passphrase.c:786 g10/passphrase.c:963
+#: g10/passphrase.c:786 g10/passphrase.c:965
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "�N�z�{�������D�G�N�z�{���Ǧ^ 0x%lx\n"
-#: g10/passphrase.c:1044 g10/passphrase.c:1204
+#: g10/passphrase.c:1046 g10/passphrase.c:1206
msgid "can't query password in batchmode\n"
msgstr "�b�妸�Ҧ����L�k�߰ݱK�X\n"
-#: g10/passphrase.c:1049 g10/passphrase.c:1209
+#: g10/passphrase.c:1051 g10/passphrase.c:1211
msgid "Enter passphrase: "
msgstr "�п�J�K�X��G "
-#: g10/passphrase.c:1131
+#: g10/passphrase.c:1133
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -3994,22 +4068,22 @@ msgstr ""
"�p�ݭn�U�C�ϥΪ̪��K�X��A�ׯ�Ѷ}�p�_�G\n"
"\""
-#: g10/passphrase.c:1140
+#: g10/passphrase.c:1142
#, fuzzy, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u �줸 %s ID %08lX �����_�A�إߩ� %s"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1151
#, c-format
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:1153
+#: g10/passphrase.c:1155
#, fuzzy, c-format
msgid " (main key ID %s)"
msgstr " (�D�n���_ ID %08lX)"
-#: g10/passphrase.c:1213
+#: g10/passphrase.c:1215
msgid "Repeat passphrase: "
msgstr "�ЦA��J�@���K�X��G "
@@ -4215,25 +4289,36 @@ msgstr "ĵ�i�G `%s' �O�@�Ӫ��ɮ�\n"
msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "�p�b --pgp2 �Ҧ��U�����ϥ� PGP 2.x ���A�����_�Ӱ�����ñ�p\n"
-#: g10/sign.c:765 g10/sign.c:1001
-#, c-format
-msgid "can't create %s: %s\n"
-msgstr "�L�k�إ� %s: %s\n"
+#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483
+#, fuzzy, c-format
+msgid "can't create file `%s': %s\n"
+msgstr "�L�k�إ� `%s' �G %s\n"
-#: g10/sign.c:794
-#, c-format
-msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+#: g10/sign.c:771 g10/sign.c:1008
+#, fuzzy, c-format
+msgid "writing to file `%s'\n"
+msgstr "���b�g�� `%s'\n"
+
+#: g10/sign.c:795
+#, fuzzy, c-format
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "�j���ϥ� %s (%d) �K�n�t��k�|�H�Ϧ���̰��n�]�w\n"
-#: g10/sign.c:886
+#: g10/sign.c:887
msgid "signing:"
msgstr "ñ�p�G"
-#: g10/sign.c:985
+#: g10/sign.c:892
+#, fuzzy, c-format
+msgid "can't open file `%s': %s\n"
+msgstr "�L�k�}���ɮסG %s\n"
+
+#: g10/sign.c:986
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "�p�b --pgp2 �Ҧ��U�����ϥ� PGP 2.x ���A�����_�Ӱ�����ñ�p\n"
-#: g10/sign.c:1138
+#: g10/sign.c:1140
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s �[�K�N�Q�ĥ�\n"
@@ -4624,7 +4709,7 @@ msgstr "�إߤF�z���_ �w ���b����\n"
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr "�L�k�קK��٦��s�K�k���z���_�F�w�g�դF %d ���F�I\n"
-#: g10/seskey.c:210
+#: g10/seskey.c:213
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA �n�D�ϥ� 160 �줸������t��k\n"
@@ -4975,17 +5060,17 @@ msgstr "�S���i������"
msgid "No help available for `%s'"
msgstr "`%s' �S���i������"
-#: g10/keydb.c:189
+#: g10/keydb.c:161
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "�إ��_�Ͱ� `%s' �ɵo�Ϳ��~�G %s\n"
-#: g10/keydb.c:196
+#: g10/keydb.c:168
#, c-format
msgid "keyring `%s' created\n"
msgstr "�_�Ͱ� `%s' �w�إ�\n"
-#: g10/keydb.c:615
+#: g10/keydb.c:679
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "���s�إ��_�Ͱ�֨����ѡG %s\n"
@@ -5028,8 +5113,7 @@ msgstr "�ثe�ˬd�F %lu ����_ (�� %lu ��ñ��)\n"
msgid "%s: keyring created\n"
msgstr "%s: �_�Ͱ�w�إ�\n"
-#: g10/photoid.c:65
-#, c-format
+#: g10/photoid.c:66
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -5043,29 +5127,34 @@ msgstr ""
"�p�����_�]�|�ܦ��D�`�a�j�I\n"
"�ɶq��Ϥ��ؤo����b 240x288 ���k�A�|�O�ӫD�`�z�Q���j�p�C\n"
-#: g10/photoid.c:79
+#: g10/photoid.c:80
msgid "Enter JPEG filename for photo ID: "
msgstr "��J�n���@�ۤ� ID �� JPEG �ɦW�G "
-#: g10/photoid.c:87
+#: g10/photoid.c:88
#, c-format
msgid "Unable to open photo \"%s\": %s\n"
msgstr "�L�k�}�ҷӤ� \"%s\": %s\n"
-#: g10/photoid.c:97
+#: g10/photoid.c:96
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr ""
+
+#: g10/photoid.c:98
msgid "Are you sure you want to use it (y/N)? "
msgstr "�p�T�w�n�Υ��ܡH (y/N) "
-#: g10/photoid.c:112
+#: g10/photoid.c:113
#, c-format
msgid "\"%s\" is not a JPEG file\n"
msgstr "\"%s\" ���O�@�� JPEG ����\n"
-#: g10/photoid.c:129
+#: g10/photoid.c:130
msgid "Is this photo correct (y/N/q)? "
msgstr "�o�i�Ӥ����T�ܡH (y/N/q) "
-#: g10/photoid.c:331
+#: g10/photoid.c:332
msgid "unable to display photo ID!\n"
msgstr "�L�k��ܷӤ� ID �I\n"
@@ -5084,43 +5173,49 @@ msgid ""
msgstr "�]�����w�����ɮ��v���ﶵ�A�ӸT�ΤF�~���{���s��\n"
#: g10/exec.c:355
-msgid "this platform requires temp files when calling external programs\n"
+#, fuzzy
+msgid "this platform requires temporary files when calling external programs\n"
msgstr "�b�o�ӧ@�~���x�W�s�Υ~���{���ɻݭn�Ȧs��\n"
-#: g10/exec.c:432
-#, c-format
-msgid "unable to execute %s \"%s\": %s\n"
+#: g10/exec.c:433
+#, fuzzy, c-format
+msgid "unable to execute program `%s': %s\n"
+msgstr "�L�k���� %s \"%s\": %s\n"
+
+#: g10/exec.c:436
+#, fuzzy, c-format
+msgid "unable to execute shell `%s': %s\n"
msgstr "�L�k���� %s \"%s\": %s\n"
-#: g10/exec.c:513
+#: g10/exec.c:515
#, c-format
msgid "system error while calling external program: %s\n"
msgstr "�s�Υ~���{���ɵo�ͨt�ο��~�G %s\n"
-#: g10/exec.c:524 g10/exec.c:583
+#: g10/exec.c:526 g10/exec.c:585
msgid "unnatural exit of external program\n"
msgstr "�~���{�����۵M�a���}\n"
-#: g10/exec.c:539
+#: g10/exec.c:541
msgid "unable to execute external program\n"
msgstr "�L�k����~���{��\n"
-#: g10/exec.c:548
+#: g10/exec.c:550
#, c-format
msgid "unable to read external program response: %s\n"
msgstr "�L�k���~���{���^���G %s\n"
-#: g10/exec.c:594 g10/exec.c:601
+#: g10/exec.c:596 g10/exec.c:603
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr "ĵ�i�G�L�k�����Ȧs�� (%s) `%s': %s\n"
-#: g10/exec.c:606
+#: g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "ĵ�i�G�L�k�����Ȧs�ؿ� `%s': %s\n"
-#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
msgid "never "
msgstr "�û����L��"
@@ -5276,6 +5371,47 @@ msgstr "�M��H���O���ɿ��~�G %s\n"
msgid "read error: %s\n"
msgstr "�����~�G %s\n"
+#, fuzzy
+#~ msgid "revoked: %s"
+#~ msgstr "[�w�M�P]"
+
+#, fuzzy
+#~ msgid "expired: %s"
+#~ msgstr " [���Ĵ����G %s]"
+
+#, fuzzy
+#~ msgid "expires: %s"
+#~ msgstr " [���Ĵ����G %s]"
+
+#~ msgid "rev! subkey has been revoked: %s\n"
+#~ msgstr "rev! �l�_�w�g�Q�M�P�F�G %s\n"
+
+#~ msgid "rev- faked revocation found\n"
+#~ msgstr "rev- �o�{�Q���y���M�P\n"
+
+#~ msgid "rev? problem checking revocation: %s\n"
+#~ msgstr "rev? �ˬd�M�P�ɵo�Ͱ��D�G %s\n"
+
+#~ msgid "[revoked] "
+#~ msgstr "[�w�M�P]"
+
+#~ msgid "[expired] "
+#~ msgstr "[�w�L��]"
+
+#, fuzzy
+#~ msgid " [expired: %s]"
+#~ msgstr " [���Ĵ����G %s]"
+
+#~ msgid " [expires: %s]"
+#~ msgstr " [���Ĵ����G %s]"
+
+#, fuzzy
+#~ msgid " [revoked: %s]"
+#~ msgstr "[�w�M�P]"
+
+#~ msgid "can't create %s: %s\n"
+#~ msgstr "�L�k�إ� %s: %s\n"
+
#~ msgid "|[files]|encrypt files"
#~ msgstr "|[�ɮ�]|�[�K�ɮ�"
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index e485a905e..8973f7acf 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,12 @@
+2004-10-01 Werner Koch <[email protected]>
+
+ * mk-w32-dist: Updated from stable branch.
+
+ * mk-gpg-texi: Changed to use the newer docbook2x-texi utility.
+
+ * config.guess, config.sub, mkinstalldirs, missing
+ * depcomp, install-sh: Upgraded.
+
2004-07-27 Werner Koch <[email protected]>
* autogen.sh: Updated to the moder version, grepping the required
diff --git a/scripts/autogen.sh b/scripts/autogen.sh
index 70635da3a..2ff3c2833 100755
--- a/scripts/autogen.sh
+++ b/scripts/autogen.sh
@@ -38,6 +38,8 @@ ACLOCAL=${AUTOMAKE_PREFIX}${ACLOCAL:-aclocal}${AUTOMAKE_SUFFIX}
GETTEXT=${GETTEXT_PREFIX}${GETTEXT:-gettext}${GETTEXT_SUFFIX}
MSGMERGE=${GETTEXT_PREFIX}${MSGMERGE:-msgmerge}${GETTEXT_SUFFIX}
+DIE=no
+
# Used to cross-compile GnuPG for Windows.
if test "$1" = "--build-w32"; then
tmp=`dirname $0`
diff --git a/scripts/config.guess b/scripts/config.guess
index 27d87fa73..77c7cbab0 100755
--- a/scripts/config.guess
+++ b/scripts/config.guess
@@ -1,9 +1,9 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-timestamp='2002-11-08'
+timestamp='2004-08-13'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -98,14 +98,18 @@ trap 'exit 1' 1 2 15
# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
# use `HOST_CC' if defined, but it is deprecated.
-# This shell variable is my proudest work .. or something. --bje
+# Portable tmp directory creation inspired by the Autoconf team.
-set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
-(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
- || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
-dummy=$tmpdir/dummy ;
-files="$dummy.c $dummy.o $dummy.rel $dummy" ;
-trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
case $CC_FOR_BUILD,$HOST_CC,$CC in
,,) echo "int x;" > $dummy.c ;
for c in cc gcc c89 c99 ; do
@@ -113,15 +117,13 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
CC_FOR_BUILD="$c"; break ;
fi ;
done ;
- rm -f $files ;
if test x"$CC_FOR_BUILD" = x ; then
CC_FOR_BUILD=no_compiler_found ;
fi
;;
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ;
-unset files'
+esac ;'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# ([email protected] 1994-08-24)
@@ -178,21 +180,38 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
;;
esac
# The OS release
- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ # Debian GNU/NetBSD machines have a different userland, and
+ # thus, need a distinct triplet. However, they do not need
+ # kernel version information, so it can be replaced with a
+ # suitable tag, in the style of linux-gnu.
+ case "${UNAME_VERSION}" in
+ Debian*)
+ release='-gnu'
+ ;;
+ *)
+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ ;;
+ esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
exit 0 ;;
+ amd64:OpenBSD:*:*)
+ echo x86_64-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
amiga:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
- arc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ cats:OpenBSD:*:*)
+ echo arm-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
hp300:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
+ luna88k:OpenBSD:*:*)
+ echo m88k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
mac68k:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
@@ -208,86 +227,76 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
mvmeppc:OpenBSD:*:*)
echo powerpc-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
- pmax:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
sgi:OpenBSD:*:*)
- echo mipseb-unknown-openbsd${UNAME_RELEASE}
+ echo mips64-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
sun3:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
- wgrisc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
*:OpenBSD:*:*)
echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
+ *:ekkoBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ exit 0 ;;
+ macppc:MirBSD:*:*)
+ echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+ exit 0 ;;
+ *:MirBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ exit 0 ;;
alpha:OSF1:*:*)
- if test $UNAME_RELEASE = "V4.0"; then
+ case $UNAME_RELEASE in
+ *4.0)
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- fi
+ ;;
+ *5.*)
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ ;;
+ esac
+ # According to Compaq, /usr/sbin/psrinfo has been available on
+ # OSF/1 and Tru64 systems produced since 1995. I hope that
+ # covers most systems running today. This code pipes the CPU
+ # types through head -n 1, so we only detect the type of CPU 0.
+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+ case "$ALPHA_CPU_TYPE" in
+ "EV4 (21064)")
+ UNAME_MACHINE="alpha" ;;
+ "EV4.5 (21064)")
+ UNAME_MACHINE="alpha" ;;
+ "LCA4 (21066/21068)")
+ UNAME_MACHINE="alpha" ;;
+ "EV5 (21164)")
+ UNAME_MACHINE="alphaev5" ;;
+ "EV5.6 (21164A)")
+ UNAME_MACHINE="alphaev56" ;;
+ "EV5.6 (21164PC)")
+ UNAME_MACHINE="alphapca56" ;;
+ "EV5.7 (21164PC)")
+ UNAME_MACHINE="alphapca57" ;;
+ "EV6 (21264)")
+ UNAME_MACHINE="alphaev6" ;;
+ "EV6.7 (21264A)")
+ UNAME_MACHINE="alphaev67" ;;
+ "EV6.8CB (21264C)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.8AL (21264B)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.8CX (21264D)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.9A (21264/EV69A)")
+ UNAME_MACHINE="alphaev69" ;;
+ "EV7 (21364)")
+ UNAME_MACHINE="alphaev7" ;;
+ "EV7.9 (21364A)")
+ UNAME_MACHINE="alphaev79" ;;
+ esac
+ # A Pn.n version is a patched version.
# A Vn.n version is a released version.
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
- eval $set_cc_for_build
- cat <<EOF >$dummy.s
- .data
-\$Lformat:
- .byte 37,100,45,37,120,10,0 # "%d-%x\n"
-
- .text
- .globl main
- .align 4
- .ent main
-main:
- .frame \$30,16,\$26,0
- ldgp \$29,0(\$27)
- .prologue 1
- .long 0x47e03d80 # implver \$0
- lda \$2,-1
- .long 0x47e20c21 # amask \$2,\$1
- lda \$16,\$Lformat
- mov \$0,\$17
- not \$1,\$18
- jsr \$26,printf
- ldgp \$29,0(\$26)
- mov 0,\$16
- jsr \$26,exit
- .end main
-EOF
- $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
- if test "$?" = 0 ; then
- case `$dummy` in
- 0-0)
- UNAME_MACHINE="alpha"
- ;;
- 1-0)
- UNAME_MACHINE="alphaev5"
- ;;
- 1-1)
- UNAME_MACHINE="alphaev56"
- ;;
- 1-101)
- UNAME_MACHINE="alphapca56"
- ;;
- 2-303)
- UNAME_MACHINE="alphaev6"
- ;;
- 2-307)
- UNAME_MACHINE="alphaev67"
- ;;
- 2-1307)
- UNAME_MACHINE="alphaev68"
- ;;
- 3-1307)
- UNAME_MACHINE="alphaev7"
- ;;
- esac
- fi
- rm -f $dummy.s $dummy && rmdir $tmpdir
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
exit 0 ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
@@ -310,6 +319,9 @@ EOF
*:OS/390:*:*)
echo i370-ibm-openedition
exit 0 ;;
+ *:OS400:*:*)
+ echo powerpc-ibm-os400
+ exit 0 ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
exit 0;;
@@ -327,6 +339,9 @@ EOF
NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4
exit 0 ;;
+ DRS?6000:unix:4.0:6*)
+ echo sparc-icl-nx6
+ exit 0 ;;
DRS?6000:UNIX_SV:4.2*:7*)
case `/usr/bin/uname -p` in
sparc) echo sparc-icl-nx7 && exit 0 ;;
@@ -399,6 +414,9 @@ EOF
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
echo m68k-unknown-mint${UNAME_RELEASE}
exit 0 ;;
+ m68k:machten:*:*)
+ echo m68k-apple-machten${UNAME_RELEASE}
+ exit 0 ;;
powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE}
exit 0 ;;
@@ -439,8 +457,7 @@ EOF
EOF
$CC_FOR_BUILD -o $dummy $dummy.c \
&& $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
- && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
- rm -f $dummy.c $dummy && rmdir $tmpdir
+ && exit 0
echo mips-mips-riscos${UNAME_RELEASE}
exit 0 ;;
Motorola:PowerMAX_OS:*:*)
@@ -449,7 +466,7 @@ EOF
Motorola:*:4.3:PL8-*)
echo powerpc-harris-powermax
exit 0 ;;
- Night_Hawk:*:*:PowerMAX_OS)
+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
echo powerpc-harris-powermax
exit 0 ;;
Night_Hawk:Power_UNIX:*:*)
@@ -524,8 +541,7 @@ EOF
exit(0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
- rm -f $dummy.c $dummy && rmdir $tmpdir
+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
echo rs6000-ibm-aix3.2.5
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
echo rs6000-ibm-aix3.2.4
@@ -624,10 +640,20 @@ EOF
}
EOF
(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
- if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
- rm -f $dummy.c $dummy && rmdir $tmpdir
+ test -z "$HP_ARCH" && HP_ARCH=hppa
fi ;;
esac
+ if [ ${HP_ARCH} = "hppa2.0w" ]
+ then
+ # avoid double evaluation of $set_cc_for_build
+ test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+ then
+ HP_ARCH="hppa2.0w"
+ else
+ HP_ARCH="hppa64"
+ fi
+ fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
exit 0 ;;
ia64:HP-UX:*:*)
@@ -661,8 +687,7 @@ EOF
exit (0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
- rm -f $dummy.c $dummy && rmdir $tmpdir
+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
echo unknown-hitachi-hiuxwe2
exit 0 ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -720,21 +745,26 @@ EOF
CRAY*TS:*:*:*)
echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
- CRAY*T3D:*:*:*)
- echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
CRAY*T3E:*:*:*)
echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
CRAY*SV1:*:*:*)
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
+ *:UNICOS/mp:*:*)
+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit 0 ;;
+ 5000:UNIX_System_V:4.*:*)
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit 0 ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
exit 0 ;;
@@ -745,19 +775,7 @@ EOF
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit 0 ;;
*:FreeBSD:*:*)
- # Determine whether the default compiler uses glibc.
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include <features.h>
- #if __GLIBC__ >= 2
- LIBC=gnu
- #else
- LIBC=
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
- rm -f $dummy.c && rmdir $tmpdir
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit 0 ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
@@ -768,14 +786,17 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit 0 ;;
- x86:Interix*:3*)
- echo i386-pc-interix3
+ x86:Interix*:[34]*)
+ echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+ exit 0 ;;
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ echo i${UNAME_MACHINE}-pc-mks
exit 0 ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
# UNAME_MACHINE based on the output of uname instead of i386?
- echo i386-pc-interix
+ echo i586-pc-interix
exit 0 ;;
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
@@ -787,17 +808,28 @@ EOF
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit 0 ;;
*:GNU:*:*)
+ # the GNU system
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit 0 ;;
+ *:GNU/*:*:*)
+ # other systems with GNU libc and userland
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ exit 0 ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit 0 ;;
arm*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
+ cris:Linux:*:*)
+ echo cris-axis-linux-gnu
+ exit 0 ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
+ m32r*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
@@ -818,8 +850,26 @@ EOF
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
- rm -f $dummy.c && rmdir $tmpdir
- test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ ;;
+ mips64:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
+ #undef mips64
+ #undef mips64el
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+ CPU=mips64el
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ CPU=mips64
+ #else
+ CPU=
+ #endif
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
;;
ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
@@ -855,6 +905,9 @@ EOF
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
exit 0 ;;
+ sh64*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
@@ -912,9 +965,11 @@ EOF
LIBC=gnuaout
#endif
#endif
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
- rm -f $dummy.c && rmdir $tmpdir
test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
;;
@@ -932,6 +987,26 @@ EOF
# Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit 0 ;;
+ i*86:OS/2:*:*)
+ # If we were able to find `uname', then EMX Unix compatibility
+ # is probably installed.
+ echo ${UNAME_MACHINE}-pc-os2-emx
+ exit 0 ;;
+ i*86:XTS-300:*:STOP)
+ echo ${UNAME_MACHINE}-unknown-stop
+ exit 0 ;;
+ i*86:atheos:*:*)
+ echo ${UNAME_MACHINE}-unknown-atheos
+ exit 0 ;;
+ i*86:syllable:*:*)
+ echo ${UNAME_MACHINE}-pc-syllable
+ exit 0 ;;
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ echo i386-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ i*86:*DOS:*:*)
+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
+ exit 0 ;;
i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -966,9 +1041,6 @@ EOF
echo ${UNAME_MACHINE}-pc-sysv32
fi
exit 0 ;;
- i*86:*DOS:*:*)
- echo ${UNAME_MACHINE}-pc-msdosdjgpp
- exit 0 ;;
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -998,9 +1070,9 @@ EOF
M680?0:D-NIX:5.3:*)
echo m68k-diab-dnix
exit 0 ;;
- M68*:*:R3V[567]*:*)
+ M68*:*:R3V[5678]*:*)
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1017,9 +1089,6 @@ EOF
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
exit 0 ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
TSUNAMI:LynxOS:2.*:*)
echo sparc-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
@@ -1101,7 +1170,12 @@ EOF
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
exit 0 ;;
*:Darwin:*:*)
- echo `uname -p`-apple-darwin${UNAME_RELEASE}
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ case $UNAME_PROCESSOR in
+ *86) UNAME_PROCESSOR=i686 ;;
+ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit 0 ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
@@ -1114,7 +1188,7 @@ EOF
*:QNX:*:4*)
echo i386-pc-qnx
exit 0 ;;
- NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+ NSR-?:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit 0 ;;
*:NonStop-UX:*:*)
@@ -1137,11 +1211,6 @@ EOF
fi
echo ${UNAME_MACHINE}-unknown-plan9
exit 0 ;;
- i*86:OS/2:*:*)
- # If we were able to find `uname', then EMX Unix compatibility
- # is probably installed.
- echo ${UNAME_MACHINE}-pc-os2-emx
- exit 0 ;;
*:TOPS-10:*:*)
echo pdp10-unknown-tops10
exit 0 ;;
@@ -1160,12 +1229,19 @@ EOF
*:ITS:*:*)
echo pdp10-unknown-its
exit 0 ;;
- i*86:XTS-300:*:STOP)
- echo ${UNAME_MACHINE}-unknown-stop
+ SEI:*:*:SEIUX)
+ echo mips-sei-seiux${UNAME_RELEASE}
exit 0 ;;
- i*86:atheos:*:*)
- echo ${UNAME_MACHINE}-unknown-atheos
+ *:DragonFly:*:*)
+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit 0 ;;
+ *:*VMS:*:*)
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ case "${UNAME_MACHINE}" in
+ A*) echo alpha-dec-vms && exit 0 ;;
+ I*) echo ia64-dec-vms && exit 0 ;;
+ V*) echo vax-dec-vms && exit 0 ;;
+ esac
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1286,8 +1362,7 @@ main ()
}
EOF
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-rm -f $dummy.c $dummy && rmdir $tmpdir
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
# Apollos put the system type in the environment.
diff --git a/scripts/config.sub b/scripts/config.sub
index c4f0b2f52..ac6de9869 100755
--- a/scripts/config.sub
+++ b/scripts/config.sub
@@ -1,9 +1,9 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-timestamp='2002-11-08'
+timestamp='2004-06-24'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -70,7 +70,7 @@ Report bugs and patches to <[email protected]>."
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -118,7 +118,8 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+ kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
@@ -144,7 +145,7 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis)
+ -apple | -axis | -knuth | -cray)
os=
basic_machine=$1
;;
@@ -228,14 +229,15 @@ case $basic_machine in
| a29k \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
- | clipper \
+ | c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
| fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
- | ip2k \
- | m32r | m68000 | m68k | m88k | mcore \
+ | ip2k | iq2000 \
+ | m32r | m32rle | m68000 | m68k | m88k | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -245,21 +247,24 @@ case $basic_machine in
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
| mipsisa32 | mipsisa32el \
+ | mipsisa32r2 | mipsisa32r2el \
| mipsisa64 | mipsisa64el \
+ | mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
+ | msp430 \
| ns16k | ns32k \
| openrisc | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
| strongarm \
- | tahoe | thumb | tic80 | tron \
+ | tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
| x86 | xscale | xstormy16 | xtensa \
@@ -294,16 +299,16 @@ case $basic_machine in
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* \
| bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
- | clipper-* | cydra-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+ | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* \
- | m32r-* \
+ | ip2k-* | iq2000-* \
+ | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -315,21 +320,27 @@ case $basic_machine in
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
| mipsisa32-* | mipsisa32el-* \
+ | mipsisa32r2-* | mipsisa32r2el-* \
| mipsisa64-* | mipsisa64el-* \
+ | mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
- | mipstx39 | mipstx39el \
+ | mipstx39-* | mipstx39el-* \
+ | mmix-* \
+ | msp430-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
+ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
@@ -353,6 +364,9 @@ case $basic_machine in
basic_machine=a29k-amd
os=-udi
;;
+ abacus)
+ basic_machine=abacus-unknown
+ ;;
adobe68k)
basic_machine=m68010-adobe
os=-scout
@@ -367,6 +381,12 @@ case $basic_machine in
basic_machine=a29k-none
os=-bsd
;;
+ amd64)
+ basic_machine=x86_64-pc
+ ;;
+ amd64-*)
+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
amdahl)
basic_machine=580-amdahl
os=-sysv
@@ -426,12 +446,24 @@ case $basic_machine in
basic_machine=j90-cray
os=-unicos
;;
+ craynv)
+ basic_machine=craynv-cray
+ os=-unicosmp
+ ;;
+ cr16c)
+ basic_machine=cr16c-unknown
+ os=-elf
+ ;;
crds | unos)
basic_machine=m68k-crds
;;
cris | cris-* | etrax*)
basic_machine=cris-axis
;;
+ crx)
+ basic_machine=crx-unknown
+ os=-elf
+ ;;
da30 | da30-*)
basic_machine=m68k-da30
;;
@@ -632,10 +664,6 @@ case $basic_machine in
mips3*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
;;
- mmix*)
- basic_machine=mmix-knuth
- os=-mmixware
- ;;
monitor)
basic_machine=m68k-rom68k
os=-coff
@@ -727,6 +755,10 @@ case $basic_machine in
basic_machine=or32-unknown
os=-coff
;;
+ os400)
+ basic_machine=powerpc-ibm
+ os=-os400
+ ;;
OSE68000 | ose68000)
basic_machine=m68000-ericsson
os=-ose
@@ -758,18 +790,24 @@ case $basic_machine in
pentiumpro | p6 | 6x86 | athlon | athlon_*)
basic_machine=i686-pc
;;
- pentiumii | pentium2)
+ pentiumii | pentium2 | pentiumiii | pentium3)
basic_machine=i686-pc
;;
+ pentium4)
+ basic_machine=i786-pc
+ ;;
pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentiumpro-* | p6-* | 6x86-* | athlon-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- pentiumii-* | pentium2-*)
+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
+ pentium4-*)
+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
pn)
basic_machine=pn-gould
;;
@@ -828,6 +866,10 @@ case $basic_machine in
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
+ sei)
+ basic_machine=mips-sei
+ os=-seiux
+ ;;
sequent)
basic_machine=i386-sequent
;;
@@ -835,6 +877,9 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
+ sh64)
+ basic_machine=sh64-unknown
+ ;;
sparclite-wrs | simso-wrs)
basic_machine=sparclite-wrs
os=-vxworks
@@ -901,10 +946,6 @@ case $basic_machine in
basic_machine=i386-sequent
os=-dynix
;;
- t3d)
- basic_machine=alpha-cray
- os=-unicos
- ;;
t3e)
basic_machine=alphaev5-cray
os=-unicos
@@ -913,14 +954,18 @@ case $basic_machine in
basic_machine=t90-cray
os=-unicos
;;
- tic4x | c4x*)
- basic_machine=tic4x-unknown
- os=-coff
- ;;
tic54x | c54x*)
basic_machine=tic54x-unknown
os=-coff
;;
+ tic55x | c55x*)
+ basic_machine=tic55x-unknown
+ os=-coff
+ ;;
+ tic6x | c6x*)
+ basic_machine=tic6x-unknown
+ os=-coff
+ ;;
tx39)
basic_machine=mipstx39-unknown
;;
@@ -934,6 +979,10 @@ case $basic_machine in
tower | tower-32)
basic_machine=m68k-ncr
;;
+ tpf)
+ basic_machine=s390x-ibm
+ os=-tpf
+ ;;
udi29k)
basic_machine=a29k-amd
os=-udi
@@ -977,10 +1026,6 @@ case $basic_machine in
basic_machine=hppa1.1-winbond
os=-proelf
;;
- windows32)
- basic_machine=i386-pc
- os=-windows32-msvcrt
- ;;
xps | xps100)
basic_machine=xps100-honeywell
;;
@@ -1011,6 +1056,9 @@ case $basic_machine in
romp)
basic_machine=romp-ibm
;;
+ mmix)
+ basic_machine=mmix-knuth
+ ;;
rs6000)
basic_machine=rs6000-ibm
;;
@@ -1027,13 +1075,13 @@ case $basic_machine in
we32k)
basic_machine=we32k-att
;;
- sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
+ sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
sh64)
basic_machine=sh64-unknown
;;
- sparc | sparcv9 | sparcv9b)
+ sparc | sparcv8 | sparcv9 | sparcv9b)
basic_machine=sparc-sun
;;
cydra)
@@ -1106,19 +1154,20 @@ case $os in
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+ | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix*)
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1130,8 +1179,10 @@ case $os in
;;
esac
;;
+ -nto-qnx*)
+ ;;
-nto*)
- os=-nto-qnx
+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
| -windows* | -osx | -abug | -netware* | -os9* | -beos* \
@@ -1140,6 +1191,9 @@ case $os in
-mac*)
os=`echo $os | sed -e 's|mac|macos|'`
;;
+ -linux-dietlibc)
+ os=-linux-dietlibc
+ ;;
-linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
@@ -1152,6 +1206,9 @@ case $os in
-opened*)
os=-openedition
;;
+ -os400*)
+ os=-os400
+ ;;
-wince*)
os=-wince
;;
@@ -1173,6 +1230,9 @@ case $os in
-atheos*)
os=-atheos
;;
+ -syllable*)
+ os=-syllable
+ ;;
-386bsd)
os=-bsd
;;
@@ -1195,6 +1255,9 @@ case $os in
-sinix*)
os=-sysv4
;;
+ -tpf*)
+ os=-tpf
+ ;;
-triton*)
os=-sysv3
;;
@@ -1225,6 +1288,12 @@ case $os in
-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
os=-mint
;;
+ -aros*)
+ os=-aros
+ ;;
+ -kaos*)
+ os=-kaos
+ ;;
-none)
;;
*)
@@ -1256,6 +1325,9 @@ case $basic_machine in
arm*-semi)
os=-aout
;;
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
@@ -1302,6 +1374,9 @@ case $basic_machine in
*-ibm)
os=-aix
;;
+ *-knuth)
+ os=-mmixware
+ ;;
*-wec)
os=-proelf
;;
@@ -1434,9 +1509,15 @@ case $basic_machine in
-mvs* | -opened*)
vendor=ibm
;;
+ -os400*)
+ vendor=ibm
+ ;;
-ptx*)
vendor=sequent
;;
+ -tpf*)
+ vendor=ibm
+ ;;
-vxsim* | -vxworks* | -windiss*)
vendor=wrs
;;
diff --git a/scripts/depcomp b/scripts/depcomp
index 3480ce4e9..edb5d38ef 100755
--- a/scripts/depcomp
+++ b/scripts/depcomp
@@ -1,7 +1,7 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000 Free Software Foundation, Inc.
+# Copyright 1999, 2000, 2003 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -172,19 +172,25 @@ sgi)
aix)
# The C for AIX Compiler uses -M and outputs the dependencies
- # in a .u file. This file always lives in the current directory.
- # Also, the AIX compiler puts `$object:' at the start of each line;
- # $object doesn't have directory information.
- stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
+ # in a .u file. In older versions, this file always lives in the
+ # current directory. Also, the AIX compiler puts `$object:' at the
+ # start of each line; $object doesn't have directory information.
+ # Version 6 uses the directory in both cases.
+ stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
tmpdepfile="$stripped.u"
- outname="$stripped.o"
if test "$libtool" = yes; then
"$@" -Wc,-M
else
"$@" -M
fi
-
stat=$?
+
+ if test -f "$tmpdepfile"; then :
+ else
+ stripped=`echo "$stripped" | sed 's,^.*/,,'`
+ tmpdepfile="$stripped.u"
+ fi
+
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
@@ -192,6 +198,7 @@ aix)
fi
if test -f "$tmpdepfile"; then
+ outname="$stripped.o"
# Each line is of the form `foo.o: dependent.h'.
# Do two passes, one to just change these to
# `$object: dependent.h' and one to simply `dependent.h:'.
@@ -206,19 +213,61 @@ aix)
rm -f "$tmpdepfile"
;;
+icc)
+ # Intel's C compiler understands `-MD -MF file'. However on
+ # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+ # ICC 7.0 will fill foo.d with something like
+ # foo.o: sub/foo.c
+ # foo.o: sub/foo.h
+ # which is wrong. We want:
+ # sub/foo.o: sub/foo.c
+ # sub/foo.o: sub/foo.h
+ # sub/foo.c:
+ # sub/foo.h:
+ # ICC 7.1 will output
+ # foo.o: sub/foo.c sub/foo.h
+ # and will wrap long lines using \ :
+ # foo.o: sub/foo.c ... \
+ # sub/foo.h ... \
+ # ...
+
+ "$@" -MD -MF "$tmpdepfile"
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile"
+ exit $stat
+ fi
+ rm -f "$depfile"
+ # Each line is of the form `foo.o: dependent.h',
+ # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+ # Do two passes, one to just change these to
+ # `$object: dependent.h' and one to simply `dependent.h:'.
+ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+ # Some versions of the HPUX 10.20 sed can't process this invocation
+ # correctly. Breaking it into two sed invocations is a workaround.
+ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+ sed -e 's/$/ :/' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
tru64)
# The Tru64 compiler uses -MD to generate dependencies as a side
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
# dependencies in `foo.d' instead, so we check for that too.
# Subdirectories are respected.
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
- base=`echo "$object" | sed -e 's/\.o$//' -e 's/\.lo$//'`
- tmpdepfile1="$base.o.d"
- tmpdepfile2="$base.d"
if test "$libtool" = yes; then
+ tmpdepfile1="$dir.libs/$base.lo.d"
+ tmpdepfile2="$dir.libs/$base.d"
"$@" -Wc,-MD
else
+ tmpdepfile1="$dir$base.o.d"
+ tmpdepfile2="$dir$base.d"
"$@" -MD
fi
@@ -236,8 +285,8 @@ tru64)
fi
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a space and a tab in the [].
- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ # That's a tab and a space in the [].
+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
echo "#dummy" > "$depfile"
fi
@@ -250,34 +299,42 @@ tru64)
dashmstdout)
# Important note: in order to support this mode, a compiler *must*
- # always write the proprocessed file to stdout, regardless of -o,
- # because we must use -o when running libtool.
- test -z "$dashmflag" && dashmflag=-M
- ( IFS=" "
- case " $* " in
- *" --mode=compile "*) # this is libtool, let us make it quiet
- for arg
- do # cycle over the arguments
- case "$arg" in
- "--mode=compile")
- # insert --quiet before "--mode=compile"
- set fnord "$@" --quiet
- shift # fnord
- ;;
- esac
- set fnord "$@" "$arg"
- shift # fnord
- shift # "$arg"
- done
+ # always write the preprocessed file to stdout, regardless of -o.
+ "$@" || exit $?
+
+ # Remove the call to Libtool.
+ if test "$libtool" = yes; then
+ while test $1 != '--mode=compile'; do
+ shift
+ done
+ shift
+ fi
+
+ # Remove `-o $object'.
+ IFS=" "
+ for arg
+ do
+ case $arg in
+ -o)
+ shift
+ ;;
+ $object)
+ shift
+ ;;
+ *)
+ set fnord "$@" "$arg"
+ shift # fnord
+ shift # $arg
;;
esac
- "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
- ) &
- proc=$!
- "$@"
- stat=$?
- wait "$proc"
- if test "$stat" != 0; then exit $stat; fi
+ done
+
+ test -z "$dashmflag" && dashmflag=-M
+ # Require at least two characters before searching for `:'
+ # in the target name. This is to cope with DOS-style filenames:
+ # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+ "$@" $dashmflag |
+ sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
tr ' ' '
@@ -295,33 +352,37 @@ dashXmstdout)
;;
makedepend)
- # X makedepend
- (
- shift
- cleared=no
- for arg in "$@"; do
- case $cleared in no)
- set ""; shift
- cleared=yes
- esac
- case "$arg" in
- -D*|-I*)
- set fnord "$@" "$arg"; shift;;
- -*)
- ;;
- *)
- set fnord "$@" "$arg"; shift;;
- esac
+ "$@" || exit $?
+ # Remove any Libtool call
+ if test "$libtool" = yes; then
+ while test $1 != '--mode=compile'; do
+ shift
done
- obj_suffix="`echo $object | sed 's/^.*\././'`"
- touch "$tmpdepfile"
- ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
- ) &
- proc=$!
- "$@"
- stat=$?
- wait "$proc"
- if test "$stat" != 0; then exit $stat; fi
+ shift
+ fi
+ # X makedepend
+ shift
+ cleared=no
+ for arg in "$@"; do
+ case $cleared in
+ no)
+ set ""; shift
+ cleared=yes ;;
+ esac
+ case "$arg" in
+ -D*|-I*)
+ set fnord "$@" "$arg"; shift ;;
+ # Strip any option that makedepend may not understand. Remove
+ # the object too, otherwise makedepend will parse it as a source file.
+ -*|$object)
+ ;;
+ *)
+ set fnord "$@" "$arg"; shift ;;
+ esac
+ done
+ obj_suffix="`echo $object | sed 's/^.*\././'`"
+ touch "$tmpdepfile"
+ ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
sed '1,2d' "$tmpdepfile" | tr ' ' '
@@ -334,35 +395,39 @@ makedepend)
cpp)
# Important note: in order to support this mode, a compiler *must*
- # always write the proprocessed file to stdout, regardless of -o,
- # because we must use -o when running libtool.
- ( IFS=" "
- case " $* " in
- *" --mode=compile "*)
- for arg
- do # cycle over the arguments
- case $arg in
- "--mode=compile")
- # insert --quiet before "--mode=compile"
- set fnord "$@" --quiet
- shift # fnord
- ;;
- esac
- set fnord "$@" "$arg"
- shift # fnord
- shift # "$arg"
- done
+ # always write the preprocessed file to stdout.
+ "$@" || exit $?
+
+ # Remove the call to Libtool.
+ if test "$libtool" = yes; then
+ while test $1 != '--mode=compile'; do
+ shift
+ done
+ shift
+ fi
+
+ # Remove `-o $object'.
+ IFS=" "
+ for arg
+ do
+ case $arg in
+ -o)
+ shift
+ ;;
+ $object)
+ shift
+ ;;
+ *)
+ set fnord "$@" "$arg"
+ shift # fnord
+ shift # $arg
;;
esac
- "$@" -E |
+ done
+
+ "$@" -E |
sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
sed '$ s: \\$::' > "$tmpdepfile"
- ) &
- proc=$!
- "$@"
- stat=$?
- wait "$proc"
- if test "$stat" != 0; then exit $stat; fi
rm -f "$depfile"
echo "$object : \\" > "$depfile"
cat < "$tmpdepfile" >> "$depfile"
@@ -372,49 +437,27 @@ cpp)
msvisualcpp)
# Important note: in order to support this mode, a compiler *must*
- # always write the proprocessed file to stdout, regardless of -o,
+ # always write the preprocessed file to stdout, regardless of -o,
# because we must use -o when running libtool.
- ( IFS=" "
- case " $* " in
- *" --mode=compile "*)
- for arg
- do # cycle over the arguments
- case $arg in
- "--mode=compile")
- # insert --quiet before "--mode=compile"
- set fnord "$@" --quiet
- shift # fnord
- ;;
- esac
- set fnord "$@" "$arg"
- shift # fnord
- shift # "$arg"
- done
- ;;
- esac
- for arg
- do
- case "$arg" in
- "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+ "$@" || exit $?
+ IFS=" "
+ for arg
+ do
+ case "$arg" in
+ "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
set fnord "$@"
shift
shift
;;
- *)
+ *)
set fnord "$@" "$arg"
shift
shift
;;
- esac
- done
- "$@" -E |
- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
- ) &
- proc=$!
- "$@"
- stat=$?
- wait "$proc"
- if test "$stat" != 0; then exit $stat; fi
+ esac
+ done
+ "$@" -E |
+ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
. "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
diff --git a/scripts/install-sh b/scripts/install-sh
index 398a88e14..6ce63b9f7 100755
--- a/scripts/install-sh
+++ b/scripts/install-sh
@@ -1,19 +1,37 @@
#!/bin/sh
#
# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
#
-# Copyright 1991 by the Massachusetts Institute of Technology
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission. M.I.T. makes no representations about the
-# suitability of this software for any purpose. It is provided "as is"
-# without express or implied warranty.
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
# `make' implicit rules from creating a file called install from it
@@ -56,7 +74,7 @@ dir_arg=""
while [ x"$1" != x ]; do
case $1 in
- -c) instcmd="$cpprog"
+ -c) instcmd=$cpprog
shift
continue;;
@@ -79,7 +97,7 @@ while [ x"$1" != x ]; do
shift
continue;;
- -s) stripcmd="$stripprog"
+ -s) stripcmd=$stripprog
shift
continue;;
@@ -106,7 +124,7 @@ done
if [ x"$src" = x ]
then
- echo "install: no input file specified"
+ echo "$0: no input file specified" >&2
exit 1
else
:
@@ -115,8 +133,8 @@ fi
if [ x"$dir_arg" != x ]; then
dst=$src
src=""
-
- if [ -d $dst ]; then
+
+ if [ -d "$dst" ]; then
instcmd=:
chmodcmd=""
else
@@ -125,20 +143,20 @@ if [ x"$dir_arg" != x ]; then
else
# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad
+# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
- if [ -f $src -o -d $src ]
+ if [ -f "$src" ] || [ -d "$src" ]
then
:
else
- echo "install: $src does not exist"
+ echo "$0: $src does not exist" >&2
exit 1
fi
-
+
if [ x"$dst" = x ]
then
- echo "install: no destination specified"
+ echo "$0: no destination specified" >&2
exit 1
else
:
@@ -147,16 +165,16 @@ else
# If destination is a directory, append the input filename; if your system
# does not like double slashes in filenames, you may need to add some logic
- if [ -d $dst ]
+ if [ -d "$dst" ]
then
- dst="$dst"/`basename $src`
+ dst=$dst/`basename "$src"`
else
:
fi
fi
## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
# Make sure that the destination directory exists.
# this part is taken from Noah Friedman's mkinstalldirs script
@@ -165,69 +183,73 @@ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
if [ ! -d "$dstdir" ]; then
defaultIFS='
'
-IFS="${IFS-${defaultIFS}}"
+IFS="${IFS-$defaultIFS}"
-oIFS="${IFS}"
+oIFS=$IFS
# Some sh's can't handle IFS=/ for some reason.
IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
+set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS=$oIFS
pathcomp=''
while [ $# -ne 0 ] ; do
- pathcomp="${pathcomp}${1}"
+ pathcomp=$pathcomp$1
shift
- if [ ! -d "${pathcomp}" ] ;
+ if [ ! -d "$pathcomp" ] ;
then
- $mkdirprog "${pathcomp}"
+ $mkdirprog "$pathcomp"
else
:
fi
- pathcomp="${pathcomp}/"
+ pathcomp=$pathcomp/
done
fi
if [ x"$dir_arg" != x ]
then
- $doit $instcmd $dst &&
+ $doit $instcmd "$dst" &&
- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
+ if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
+ if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
+ if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
+ if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
else
# If we're going to rename the final executable, determine the name now.
- if [ x"$transformarg" = x ]
+ if [ x"$transformarg" = x ]
then
- dstfile=`basename $dst`
+ dstfile=`basename "$dst"`
else
- dstfile=`basename $dst $transformbasename |
+ dstfile=`basename "$dst" $transformbasename |
sed $transformarg`$transformbasename
fi
# don't allow the sed command to completely eliminate the filename
- if [ x"$dstfile" = x ]
+ if [ x"$dstfile" = x ]
then
- dstfile=`basename $dst`
+ dstfile=`basename "$dst"`
else
:
fi
-# Make a temp file name in the proper directory.
+# Make a couple of temp file names in the proper directory.
- dsttmp=$dstdir/#inst.$$#
+ dsttmp=$dstdir/_inst.$$_
+ rmtmp=$dstdir/_rm.$$_
-# Move or copy the file name to the temp name
+# Trap to clean up temp files at exit.
- $doit $instcmd $src $dsttmp &&
+ trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+ trap '(exit $?); exit' 1 2 13 15
- trap "rm -f ${dsttmp}" 0 &&
+# Move or copy the file name to the temp name
+
+ $doit $instcmd "$src" "$dsttmp" &&
# and set any options; do chmod last to preserve setuid bits
@@ -235,17 +257,38 @@ else
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $instcmd $src $dsttmp" command.
- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
+ if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
+ if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
+ if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
+ if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
+
+# Now remove or move aside any old file at destination location. We try this
+# two ways since rm can't unlink itself on some systems and the destination
+# file might be busy for other reasons. In this case, the final cleanup
+# might fail but the new file should still install successfully.
+
+{
+ if [ -f "$dstdir/$dstfile" ]
+ then
+ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
+ $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
+ {
+ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+ (exit 1); exit
+ }
+ else
+ :
+ fi
+} &&
# Now rename the file to the real destination.
- $doit $rmcmd -f $dstdir/$dstfile &&
- $doit $mvcmd $dsttmp $dstdir/$dstfile
+ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
fi &&
+# The final little trick to "correctly" pass the exit status to the exit trap.
-exit 0
+{
+ (exit 0); exit
+}
diff --git a/scripts/missing b/scripts/missing
index dd583709f..fc54c64ec 100755
--- a/scripts/missing
+++ b/scripts/missing
@@ -1,6 +1,6 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <[email protected]>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -165,7 +165,7 @@ WARNING: \`$1' is missing on your system. You should only need it if
WARNING: \`$1' is needed, and you do not seem to have it handy on your
system. You might have modified some files without having the
proper tools for further handling them.
- You can get \`$1Help2man' as part of \`Autoconf' from any GNU
+ You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
@@ -293,23 +293,23 @@ WARNING: \`$1' is missing on your system. You should only need it if
# Look for gnutar/gtar before invocation to avoid ugly error
# messages.
if (gnutar --version > /dev/null 2>&1); then
- gnutar ${1+"$@"} && exit 0
+ gnutar "$@" && exit 0
fi
if (gtar --version > /dev/null 2>&1); then
- gtar ${1+"$@"} && exit 0
+ gtar "$@" && exit 0
fi
firstarg="$1"
if shift; then
case "$firstarg" in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" ${1+"$@"} && exit 0
+ tar "$firstarg" "$@" && exit 0
;;
esac
case "$firstarg" in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" ${1+"$@"} && exit 0
+ tar "$firstarg" "$@" && exit 0
;;
esac
fi
@@ -326,7 +326,7 @@ WARNING: I can't seem to be able to run \`tar' with the given arguments.
WARNING: \`$1' is needed, and you do not seem to have it handy on your
system. You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequirements for installing
+ it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program."
exit 1
diff --git a/scripts/mk-gpg-texi b/scripts/mk-gpg-texi
index 45a811742..447d2ebec 100755
--- a/scripts/mk-gpg-texi
+++ b/scripts/mk-gpg-texi
@@ -14,32 +14,35 @@
set -e
for file in gpg gpgv; do
- sgml2xml -x lower ${file}.sgml >${file}.xml
- docbook2texi ${file}.xml | sed 's,--,---,' | (
- case "$file" in
- *gpgv)
- sed '/@setfilename/a \
-@dircategory GnuPG\
-@direntry\
-* gpgv: (gpgv). GnuPG signature verification tool.\
-@end direntry
-'
- ;;
+ sgml2xml -x lower ${file}.sgml >${file}.xml
+# docbook2texi ${file}.xml | sed 's,--,---,' | (
+ docbook2x-texi --to-stdout ${file}.xml >${file}.texi
+# | (
+# case "$file" in
+# *gpgv)
+# sed '/@setfilename/a \
+# @dircategory GnuPG\
+# @direntry\
+# * gpgv: (gpgv). GnuPG signature verification tool.\
+# @end direntry
+# '
+# ;;
+#
+# gpg)
+# sed '/@setfilename/a \
+# @dircategory GnuPG\
+# @direntry\
+# * gpg: (gpg). GnuPG encryption and signing tool.\
+# @end direntry
+# '
+# ;;
+#
+# *)
+# cat
+# ;;
+# esac
+# ) >${file}.texi
- gpg)
- sed '/@setfilename/a \
-@dircategory GnuPG\
-@direntry\
-* gpg: (gpg). GnuPG encryption and signing tool.\
-@end direntry
-'
- ;;
-
- *)
- cat
- ;;
- esac
- ) >${file}.texi
done
diff --git a/scripts/mk-w32-dist b/scripts/mk-w32-dist
index 085193383..1dd64fb01 100755
--- a/scripts/mk-w32-dist
+++ b/scripts/mk-w32-dist
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
@@ -70,18 +70,16 @@ done
for i in ${srcdir}/po/*.po; do
lang=$(basename $i .po)
fromset=`sed -n '/^"Content-Type:/ s/.*charset=\([a-zA-Z0-9_-]*\).*/\1/p' $i`
- # pl,hu,sk are also cp1250 but the current PO file can't be converted.
+ # pl,sk are also cp1250 but the current PO file can't be converted.
case $lang in
- cs) toset="CP852" ;;
+ cs|hu|ro) toset="CP852" ;;
tr) toset="CP1254" ;; # DOS: CP857
el) toset="CP1253" ;; # same as latin-7?
- el|eo|et|ja|pl|hu|sk|zh_TW) toset="" ;;
- en@*) toset="skip" ;;
+ ru|be) toset="CP1251" ;; # same as latin-7?
+ el|eo|et|ja|pl|sk|zh_TW|zh_CN) toset="" ;;
*) toset="CP850" ;;
esac
- if [ "$toset" = "skip" ]; then
- :
- elif [ -n "$toset" ]; then
+ if [ -n "$toset" ]; then
echo "$lang: converting from $fromset to $toset" >&2
iconv --silent --from-code=$fromset --to-code=$toset < $i | \
sed "/^\"Content-Type:/ s/charset=[a-zA-Z0-9_-]*/charset=$toset/" | \