aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2006-12-06 09:52:40 +0000
committerWerner Koch <[email protected]>2006-12-06 09:52:40 +0000
commitd8ff6704c8c19adc339bed224b5bd1ed3090673e (patch)
tree799ba7d809589433fc94273f0569c7d44b716ce0
parentChanging the way man pages are build. (diff)
downloadgnupg-d8ff6704c8c19adc339bed224b5bd1ed3090673e.tar.gz
gnupg-d8ff6704c8c19adc339bed224b5bd1ed3090673e.zip
Preparing a releasegnupg-1.4.6
-rw-r--r--ChangeLog9
-rw-r--r--NEWS11
-rw-r--r--README8
-rw-r--r--TODO3
-rw-r--r--configure.ac17
-rw-r--r--doc/ChangeLog1
-rw-r--r--doc/Makefile.am26
-rw-r--r--doc/gnupg1.texi161
-rw-r--r--doc/gpg.texi2695
-rw-r--r--doc/gpgv.texi167
-rw-r--r--doc/gpl.texi397
-rw-r--r--doc/opt-homedir.texi14
-rw-r--r--doc/see-also-note.texi14
-rw-r--r--doc/specify-user-id.texi171
-rw-r--r--doc/texi.css6
-rw-r--r--g10/ChangeLog14
-rw-r--r--g10/armor.c53
-rw-r--r--g10/encr-data.c99
-rw-r--r--g10/filter.h6
-rw-r--r--g10/import.c5
-rw-r--r--g10/keyedit.c18
-rw-r--r--g10/keyserver.c11
-rw-r--r--include/ChangeLog4
-rw-r--r--include/iobuf.h1
-rw-r--r--po/be.po750
-rw-r--r--po/ca.po754
-rw-r--r--po/cs.po742
-rw-r--r--po/da.po754
-rw-r--r--po/de.po754
-rw-r--r--po/el.po754
-rw-r--r--po/eo.po754
-rw-r--r--po/es.po754
-rw-r--r--po/et.po754
-rw-r--r--po/fi.po754
-rw-r--r--po/fr.po742
-rw-r--r--po/gl.po754
-rw-r--r--po/hu.po754
-rw-r--r--po/id.po754
-rw-r--r--po/it.po754
-rw-r--r--po/ja.po754
-rw-r--r--po/nb.po742
-rw-r--r--po/pl.po754
-rw-r--r--po/pt.po754
-rw-r--r--po/pt_BR.po754
-rw-r--r--po/ro.po754
-rw-r--r--po/ru.po742
-rw-r--r--po/sk.po754
-rw-r--r--po/sv.po754
-rw-r--r--po/tr.po754
-rw-r--r--po/zh_CN.po742
-rw-r--r--po/zh_TW.po742
-rw-r--r--scripts/ChangeLog4
-rw-r--r--scripts/distfiles2
-rwxr-xr-xscripts/mdate-sh133
-rwxr-xr-xscripts/mk-gpg-texi52
-rw-r--r--scripts/texinfo.tex6773
56 files changed, 21043 insertions, 10114 deletions
diff --git a/ChangeLog b/ChangeLog
index cd9129cf0..dc0a717bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-12-06 Werner Koch <[email protected]>
+
+ Released 1.4.6.
+
+2006-12-04 Werner Koch <[email protected]>
+
+ * README: Add hint on hjow to set CC_FOR_BUILD.
+ * configure.ac (CC_FOR_BUILD): New.
+
2006-12-02 David Shaw <[email protected]>
* NEWS: Note the CVE for bug#728, --s2k-count,
diff --git a/NEWS b/NEWS
index f9080bb48..8c56d063a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,14 @@
-Noteworthy changes in version 1.4.6
+Noteworthy changes in version 1.4.6 (2006-12-06)
------------------------------------------------
+ * Fixed a serious and exploitable bug in processing encrypted
+ packages. [CVE-2006-6235].
+
+ * Fixed a buffer overflow in gpg. [bug#728, CVE-2006-6169]
+
* Fixed a bug while decrypting certain compressed and encrypted
messages. [bug#537]
- * Fixed a buffer overflow in gpg. [bug#728, CVE-2006-6169]
-
* Added --s2k-count to set the number of times passphrase mangling
is repeated. The default is 65536 times.
@@ -23,6 +26,8 @@ Noteworthy changes in version 1.4.6
violations pertaining to this issue, including those that may
have occurred in the past.
+ * Man pages are now build from the same source as those of GnuPG-2.
+
Noteworthy changes in version 1.4.5 (2006-08-01)
------------------------------------------------
diff --git a/README b/README
index bd7b473d7..0e20a37fc 100644
--- a/README
+++ b/README
@@ -677,6 +677,14 @@
This doesn't matter and we know about it (actually it is due to
some warning options which we have enabled for gcc)
+ If you are cross-compiling and you get an error either building a
+ tool called "yat2m" or running that tool, the problem is most
+ likely a bad or missing native compiler. We require a standard
+ C-89 compiler to produce an executable to be run on the build
+ platform. You can explicitly set such a compiler with configure
+ arguments. On HP/UX you might want to try: "CC_FOR_BUILD=c89".
+
+
Specific problems on some machines
----------------------------------
diff --git a/TODO b/TODO
index fc7fe4cc3..a7187a1f0 100644
--- a/TODO
+++ b/TODO
@@ -70,5 +70,4 @@
no way to issue a cancel when unsing the CLI - this would however
be a Good Thing when used with mixed symkey/pubkey encrypted
messages. See comment in mainproc.c:proc_symkey_enc.
-
- * Copy the manual from trunk and update the Makefile. \ No newline at end of file
+ Note, that this has been fixed in 2.0.2 - we should backport it.
diff --git a/configure.ac b/configure.ac
index afc6fedf4..f2e74f33b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ min_automake_version="1.9.3"
# Remember to change the version number immediately *after* a release.
# Set my_issvn to "yes" for non-released code. Remember to run an
# "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [1.4.6rc1])
+m4_define([my_version], [1.4.6])
m4_define([my_issvn], [no])
m4_define([svn_revision], m4_esyscmd([echo -n $((svn info 2>/dev/null \
@@ -466,6 +466,21 @@ GNUPG_CHECK_FAQPROG
GNUPG_CHECK_DOCBOOK_TO_TEXI
GNUPG_CHECK_USTAR
+
+# According to a comment by Marcus Brinkman in libgpg-error, the
+# AC_PROG_CC_FOR_BUILD macro in the AC archive is broken for autoconf
+# 2.57. Thus we use a simply use "cc" if we are cross-compiling.
+AC_MSG_CHECKING(for cc for build)
+if test "$cross_compiling" = "yes"; then
+ CC_FOR_BUILD="${CC_FOR_BUILD-cc}"
+else
+ CC_FOR_BUILD="${CC_FOR_BUILD-$CC}"
+fi
+AC_MSG_RESULT($CC_FOR_BUILD)
+AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler])
+
+
+
MPI_OPT_FLAGS=""
have_dosish_system=no
diff --git a/doc/ChangeLog b/doc/ChangeLog
index a0c0343c3..2807b4ee7 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,6 +1,7 @@
2006-12-04 Werner Koch <[email protected]>
* yat2m.c: New.
+ * Makefile.am: New rules to build yatm and the man pages.
2006-06-22 David Shaw <[email protected]>
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 71c76275c..30d39a2d0 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -18,21 +18,20 @@
## Process this file with automake to create Makefile.in
-AUTOMAKE_OPTIONS = no-texinfo.tex
-
-EXTRA_DIST = DETAILS gpg.1 gpgv.1 faq.raw FAQ faq.html \
+EXTRA_DIST = DETAILS faq.raw FAQ faq.html \
HACKING OpenPGP README.W32 samplekeys.asc gnupg.7 \
- TRANSLATE gpg.ru.sgml gpg.ru.1 highlights-1.4.txt
-
-noinst_PROGRAMS = yat2m
+ TRANSLATE gpg.ru.sgml gpg.ru.1 highlights-1.4.txt \
+ gpg.texi gpgv.texi specify-user-id.texi see-also-note.texi \
+ opt-homedir.texi texi.css yat2m.c gpl.texi
-myman_sources = gpg.texi
-myman_pages = gpg.1
+myman_sources = gpg.texi gpgv.texi
+myman_pages = gpg.1 gpgv.1
-info_TEXINFOS = gpg.texi
+info_TEXINFOS = gnupg1.texi
man_MANS = $(myman_pages) gnupg.7 gpg.ru.1
+gnupg1_TEXINFOS = gnupg1.texi
# Need this to avoid building of dvis with automake 1.4
DVIS =
@@ -43,13 +42,16 @@ BUILT_SOURCES = FAQ faq.html
# we can't add gpg.texi gpgv.texi here because automake does not like them to
# be built files.
-CLEANFILES = faq.raw.xref gpg.xml gpgv.xml gpg.ru.xml
-DISTCLEANFILES = yat2m-stamp.tmp yat2m-stamp $(myman_pages)
+CLEANFILES = faq.raw.xref gpg.xml gpgv.xml gpg.ru.xml
+DISTCLEANFILES = yat2m yat2m-stamp.tmp yat2m-stamp $(myman_pages)
+
+AM_MAKEINFOFLAGS = -I $(srcdir) --css-include=$(srcdir)/texi.css -D gpgone
YAT2M_OPTIONS = -I $(srcdir) -D gpgone \
--release "GnuPG @PACKAGE_VERSION@" --source "GNU Privacy Guard"
-yat2m_SOURCES = yat2m.c
+yat2m: Makefile yat2m.c
+ $(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c
yat2m-stamp: $(myman_sources)
@rm -f yat2m-stamp.tmp
diff --git a/doc/gnupg1.texi b/doc/gnupg1.texi
new file mode 100644
index 000000000..75c98ba1b
--- /dev/null
+++ b/doc/gnupg1.texi
@@ -0,0 +1,161 @@
+\input texinfo @c -*-texinfo-*-
+@c %**start of header
+@setfilename gnupg1.info
+@include version.texi
+@settitle Using the GnuPG Version 1.4
+
+@c A couple of macros with no effect on texinfo
+@c but used by the yat2m processor.
+@macro manpage {a}
+@end macro
+@macro mansect {a}
+@end macro
+@macro manpause
+@end macro
+@macro mancont
+@end macro
+
+@c Create a separate index for command line options.
+@defcodeindex op
+@c Merge the standard indexes into a single one.
+@syncodeindex fn cp
+@syncodeindex vr cp
+@syncodeindex ky cp
+@syncodeindex pg cp
+@syncodeindex tp cp
+@c %**end of header
+@copying
+This is the @cite{The GNU Privacy Guard Manual}
+(@value{VERSION}, @value{UPDATED}).
+
+@iftex
+Published by the Free Software Foundation@*
+51 Franklin St, Fifth Floor@*
+Boston, MA 02110-1301 USA
+@end iftex
+
+Copyright @copyright{} 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2 of the License, or (at your
+option) any later version. The text of the license can be found in the
+section entitled ``Copying''.
+@end quotation
+@end copying
+
+
+@dircategory GNU Utilities
+@direntry
+* gpg: (gpg). OpenPGP encryption and signing tool (v1).
+@end direntry
+
+
+@c
+@c Printing stuff taken from gcc.
+@c
+@macro gnupgtabopt{body}
+@code{\body\}
+@end macro
+@macro gnupgoptlist{body}
+@smallexample
+\body\
+@end smallexample
+@end macro
+@c Makeinfo handles the above macro OK, TeX needs manual line breaks;
+@c they get lost at some point in handling the macro. But if @macro is
+@c used here rather than @alias, it produces double line breaks.
+@iftex
+@alias gol = *
+@end iftex
+@ifnottex
+@macro gol
+@end macro
+@end ifnottex
+
+
+@c
+@c Titlepage
+@c
+@setchapternewpage odd
+@titlepage
+@title Using the GNU Privacy Guard, Version 1.4
+@subtitle Version @value{VERSION}
+@subtitle @value{UPDATED}
+
+@author Werner Koch (@email{wk@@gnupg.org})
+
+@page
+@vskip 0pt plus 1filll
+@insertcopying
+@end titlepage
+
+@ifnothtml
+@summarycontents
+@contents
+@page
+@end ifnothtml
+
+@ifnottex
+@node Top
+@top
+@insertcopying
+
+@noindent
+This manual documents how to use the standalone version of GNU Privacy Guard.
+@end ifnottex
+
+@menu
+* Invoking GPG:: Using the classic GPG protocol.
+* Specify a User ID:: How to Specify a User Id.
+
+* Copying:: GNU General Public License says
+ how you can copy and share GnuPG
+* Option Index:: Index to command line options.
+* Index:: Index of concepts and symbol names.
+@end menu
+
+@ifhtml
+
+@end ifhtml
+
+
+@ifhtml
+@page
+@summarycontents
+@contents
+@end ifhtml
+
+
+@include gpg.texi
+
+@node Specify a User ID
+@chapter How to Specify a User Id
+@anchor{how-to-specify-a-user-id}
+@include specify-user-id.texi
+
+@include gpl.texi
+
+
+@c ---------------------------------------------------------------------
+@c Indexes
+@c ---------------------------------------------------------------------
+
+@node Option Index
+@unnumbered Option Index
+
+@printindex op
+
+@node Index
+@unnumbered Index
+
+@printindex cp
+
+@c ---------------------------------------------------------------------
+@c Epilogue
+@c ---------------------------------------------------------------------
+
+@bye
+
+
diff --git a/doc/gpg.texi b/doc/gpg.texi
new file mode 100644
index 000000000..a8e213c95
--- /dev/null
+++ b/doc/gpg.texi
@@ -0,0 +1,2695 @@
+@c Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+@c 2006 Free Software Foundation, Inc.
+@c This is part of the GnuPG manual.
+@c For copying conditions, see the file gnupg.texi.
+
+@node Invoking GPG
+@chapter Invoking GPG
+@cindex GPG command options
+@cindex command options
+@cindex options, GPG command
+
+@c Begin GnuPG 1.x specific stuff
+@ifset gpgone
+@macro gpgname
+gpg
+@end macro
+@manpage gpg.1
+@ifset manverb
+.B gpg
+\- OpenPGP encryption and signing tool
+@end ifset
+
+@mansect synopsis
+@ifset manverb
+.B gpg
+.RB [ \-\-homedir
+.IR dir ]
+.RB [ \-\-options
+.IR file ]
+.RI [ options ]
+.I command
+.RI [ args ]
+@end ifset
+@end ifset
+@c End GnuPG 1.x specific stuff
+
+@c Begin GnuPG 2 specific stuff
+@ifclear gpgone
+@macro gpgname
+gpg2
+@end macro
+@manpage gpg2.1
+@ifset manverb
+.B gpg2
+\- OpenPGP encryption and signing tool
+@end ifset
+
+@mansect synopsis
+@ifset manverb
+.B gpg2
+.RB [ \-\-homedir
+.IR dir ]
+.RB [ \-\-options
+.IR file ]
+.RI [ options ]
+.I command
+.RI [ args ]
+@end ifset
+@end ifclear
+@c Begin GnuPG 2 specific stuff
+
+@mansect description
+@command{@gpgname} is the OpenPGP part of the GNU Privacy Guard (GnuPG). It
+is a tool to provide digital encryption and signing services using the
+OpenPGP standard. @command{@gpgname} features complete key management and
+all bells and whistles you can expect from a decent OpenPGP
+implementation.
+
+@ifset gpgone
+This is the standalone version of @command{gpg}. For desktop use you
+should consider using @command{gpg2}.
+@end ifset
+
+@ifclear gpgone
+In contrast to the standalone version @command{gpg}, which is more
+suited for server and embedded platforms, this version is installed
+under the name @command{gpg2} and more targeted to the desktop as it
+requires several other modules to be installed. The standalone version
+will be kept maintained and it is possible to install both versions on
+the same system. If you need to use different configuration files, you
+should make use of something like @file{gpg.conf-2} instead of just
+@file{gpg.conf}.
+@end ifclear
+
+@manpause
+@ifclear gpgone
+Documentation for the old standard @command{gpg} is available as a man
+page and at @inforef{Top,GnuPG 1,gpg}.
+@end ifclear
+
+@xref{Option Index}, for an index to @command{@gpgname}'s commands and options.
+@mancont
+
+@menu
+* GPG Commands:: List of all commands.
+* GPG Options:: List of all options.
+* GPG Configuration:: Configuration files.
+* GPG Examples:: Some usage examples.
+
+Developer information:
+@c * Unattended Usage:: Using @command{gpg} from other programs.
+@c * GPG Protocol:: The protocol the server mode uses.
+@end menu
+
+
+
+@c *******************************************
+@c *************** ****************
+@c *************** COMMANDS ****************
+@c *************** ****************
+@c *******************************************
+@mansect commands
+@node GPG Commands
+@section Commands
+
+Commands are not distinguished from options execpt for the fact that
+only one command is allowed.
+
+@command{@gpgname} 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).
+
+Please remember that option as well as command parsing stops as soon as
+a non-option is encountered, you can explicitly stop parsing by
+using the special option @option{--}.
+
+
+@menu
+* General GPG Commands:: Commands not specific to the functionality.
+* Operational GPG Commands:: Commands to select the type of operation.
+* OpenPGP Key Management:: How to manage your keys.
+@end menu
+
+
+@c *******************************************
+@c ********** GENERAL COMMANDS *************
+@c *******************************************
+@node General GPG Commands
+@subsection Commands not specific to the function
+
+@table @gnupgtabopt
+@item --version
+@opindex version
+Print the program version and licensing information. Note that you
+cannot abbreviate this command.
+
+@item --help
+@itemx -h
+@opindex help
+Print a usage message summarizing the most useful command line options.
+Not that you cannot abbreviate this command.
+
+@item --warranty
+@opindex warranty
+Print warranty information.
+
+@item --dump-options
+@opindex dump-options
+Print a list of all available options and commands. Note that you cannot
+abbreviate this command.
+@end table
+
+
+@c *******************************************
+@c ******** OPERATIONAL COMMANDS ***********
+@c *******************************************
+@node Operational GPG Commands
+@subsection Commands to select the type of operation
+
+
+@table @gnupgtabopt
+
+@item --sign
+@itemx -s
+@opindex sign
+Make a signature. This command may be combined with @option{--encrypt}
+(for a signed and encrypted message), @option{--symmetric} (for a signed
+and symmetrically encrypted message), or @option{--encrypt} and
+@option{--symmetric} together (for a signed message that may be
+decrypted via a secret key or a passphrase).
+
+@item --clearsign
+@opindex clearsign
+Make a clear text signature. The content in a clear text signature is
+readable without any special software. OpenPGP software is only
+needed to verify the signature. Clear text signatures may modify
+end-of-line whitespace for platform independence and are not intended
+to be reversible.
+
+@item --detach-sign
+@itemx -b
+@opindex detach-sign
+Make a detached signature.
+
+@item --encrypt
+@itemx -e
+@opindex encrypt
+Encrypt data. This option may be combined with @option{--sign} (for a
+signed and encrypted message), @option{--symmetric} (for a message that
+may be decrypted via a secret key or a passphrase), or @option{--sign}
+and @option{--symmetric} together (for a signed message that may be
+decrypted via a secret key or a passphrase).
+
+@item --symmetric
+@itemx -c
+@opindex symmetric
+Encrypt with a symmetric cipher using a passphrase. The default
+symmetric cipher used is CAST5, but may be chosen with the
+@option{--cipher-algo} option. This option may be combined with
+@option{--sign} (for a signed and symmetrically encrypted message),
+@option{--encrypt} (for a message that may be decrypted via a secret key
+or a passphrase), or @option{--sign} and @option{--encrypt} together
+(for a signed message that may be decrypted via a secret key or a
+passphrase).
+
+@item --store
+@opindex store
+Store only (make a simple RFC1991 literal data packet).
+
+@item --decrypt
+@itemx -d
+@opindex decrypt
+Decrypt the file given on the command line (or @code{stdin} if no file
+is specified) and write it to stdout (or the file specified with
+@option{--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
+@opindex verify
+Assume that the first argument is a signed file or a detached signature
+and verify it without generating any output. With no arguments, the
+signature packet is read from stdin. If only a sigfile is given, it may
+be a complete signature or a detached signature, in which case the
+signed stuff is expected in a file without the ".sig" or ".asc"
+extension. With more than 1 argument, the first should be a detached
+signature and the remaining files are the signed stuff. To read the
+signed 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 --multifile
+@opindex 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. @option{--multifile} may currently be used along with
+@option{--verify}, @option{--encrypt}, and @option{--decrypt}. Note that
+@option{--multifile --verify} may not be used with detached signatures.
+
+@item --verify-files
+@opindex verify-files
+Identical to @option{--multifile --verify}.
+
+@item --encrypt-files
+@opindex encrypt-files
+Identical to @option{--multifile --encrypt}.
+
+@item --decrypt-files
+@opindex decrypt-files
+Identical to @option{--multifile --decrypt}.
+
+@item --list-keys
+@itemx -k
+@itemx --list-public-keys
+@opindex list-keys
+List all keys from the public keyrings, or just the keys given on the
+command line.
+@ifset gpgone
+@option{-k} is slightly different from @option{--list-keys} in that it
+allows only for one argument and takes the second argument as the
+keyring to search. This is for command line compatibility with PGP 2
+and has been removed in @command{gpg2}.
+@end ifset
+
+Avoid using the output of this command in scripts or other programs as
+it is likely to change as GnuPG changes. See @option{--with-colons} for a
+machine-parseable key listing command that is appropriate for use in
+scripts and other programs.
+
+@item --list-secret-keys
+@itemx -K
+@opindex list-secret-keys
+List all keys from the secret keyrings, or just the ones given on the
+command line. A @code{#} after the letters @code{sec} means that the
+secret key is not usable (for example, if it was created via
+@option{--export-secret-subkeys}).
+
+@item --list-sigs
+@opindex list-sigs
+Same as @option{--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 @option{--ask-cert-level}), "L" for a local or
+non-exportable signature (see @option{--lsign-key}), "R" for a
+nonRevocable signature (see the @option{--edit-key} command "nrsign"),
+"P" for a signature that contains a policy URL (see
+@option{--cert-policy-url}), "N" for a signature that contains a
+notation (see @option{--cert-notation}), "X" for an eXpired signature
+(see @option{--ask-cert-expire}), and the numbers 1-9 or "T" for 10 and
+above to indicate trust signature levels (see the @option{--edit-key}
+command "tsign").
+
+@item --check-sigs
+@opindex check-sigs
+Same as @option{--list-sigs}, but the signatures are verified.
+
+@item --fingerprint
+@opindex fingerprint
+List all keys (or the specified ones) along with their
+fingerprints. This is the same output as @option{--list-keys} but with
+the additional output of a line with the fingerprint. May also be
+combined with @option{--list-sigs} or @option{--check-sigs}. If this
+command is given twice, the fingerprints of all secondary keys are
+listed too.
+
+@item --list-packets
+@opindex list-packets
+List only the sequence of packets. This is mainly
+useful for debugging.
+
+
+@item --card-edit
+@opindex card-edit
+Present a menu to work with a smartcard. The subcommand "help" provides
+an overview on available commands. For a detailed description, please
+see the Card HOWTO at
+http://www.gnupg.org/documentation/howtos.html#GnuPG-cardHOWTO .
+
+@item --card-status
+@opindex card-status
+Show the content of the smart card.
+
+@item --change-pin
+@opindex change-pin
+Present a menu to allow changing the PIN of a smartcard. This
+functionality is also available as the subcommand "passwd" with the
+@option{--card-edit} command.
+
+@item --delete-key @code{name}
+@opindex delete-key
+Remove key from the public keyring. In batch mode either @option{--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}
+@opindex delete-secret-key
+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}
+@opindex delete-secret-and-public-key
+Same as @option{--delete-key}, but if a secret key exists, it will be
+removed first. In batch mode the key must be specified by fingerprint.
+
+@item --export
+@opindex export
+Either export all keys from all keyrings (default keyrings and those
+registered via option @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 @option{--output}. Use together with
+@option{--armor} to mail those keys.
+
+@item --send-keys @code{key IDs}
+@opindex send-keys
+Similar to @option{--export} but sends the keys to a keyserver.
+Fingerprints may be used instead of key IDs. Option @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-secret-keys
+@itemx --export-secret-subkeys
+@opindex export-secret-keys
+@opindex export-secret-subkeys
+Same as @option{--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 @option{--simple-sk-checksum} if you want to import such
+an exported key with an older OpenPGP implementation.
+
+@item --import
+@itemx --fast-import
+@opindex 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 @option{--keyserver-options 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}
+@opindex recv-keys
+Import the keys with the given key IDs from a keyserver. Option
+@option{--keyserver} must be used to give the name of this keyserver.
+
+@item --refresh-keys
+@opindex 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. Calling this with no arguments will refresh
+the entire keyring. Option @option{--keyserver} must be used to give the
+name of the keyserver for all keys that do not have preferred keyservers
+set (see @option{--keyserver-options honor-keyserver-url}).
+
+@item --search-keys @code{names}
+@opindex 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 @option{--keyserver} must be used to give the name of this
+keyserver. Keyservers that support different search methods allow using
+the syntax specified in "How to specify a user ID" below. Note that
+different keyserver types support different search methods. Currently
+only LDAP supports them all.
+
+@item --fetch-keys @code{URIs}
+@opindex fetch-keys
+Retrieve keys located at the specified URIs. Note that different
+installations of GnuPG may support different protocols (HTTP, FTP,
+LDAP, etc.)
+
+@item --update-trustdb
+@opindex 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
+@option{--edit-key} menu, the assigned value can be changed at any time.
+
+@item --check-trustdb
+@opindex 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 @option{--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 @option{--update-trustdb} but it
+skips keys with a not yet defined "ownertrust".
+
+For use with cron jobs, this command can be used together with
+@option{--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
+@option{--yes}.
+
+@item --export-ownertrust
+@opindex 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
+@opindex 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
+@opindex 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}
+@itemx --print-mds
+@opindex print-md
+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}
+@opindex gen-random
+Emit @var{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}
+@opindex gen-prime
+Use the source, Luke :-). The output format is still subject to change.
+
+
+@item --enarmor
+@item --dearmor
+@opindex enarmor
+@opindex --enarmor
+Pack or unpack an arbitrary input into/from an OpenPGP ASCII armor.
+This is a GnuPG extension to OpenPGP and in general not very useful.
+
+@end table
+
+
+@c *******************************************
+@c ******* KEY MANGEMENT COMMANDS **********
+@c *******************************************
+@node OpenPGP Key Management
+@subsection How to manage your keys
+
+This section explains the main commands for key management
+
+@table @gnupgtabopt
+
+@item --gen-key
+@opindex gen-key
+Generate a new key pair. This command is normally only used
+interactively.
+
+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 --gen-revoke @code{name}
+@opindex gen-revoke
+Generate a revocation certificate for the complete key. To revoke
+a subkey or a signature, use the @option{--edit} command.
+
+@item --desig-revoke @code{name}
+@opindex desig-revoke
+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 --edit-key
+@opindex edit-key
+Present a menu which enables you to do most of the key management
+related tasks. It expects the specification of a key on the command
+line.
+
+@c ******** Begin Edit-key Options **********
+@table @asis
+
+@item sign
+@opindex keyedit:sign
+Make a signature on key of user @code{name} If the key is not yet
+signed by the default user (or the users given with -u), the program
+displays the information of the key again, together with its
+fingerprint and asks whether it should be signed. This question is
+repeated for all users specified with
+-u.
+
+@item lsign
+@opindex keyedit:lsign
+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
+@opindex keyedit:nrsign
+Same as "sign" but the signature is marked as non-revocable and can
+therefore never be revoked.
+
+@item tsign
+@opindex keyedit:tsign
+Make a trust signature. This is a signature that combines the notions
+of certification (like a regular signature), and trust (like the
+"trust" command). It is generally only useful in distinct communities
+or groups.
+@end table
+
+@c man:.RS
+Note that "l" (for local / non-exportable), "nr" (for non-revocable,
+and "t" (for trust) may be freely mixed and prefixed to "sign" to
+create a signature of any type desired.
+@c man:.RE
+
+@table @asis
+
+@item revsig
+@opindex keyedit:revsig
+Revoke a signature. For every signature which has been generated by
+one of the secret keys, GnuPG asks whether a revocation certificate
+should be generated.
+
+@item trust
+@opindex keyedit:trust
+Change the owner trust value. This updates the
+trust-db immediately and no save is required.
+
+@item disable
+@itemx enable
+@opindex keyedit:disable
+@opindex keyedit:enable
+Disable or enable an entire key. A disabled key can not normally be
+used for encryption.
+
+@item adduid
+@opindex keyedit:adduid
+Create an alternate user id.
+
+@item addphoto
+@opindex keyedit:addphoto
+Create a photographic user id. This will prompt for a JPEG file that
+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
+@opindex keyedit:deluid
+Delete a user id. Note that it is not possible to retract a user id,
+once it has been send to the public (i.e. to a keyserver). In that case
+you better use @code{revuid}.
+
+@item delsig
+@opindex keyedit:delsig
+Delete a signature. Note that it is not possible to retract a signature,
+once it has been send to the public (i.e. to a keyserver). In that case
+you better use @code{revsig}.
+
+@item revuid
+@opindex keyedit:revuid
+Revoke a user id.
+
+@item addkey
+@opindex keyedit:addkey
+Add a subkey to this key.
+
+@item addcardkey
+@opindex keyedit:addcardkey
+Generate a key on a card and add it to this key.
+
+@item keytocard
+@opindex keyedit: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 bkuptocard @code{file}
+@opindex keyedit:bkuptocard
+Restore the given file to a card. This command may be used to restore a
+backup key (as generated during card initialization) to a new card. In
+almost all cases this will be the encryption key. You should use this
+command only with the corresponding public key and make sure that the
+file given as argument is indeed the backup to restore. You should then
+select 2 to restore as encryption key. You will first be asked to enter
+the passphrase of the backup key and then for the Admin PIN of the card.
+
+@item delkey
+@opindex keyedit:delkey
+Remove a subkey (secondart key). Note that it is not possible to retract
+a subkey, once it has been send to the public (i.e. to a keyserver). In
+that case you better use @code{revkey}.
+
+@item addrevoker
+@opindex keyedit: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 export-options).
+
+@item revkey
+@opindex keyedit:revkey
+Revoke a subkey.
+
+@item expire
+@opindex keyedit:expire
+Change the key expiration time. If a subkey is selected, the
+expiration time of this subkey will be changed. With no selection,
+the key expiration of the primary key is changed.
+
+@item passwd
+@opindex keyedit:passwd
+Change the passphrase of the secret key.
+
+@item primary
+@opindex keyedit:primary
+Flag the current user id as the primary one, removes the primary user
+id flag from all other user ids and sets the timestamp of all affected
+self-signatures one second ahead. Note that setting a photo user ID
+as primary makes it primary over other photo user IDs, and setting a
+regular user ID as primary makes it primary over other regular user
+IDs.
+
+@item uid @code{n}
+@opindex keyedit:uid
+Toggle selection of user id with index @code{n}.
+Use 0 to deselect all.
+
+@item key @code{n}
+@opindex keyedit:key
+Toggle selection of subkey with index @code{n}.
+Use 0 to deselect all.
+
+@item check
+@opindex keyedit:check
+Check all selected user ids.
+
+@item showphoto
+@opindex keyedit:showphoto
+Display the selected photographic user
+id.
+
+@item pref
+@opindex keyedit:pref
+List preferences from the selected user ID. This shows the actual
+preferences, without including any implied preferences.
+
+@item showpref
+@opindex keyedit:showpref
+More verbose preferences listing for the selected user ID. This shows
+the preferences in effect by including the implied preferences of 3DES
+(cipher), SHA-1 (digest), and Uncompressed (compression) if they are
+not already included in the preference list. In addition, the
+preferred keyserver and signature notations (if any) are shown.
+
+@item setpref @code{string}
+@opindex keyedit:setpref
+Set the list of user ID preferences to @code{string} for all (or just
+the selected) user IDs. Calling setpref with no arguments sets the
+preference list to the default (either built-in or set via
+@option{--default-preference-list}), and calling setpref with "none" as
+the argument sets an empty preference list. Use @command{@gpgname
+--version} to get a list of available algorithms. Note that while you
+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
+@opindex keyedit: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
+@option{--keyserver-options honor-keyserver-url} for more on how this
+works. Setting a value of "none" removes an existing preferred
+keyserver.
+
+@item notation
+@opindex keyedit:notation
+Set a name=value notation for the specified user ID(s). See
+@option{--cert-notation} for more on how this works. Setting a value of
+"none" removes all notations, setting a notation prefixed with a minus
+sign (-) removes that notation, and setting a notation name (without the
+=value) prefixed with a minus sign removes all notations with that name.
+
+@item toggle
+@opindex keyedit:toggle
+Toggle between public and secret key listing.
+
+@item clean
+@opindex keyedit:clean
+Compact (by removing all signatures except the selfsig) any user ID
+that is no longer usable (e.g. revoked, or expired). Then, remove any
+signatures that are not usable by the trust calculations.
+Specifically, this removes any signature that does not validate, any
+signature that is superseded by a later signature, revoked signatures,
+and signatures issued by keys that are not present on the keyring.
+
+@item minimize
+@opindex keyedit:minimize
+Make the key as small as possible. This removes all signatures from
+each user ID except for the most recent self-signature.
+
+@item cross-certify
+@opindex keyedit:cross-certify
+Add cross-certification signatures to signing subkeys that may not
+currently have them. Cross-certification signatures protect against a
+subtle attack against signing subkeys. See
+@option{--require-cross-certification}.
+
+@item save
+@opindex keyedit:save
+Save all changes to the key rings and quit.
+
+@item quit
+@opindex keyedit:quit
+Quit the program without updating the
+key rings.
+
+@end table
+
+@c man:.RS
+The listing shows you the key with its secondary keys and all user
+ids. Selected keys or user ids are indicated by an asterisk. The trust
+value is displayed with the primary key: the first is the assigned owner
+trust and the second is the calculated trust value. Letters are used for
+the values:
+@c man:.RE
+
+@table @asis
+
+@item -
+No ownertrust assigned / not yet calculated.
+
+@item e
+Trust
+calculation has failed; probably due to an expired key.
+
+@item q
+Not enough information for calculation.
+
+@item n
+Never trust this key.
+
+@item m
+Marginally trusted.
+
+@item f
+Fully trusted.
+
+@item u
+Ultimately trusted.
+@end table
+@c ******** End Edit-key Options **********
+
+@item --sign-key @code{name}
+@opindex sign-key
+Signs a public key with your secret key. This is a shortcut version of
+the subcommand "sign" from @option{--edit}.
+
+@item --lsign-key @code{name}
+@opindex lsign-key
+Signs a public key with your secret key but marks it as
+non-exportable. This is a shortcut version of the subcommand "lsign"
+from @option{--edit-key}.
+
+
+@end table
+
+
+@c *******************************************
+@c *************** ****************
+@c *************** OPTIONS ****************
+@c *************** ****************
+@c *******************************************
+@mansect options
+@node GPG Options
+@section Option Summary
+
+@command{@gpgname} comes features a bunch of options to control the exact
+behaviour and to change the default configuration.
+
+@menu
+* GPG Configuration Options:: How to change the configuration.
+* GPG Key related Options:: Key related options.
+* GPG Input and Output:: Input and Output.
+* OpenPGP Options:: OpenPGP protocol specific options.
+* GPG Esoteric Options:: Doing things one usually don't want to do.
+@end menu
+
+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 not
+write the 2 dashes, but simply the name of the option and any required
+arguments. Lines with a hash ('#') as the first non-white-space
+character are ignored. Commands may be put in this file too, but that is
+not generally useful as the command will execute automatically with
+every execution of gpg.
+
+Please remember that option parsing stops as soon as a non-option is
+encountered, you can explicitly stop parsing by using the special option
+@option{--}.
+
+@c *******************************************
+@c ******** CONFIGURATION OPTIONS **********
+@c *******************************************
+@node GPG Configuration Options
+@subsection How to change the configuration
+
+These options are used to change the configuraton and are usually found
+in the option file.
+
+@table @gnupgtabopt
+
+@item --default-key @var{name}
+@opindex default-key
+Use @var{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 @option{-u} or @option{--local-user} overrides this option.
+
+@item --default-recipient @var{name}
+@opindex default-recipient
+Use @var{name} as default recipient if option @option{--recipient} is
+not used and don't ask if this is a valid one. @var{name} must be
+non-empty.
+
+@item --default-recipient-self
+@opindex default-recipient-self
+Use the default key as default recipient if option @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 @option{--default-key}.
+
+@item --no-default-recipient
+@opindex no-default-recipient
+Reset @option{--default-recipient} and @option{--default-recipient-self}.
+
+@item -v, --verbose
+@opindex verbose
+Give more information during processing. If used
+twice, the input data is listed in detail.
+
+@item --no-verbose
+@opindex no-verbose
+Reset verbose level to 0.
+
+@item -q, --quiet
+@opindex quiet
+Try to be as quiet as possible.
+
+@item --list-options @code{parameters}
+@opindex list-options
+This is a space or comma delimited string that gives options used when
+listing keys and signatures (that is, @option{--list-keys},
+@option{--list-sigs}, @option{--list-public-keys},
+@option{--list-secret-keys}, and the @option{--edit-key} functions).
+Options can be prepended with a @option{no-} (after the two dashes) to
+give the opposite meaning. The options are:
+
+@table @asis
+
+@item show-photos
+@opindex list-options:show-photos
+Causes @option{--list-keys}, @option{--list-sigs},
+@option{--list-public-keys}, and @option{--list-secret-keys} to display
+any photo IDs attached to the key. Defaults to no. See also
+@option{--photo-viewer}.
+
+@item show-policy-urls
+@opindex list-options:show-policy-urls
+Show policy URLs in the @option{--list-sigs} or @option{--check-sigs}
+listings. Defaults to no.
+
+@item show-notations
+@itemx show-std-notations
+@itemx show-user-notations
+@opindex list-options:show-notations
+@opindex list-options:show-std-notations
+@opindex list-options:show-user-notations
+Show all, IETF standard, or user-defined signature notations in the
+@option{--list-sigs} or @option{--check-sigs} listings. Defaults to no.
+
+@item show-keyserver-urls
+
+Show any preferred keyserver URL in the @option{--list-sigs} or
+@option{--check-sigs} listings. 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 @option{--list-sigs} or
+@option{--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 @option{--with-colons} along with
+@option{--list-sigs} or @option{--check-sigs}.
+@end table
+
+@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 @option{--photo-viewer}.
+
+@item show-policy-urls
+Show policy URLs 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-urls
+Show any preferred keyserver URL in the signature being verified.
+Defaults to no.
+
+@item show-uid-validity
+Display the calculated validity of the user IDs on the key that issued
+the signature. Defaults to no.
+
+@item show-unusable-uids
+Show revoked and expired user IDs during signature verification.
+Defaults to no.
+
+@item pka-lookups
+Enable PKA lookups to verify sender addresses. Note that PKA is based
+on DNS, and so enabling this option may disclose information on when
+and what signatures are verified or to whom data is encrypted. This
+is similar to the "web bug" described for the auto-key-retrieve
+feature.
+
+@item pka-trust-increase
+Raise the trust in a signature to full if the signature passes PKA
+validation. This option is only meaningful if pka-lookups is set.
+@end table
+
+@item --enable-dsa2
+@itemx --disable-dsa2
+Enables new-style DSA keys which (unlike the old style) may be larger
+than 1024 bit and use hashes other than SHA-1 and RIPEMD/160. Note
+that very few programs currently support these keys and signatures
+from them.
+
+@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.
+Other flags are "%k" for the key ID, "%K" for the long key ID, "%f"
+for the key fingerprint, "%t" for the extension of the image type
+(e.g. "jpg"), "%T" for the MIME type of the image (e.g. "image/jpeg"),
+and "%%" for an actual percent sign. If neither %i or %I are present,
+then the photo will be supplied to the viewer on standard input.
+
+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}
+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.
+Note, that on W32 system this value is ignored when searching for
+keyserver helpers.
+
+@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 @option{--homedir} or $GNUPGHOME is not
+used).
+
+Note that this adds a keyring to the current list. If the intent is to
+use the specified keyring alone, use @option{--keyring} along with
+@option{--no-default-keyring}.
+
+@item --secret-keyring @code{file}
+Same as @option{--keyring} but for the secret keyrings.
+
+@item --primary-keyring @code{file}
+Designate @code{file} as the primary public keyring. This means that
+newly imported keys (via @option{--import} or keyserver
+@option{--recv-from}) will go to this keyring.
+
+@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 (@file{~/.gnupg} if @option{--homedir} or $GNUPGHOME is
+not used).
+
+@ifset gpgone
+@anchor{option --homedir}
+@end ifset
+@include opt-homedir.texi
+
+
+@item --pcsc-driver @code{file}
+Use @code{file} to access the smartcard reader. The current default is
+`libpcsclite.so.1' for GLIBC based systems,
+`/System/Library/Frameworks/PCSC.framework/PCSC' for MAC OS X,
+`winscard.dll' for Windows and `libpcsclite.so' for other systems.
+
+@item --disable-ccid
+Disable the integrated support for CCID compliant readers. This
+allows to fall back to one of the other drivers even if the internal
+CCID driver can handle the reader. Note, that CCID support is only
+available if libusb was available at build time.
+
+@item --reader-port @code{number_or_string}
+This option may be used to specify the port of the card terminal. A
+value of 0 refers to the first serial device; add 32768 to access USB
+devices. The default is 32768 (first USB device). PC/SC or CCID
+readers might need a string here; run the program in verbose mode to get
+a list of available readers. The default is then the first reader
+found.
+
+@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.
+Note that this has nothing to do with the character set of data to be
+encrypted or signed; GnuPG does not recode user supplied data. 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.
+
+@item iso-8859-2
+The Latin 2 set.
+
+@item iso-8859-15
+This is currently an alias for
+the Latin 1 set.
+
+@item koi8-r
+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 command line arguments are given as UTF8 strings. The
+default (@option{--no-utf8-strings}) is to assume that arguments are
+encoded in the character set as specified by
+@option{--display-charset}. These options affect all following
+arguments. Both options may be used multiple times.
+
+@ifset gpgone
+@anchor{option --options}
+@end ifset
+@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 @option{--homedir}). This
+option is ignored if used in an options file.
+
+@item --no-options
+Shortcut for @option{--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 @file{~/.gnupg} homedir.
+
+
+
+@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). @option{--bzip2-compress-level} sets the compression level
+for the BZIP2 compression algorithm (defaulting to 6 as well). This is a
+different option from @option{--compress-level} since BZIP2 uses a
+significant amount of memory for each additional compression level.
+@option{-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
+@option{--bzip2-compress-level}.
+
+
+@item --mangle-dos-filenames
+@itemx --no-mangle-dos-filenames
+@opindex mangle-dos-filenames
+@opindex no-mangle-dos-filenames
+Older version of Windows cannot handle filenames with more than one
+dot. @option{--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 --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
+@option{--default-cert-level}. See @option{--default-cert-level} for
+information on the specific levels and how they are
+used. @option{--no-ask-cert-level} disables this option. This option
+defaults to no.
+
+@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
+the key.
+
+1 means you believe the key is owned by the person who claims to own
+it but you could not, or did not verify the key at all. This is
+useful for a "persona" verification, where you sign the key of a
+pseudonymous user.
+
+2 means you did casual verification of the key. For example, this
+could mean that you verified that the key fingerprint and checked the
+user ID on the key against a photo ID.
+
+3 means you did extensive verification of the key. For example, this
+could mean that you verified the key fingerprint with the owner of the
+key in person, and that you checked, by means of a hard to forge
+document with a photo ID (such as a passport) that the name of the key
+owner matches the name in the user ID on the key, and finally that you
+verified (by exchange of email) that the email address on the key
+belongs to the key owner.
+
+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 (no particular claim).
+
+@item --min-cert-level
+When building the trust database, treat any signatures with a
+certification level below this as invalid. Defaults to 2, which
+disregards level 1 signatures. Note that level 0 "no particular
+claim" signatures are always accepted.
+
+@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
+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|direct|always|auto}
+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 when creating a new
+trust database.
+
+@item classic
+This is the standard Web of Trust as used in PGP 2.x and earlier.
+
+@item direct
+Key validity is set directly by the user and not calculated via the
+Web of Trust.
+
+@item always
+Skip key validation and assume that used keys are always fully
+trusted. You generally won't use this unless you are using 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.
+
+@item auto
+Select the trust model depending on whatever the internal trust
+database says. This is the default model if such a database already
+exists.
+@end table
+
+@item --auto-key-locate @code{parameters}
+@itemx --no-auto-key-locate
+GnuPG can automatically locate and retrieve keys as needed using this
+option. This happens when encrypting to an email address (in the
+"user@@example.com" form), and there are no user@@example.com keys on
+the local keyring. This option takes any number of the following
+arguments, in the order they are to be tried:
+
+@table @asis
+
+@item cert
+locate a key using DNS CERT, as specified in 2538bis (currently in
+draft): http://www.josefsson.org/rfc2538bis/
+
+@item pka
+locate a key using DNS PKA.
+
+@item ldap
+locate a key using the PGP Universal method of checking
+"ldap://keys.(thedomain)".
+
+@item keyserver
+locate a key using whatever keyserver is defined using the
+@option{--keyserver} option.
+
+@item (keyserver URL)
+In addition, a keyserver URL as used in the @option{--keyserver} option may be
+used here to query that particular keyserver.
+@end table
+
+@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
+@option{--recv-keys}, @option{--send-keys}, and @option{--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 LDAP
+keyservers, or "mailto" for the Graff email keyserver. Note that your
+particular installation of GnuPG may have other keyserver types
+available as well. Keyserver schemes are case-insensitive. After the
+keyserver name, optional keyserver configuration options may be
+provided. These are the same as the global @option{--keyserver-options}
+from below, but apply only to this particular keyserver.
+
+Most keyservers synchronize with each other, so there is generally no
+need to send keys to more than one server. The keyserver
+@code{hkp://subkeys.pgp.net} uses round robin DNS to give a different
+keyserver each time you use it.
+
+@item --keyserver-options @code{name=value1 }
+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 (@option{--recv-key}) or exporting
+(@option{--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 @option{--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.
+
+@item include-disabled
+When searching for a key with @option{--search-keys}, include keys that
+are marked on the keyserver as disabled. Note that this option is not
+used with HKP keyservers.
+
+@item auto-key-retrieve
+This option enables the automatic retrieving of keys from a keyserver
+when verifying signatures made by keys that are not on the local
+keyring.
+
+Note that this option makes a "web bug" like behavior possible.
+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.
+
+@item honor-keyserver-url
+When using @option{--refresh-keys}, if the key in question has a preferred
+keyserver URL, then use that preferred keyserver to refresh the key
+from. In addition, if auto-key-retrieve is set, and the signature
+being verified has a preferred keyserver URL, then use that preferred
+keyserver to fetch the key from. Defaults to yes.
+
+@item honor-pka-record
+If auto-key-retrieve is set, and the signature being verified has a
+PKA record, then use the PKA information to fetch the key. 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
+retrieving keys by subkey id.
+
+@item use-temp-files
+On most Unix-like platforms, GnuPG communicates with the keyserver
+helper program via pipes, which is the most efficient method. This
+option forces GnuPG to use temporary files to communicate. On some
+platforms (such as Win32 and RISC OS), this option is always enabled.
+
+@item keep-temp-files
+If using `use-temp-files', do not delete the temp files after using
+them. This option is useful to learn the keyserver communication
+protocol by reading the temporary files.
+
+@item verbose
+Tell the keyserver helper program to be more verbose. This option can
+be repeated multiple times to increase the verbosity level.
+
+@item timeout
+Tell the keyserver helper program how long (in seconds) to try and
+perform a keyserver action before giving up. Note that performing
+multiple actions at the same time uses this timeout value per action.
+For example, when retrieving multiple keys via @option{--recv-keys}, the
+timeout applies separately to each key retrieval, and not to the
+@option{--recv-keys} command as a whole. Defaults to 30 seconds.
+
+@item http-proxy
+For HTTP-like keyserver schemes that (such as HKP and HTTP itself),
+try to access the keyserver over a proxy. If a @code{value} is
+specified, use this as the HTTP proxy. If no @code{value} is
+specified, the value of the environment variable "http_proxy", if any,
+will be used.
+
+@item max-cert-size
+When retrieving a key via DNS CERT, only accept keys up to this size.
+Defaults to 16384 bytes.
+@end table
+
+@item --completes-needed @code{n}
+Number of completely trusted users to introduce a new
+key signer (defaults to 1).
+
+@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}
+Maximum depth of a certification chain (default is 5).
+
+@item --simple-sk-checksum
+Secret keys are integrity protected by using a SHA-1 checksum. This
+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 --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
+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
+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%
+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
+If GnuPG feels that its information about the Web of Trust has to be
+updated, it automatically runs the @option{--check-trustdb} command
+internally. This may be a time consuming
+process. @option{--no-auto-check-trustdb} disables this option.
+
+@item --use-agent
+@itemx --no-use-agent
+@ifclear gpgone
+This is dummy option. @command{@gpgname} always requires the agent.
+@end ifclear
+@ifset gpgone
+Try to use the GnuPG-Agent. With this option, GnuPG first tries to
+connect to the agent before it asks for a
+passphrase. @option{--no-use-agent} disables this option.
+@end ifset
+
+@item --gpg-agent-info
+Override the value of the environment variable
+@samp{GPG_AGENT_INFO}. This is only used when @option{--use-agent} has
+been given
+
+@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
+Release the locks every time a lock is no longer
+needed. Use this to override a previous @option{--lock-once}
+from a config file.
+
+@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 --exit-on-status-write-error
+This option will cause write errors on the status FD to immediately
+terminate the process. That should in fact be the default but it never
+worked this way and thus we need an option to enable this, so that the
+change won't break applications which close their end of a status fd
+connected pipe too early. Using this option along with
+@option{--enable-progress-filter} may be used to cleanly cancel long
+running gpg operations.
+
+@item --limit-card-insert-tries @code{n}
+With @code{n} greater than 0 the number of prompts asking to insert a
+smartcard gets limited to N-1. Thus with a value of 1 gpg won't at
+all ask to insert a card if none has been inserted at startup. This
+option is useful in the configuration file in case an application does
+not know about the smartcard support and waits ad infinitum for an
+inserted card.
+
+@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-greeting
+Suppress the initial copyright message.
+
+@item --no-secmem-warning
+Suppress the warning about "using insecure memory".
+
+@item --no-permission-warning
+Suppress the warning about unsafe file and home directory (@option{--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 @option{--homedir} permissions cannot be
+suppressed 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 suppress
+warnings about itself. The @option{--homedir} permissions warning may only be
+suppressed on the command line.
+
+@item --no-mdc-warning
+Suppress the warning about missing MDC integrity protection.
+
+@item --require-secmem
+@itemx --no-require-secmem
+Refuse to run if GnuPG cannot get secure memory. Defaults to no
+(i.e. run, but give a warning).
+
+
+@item --require-cross-certification
+@itemx --no-require-cross-certification
+When verifying a signature made from a subkey, ensure that the cross
+certification "back signature" on the subkey is present and valid. This
+protects against a subtle attack against subkeys that can sign.
+Defaults to @option{--require-cross-certification} for
+@command{@gpgname}.
+
+@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 unusual 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. @option{--no-expert} disables this option.
+
+
+
+
+@end table
+
+
+@c *******************************************
+@c ******** KEY RELATED OPTIONS ************
+@c *******************************************
+@node GPG Key related Options
+@subsection Key related options
+
+@table @gnupgtabopt
+
+@item --recipient @var{name}
+@itemx -r
+@opindex recipient
+Encrypt for user id @var{name}. If this option or
+@option{--hidden-recipient} is not specified, GnuPG asks for the user-id
+unless @option{--default-recipient} is given.
+
+@item --hidden-recipient @var{name}
+@itemx -R
+@opindex hidden-recipient
+Encrypt for user ID @var{name}, but hide the key ID of this user's
+key. This option helps to hide the receiver of the message and is a
+limited countermeasure against traffic analysis. If this option or
+@option{--recipient} is not specified, GnuPG asks for the user ID unless
+@option{--default-recipient} is given.
+
+@item --encrypt-to @code{name}
+Same as @option{--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 @option{--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 @option{--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 @option{--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 @option{--encrypt-to} and
+@option{--hidden-encrypt-to} keys.
+
+@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 (@option{-r} or
+@option{--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
+two different values. Note also there is only one level of expansion
+--- you cannot make an group that points to another group. When used
+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 --ungroup @code{name}
+Remove a given entry from the @option{--group} list.
+
+@item --no-groups
+Remove all entries from the @option{--group} list.
+
+@item --local-user @var{name}
+@itemx -u
+@opindex local-user
+Use @var{name} as the key to sign with. Note that this option overrides
+@option{--default-key}.
+
+@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
+@option{--throw-keyids}) and might come handy in case where an encrypted
+message contains a bogus key ID.
+
+
+
+
+
+@end table
+
+@c *******************************************
+@c ******** INPUT AND OUTPUT ***************
+@c *******************************************
+@node GPG Input and Output
+@subsection Input and Output
+
+@table @gnupgtabopt
+
+@item --armor
+@itemx -a
+@opindex armor
+Create ASCII armored output. The default is to create the binary
+OpenPGP format.
+
+@item --no-armor
+Assume the input data is not in ASCII armored format.
+
+@item --output @var{file}
+@itemx -o @var{file}
+@opindex output
+Write output to @var{file}.
+
+@item --max-output @code{n}
+@opindex max-output
+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 --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 import-local-sigs
+Allow importing key signatures marked as "local". This is not
+generally useful unless a shared keyring scheme is being used.
+Defaults to no.
+
+@item repair-pks-subkey-bug
+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 @option{--import} and to yes for
+keyserver @option{--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.
+
+@item import-clean
+After import, compact (remove all signatures except the
+self-signature) any user IDs from the new key that are not usable.
+Then, remove any signatures from the new key that are not usable.
+This includes signatures that were issued by keys that are not present
+on the keyring. This option is the same as running the @option{--edit-key}
+command "clean" after import. Defaults to no.
+
+@item import-minimal
+Import the smallest key possible. This removes all signatures except
+the most recent self-signature on each user ID. This option is the
+same as running the @option{--edit-key} command "minimize" after import.
+Defaults to no.
+@end table
+
+@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 export-local-sigs
+Allow exporting key signatures marked as "local". This is not
+generally useful unless a shared keyring scheme is being used.
+Defaults to no.
+
+@item export-attributes
+Include attribute user IDs (photo IDs) while exporting. This is
+useful to export keys if they are going to be used by an OpenPGP
+program that does not accept attribute user IDs. Defaults to yes.
+
+@item export-sensitive-revkeys
+Include designated revoker information that was marked as
+"sensitive". Defaults to no.
+
+@item export-reset-subkey-passwd
+When using the @option{--export-secret-subkeys} command, this option resets
+the passphrases for all exported subkeys to empty. This is useful
+when the exported subkey is to be used on an unattended machine where
+a passphrase doesn't necessarily make sense. Defaults to no.
+
+@item export-clean
+Compact (remove all signatures from) user IDs on the key being
+exported if the user IDs are not usable. Also, do not export any
+signatures that are not usable. This includes signatures that were
+issued by keys that are not present on the keyring. This option is
+the same as running the @option{--edit-key} command "clean" before export
+except that the local copy of the key is not modified. Defaults to
+no.
+
+@item export-minimal
+Export the smallest key possible. This removes all signatures except the
+most recent self-signature on each user ID. This option is the same as
+running the @option{--edit-key} command "minimize" before export except
+that the local copy of the key is not modified. Defaults to no.
+@end table
+
+@item --with-colons
+@opindex with-colons
+Print key listings delimited by colons. Note that the output will be
+encoded in UTF-8 regardless of any @option{--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 @file{doc/DETAILS}, which is included in the GnuPG
+source distribution.
+
+@item --fixed-list-mode
+@opindex fixed-list-mode
+Do not merge primary user ID and primary key in @option{--with-colon}
+listing mode and print all timestamps as seconds since 1970-01-01.
+
+@item --with-fingerprint
+@opindex with-fingerprint
+Same as the command @option{--fingerprint} but changes only the format
+of the output and may be used together with another command.
+
+
+@end table
+
+@c *******************************************
+@c ******** OPENPGP OPTIONS ****************
+@c *******************************************
+@node OpenPGP Options
+@subsection OpenPGP protocol specific options.
+
+@table @gnupgtabopt
+
+@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). @option{--no-textmode} disables this option, and
+is the default.
+
+@ifset gpgone
+If @option{-t} (but not @option{--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 @option{--sign} or @option{--clearsign} to select
+the type of the signature.
+@end ifset
+
+
+
+@item --force-v3-sigs
+@itemx --no-force-v3-sigs
+OpenPGP states that an implementation should generate v4 signatures
+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 @option{--ask-sig-expire}, as v3 signatures
+cannot have expiration dates. @option{--no-force-v3-sigs} disables this
+option.
+
+@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.
+@option{--no-force-v4-certs} disables this option.
+
+@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
+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 --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
+@option{--symmetric} encryption command.
+
+@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. @option{--clearsign} or
+@option{--sign}). The default value is SHA-1.
+
+@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. @option{--symmetric}).
+
+
+
+@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 @option{--personal-cipher-preferences} and
+@option{--cipher-algo} is not given.
+
+@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}
+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
+number of times (see --s2k-count). Unless @option{--rfc1991} is used,
+this mode is also used for conventional encryption.
+
+@item --s2k-count @code{n}
+Specify how many times the passphrase mangling is repeated. This
+value may range between 1024 and 65011712 inclusive, and the default
+is 65536. Note that not all values in the 1024-65011712 range are
+legal and if an illegal value is selected, GnuPG will round up to the
+nearest legal value. This option is only meaningful if
+@option{--s2k-mode} is 3.
+
+
+@end table
+
+@c ***************************
+@c ******* Compliance ********
+@c ***************************
+@subsection Compliance options
+
+These options control what GnuPG is compliant to. Only one of these
+options may be active at a time. Note that the default setting of
+this is nearly always the correct one. See the INTEROPERABILITY WITH
+OTHER OPENPGP PROGRAMS section below before using one of these
+options.
+
+@table @gnupgtabopt
+
+@item --gnupg
+@opindex gnupg
+Use standard GnuPG behavior. This is essentially OpenPGP behavior
+(see @option{--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
+@opindex openpgp
+Reset all packet, cipher and digest options to strict OpenPGP
+behavior. Use this option to reset all previous options like
+@option{--rfc1991}, @option{--force-v3-sigs}, @option{--s2k-*},
+@option{--cipher-algo}, @option{--digest-algo} and
+@option{--compress-algo} to OpenPGP compliant values. All PGP
+workarounds are disabled.
+
+@item --rfc2440
+@opindex rfc2440
+Reset all packet, cipher and digest options to strict RFC-2440
+behavior. Note that this is currently the same thing as @option{--openpgp}.
+
+@item --rfc1991
+@opindex rfc1991
+Try to be more RFC-1991 (PGP 2.x) compliant.
+
+@item --pgp2
+@opindex 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 @option{--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 @option{--textmode} when
+encrypting.
+
+@item --pgp6
+@opindex 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-keyids, and making signatures with signing subkeys as PGP 6
+does not understand signatures made by signing subkeys.
+
+This option implies @option{--disable-mdc --no-sk-comment
+--escape-from-lines --force-v3-sigs --no-ask-sig-expire}.
+
+@item --pgp7
+@opindex pgp7
+Set up all options to be as PGP 7 compliant as possible. This is
+identical to @option{--pgp6} except that MDCs are not disabled, and the
+list of allowable ciphers is expanded to add AES128, AES192, AES256, and
+TWOFISH.
+
+@item --pgp8
+@opindex 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 @option{--throw-keyids} and set
+@option{--escape-from-lines}. All algorithms are allowed except for the
+SHA224, SHA384, and SHA512 digests.
+
+@end table
+
+
+@c *******************************************
+@c ******** ESOTERIC OPTIONS ***************
+@c *******************************************
+@node GPG Esoteric Options
+@subsection Doing things one usually don't want to do.
+
+@table @gnupgtabopt
+
+@item -n
+@itemx --dry-run
+@opindex dry-run
+Don't make any changes (this is not completely implemented).
+
+@item --list-only
+Changes the behaviour of some commands. This is like @option{--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 -i
+@itemx --interactive
+@opindex interactive
+Prompt before overwriting any files.
+
+@item --debug @var{flags}
+@opindex debug
+Set debugging flags. All flags are or-ed and @var{flags} may
+be given in C syntax (e.g. 0x0042).
+
+@item --debug-all
+Set all useful debugging flags.
+
+@ifset gpgone
+@item --debug-ccid-driver
+Enable debug output from the included CCID driver for smartcards.
+Note that this option is only available on some system.
+@end ifset
+
+@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}
+Write special status strings to the file descriptor @code{n}.
+See the file DETAILS in the documentation for a listing of them.
+
+@item --status-file @code{file}
+Same as @option{--status-fd}, except the status data is written to file
+@code{file}.
+
+@item --logger-fd @code{n}
+Write log output to file descriptor @code{n} and not to stderr.
+
+@item --logger-file @code{file}
+Same as @option{--logger-fd}, except the logger data is written to file
+@code{file}.
+
+@item --attribute-fd @code{n}
+Write attribute subpackets to the file descriptor @code{n}. This is most
+useful for use with @option{--status-fd}, since the status messages are
+needed to separate out the various subpackets from the stream delivered
+to the file descriptor.
+
+@item --attribute-file @code{file}
+Same as @option{--attribute-fd}, except the attribute data is written to
+file @code{file}.
+
+@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 @option{--armor}). The default behavior is
+not to use a comment string. @option{--comment} may be repeated multiple
+times to get multiple comment strings. @option{--no-comments} removes
+all comments. It is a good idea to keep the length of a single comment
+below 60 characters to avoid problems with mail programs wrapping such
+lines. Note that comment lines, like all other header lines, are not
+protected by the signature.
+
+@item --emit-version
+@itemx --no-emit-version
+Force inclusion of the version string in ASCII armored output.
+@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}
+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 in the form keyname@@domain.example.com
+(substituting the appropriate keyname and domain name, of course). This
+is to help prevent pollution of the IETF reserved notation
+namespace. The @option{--expert} flag overrides the '@@'
+check. @code{value} may be any printable string; it will be encoded in
+UTF8, so you should check that your @option{--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). @option{--sig-notation} sets a notation for data
+signatures. @option{--cert-notation} sets a notation for key signatures
+(certifications). @option{--set-notation} sets both.
+
+There are special codes that may be used in notation names. "%k" will
+be expanded into the key ID of the key being signed, "%K" into the
+long key ID of the key being signed, "%f" into the fingerprint of the
+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, "%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 --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. @option{--sig-policy-url} sets a policy url for
+data signatures. @option{--cert-policy-url} sets a policy url for key
+signatures (certifications). @option{--set-policy-url} sets both.
+
+The same %-expandos used for notation data are available here as well.
+
+@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}
+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
+Set the `for your eyes only' flag in the message. This causes GnuPG
+to refuse to save the file unless the @option{--output} option is given, and
+PGP to use the "secure viewer" with a Tempest-resistant font to
+display the message. This option overrides @option{--set-filename}.
+@option{--no-for-your-eyes-only} disables this option.
+
+@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 --cipher-algo @code{name}
+Use @code{name} as cipher algorithm. Running the program with the
+command @option{--version} yields a list of supported algorithms. If
+this is not used the cipher algorithm is selected from the preferences
+stored with the key. In general, you do not want to use this option as
+it allows you to violate the OpenPGP standard.
+@option{--personal-cipher-preferences} is the safe way to accomplish the
+same thing.
+
+@item --digest-algo @code{name}
+Use @code{name} as the message digest algorithm. Running the program
+with the command @option{--version} yields a list of supported algorithms. In
+general, you do not want to use this option as it allows you to
+violate the OpenPGP standard. @option{--personal-digest-preferences} is the
+safe way to accomplish the same thing.
+
+@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.
+"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. In
+general, you do not want to use this option as it allows you to
+violate the OpenPGP standard. @option{--personal-compress-preferences} is the
+safe way to accomplish the same thing.
+
+@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 @option{--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 --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}
+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 --throw-keyids
+@itemx --no-throw-keyids
+Do not put the recipient key IDs into encrypted messages. This helps
+to hide the receivers of the message and is a limited countermeasure
+against traffic analysis. On the receiving side, it may slow down the
+decryption process because all available secret keys must be tried.
+@option{--no-throw-keyids} disables this option. This option is essentially
+the same as using @option{--hidden-recipient} for all recipients.
+
+@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
+and line endings are hashed too. You can not use this
+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
+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. @option{--no-escape-from-lines} disables this option.
+
+@item --passphrase-repeat @code{n}
+Specify how many times @command{@gpgname} will request a new
+passphrase be repeated. This is useful for helping memorize a
+passphrase. Defaults to 1 repetition.
+
+@item --passphrase-fd @code{n}
+Read the passphrase from file descriptor @code{n}. Only the first line
+will be read 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.
+@ifclear gpgone
+Note that this passphrase is only used if the option @option{--batch}
+has also been given. This is different from @command{gpg}.
+@end ifclear
+
+@item --passphrase-file @code{file}
+Read the passphrase from file @code{file}. Only the first line will
+be read from file @code{file}. This can only be used if only one
+passphrase is supplied. Obviously, a passphrase stored in a file is
+of questionable security if other users can read this file. Don't use
+this option if you can avoid it.
+@ifclear gpgone
+Note that this passphrase is only used if the option @option{--batch}
+has also been given. This is different from @command{gpg}.
+@end ifclear
+
+@item --passphrase @code{string}
+Use @code{string} as the passphrase. This can only be used if only one
+passphrase is supplied. Obviously, this is of very questionable
+security on a multi-user system. Don't use this option if you can
+avoid it.
+@ifclear gpgone
+Note that this passphrase is only used if the option @option{--batch}
+has also been given. This is different from @command{gpg}.
+@end ifclear
+
+@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 @option{--status-fd}. See the file doc/DETAILS in the source
+distribution for details on how to use it.
+
+@item --command-file @code{file}
+Same as @option{--command-fd}, except the commands are read out of file
+@code{file}
+
+@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. @option{--no-allow-non-selfsigned-uid} disables.
+
+@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
+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 @option{--ignore-valid-from} for
+timestamp issues on subkeys.
+
+@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 @option{--ignore-time-conflict} for timestamp
+issues with signatures.
+
+@item --ignore-crc-error
+The ASCII armor used by OpenPGP is protected by a CRC checksum against
+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
+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 --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 @option{--keyring} or
+@option{--secret-keyring}, then GnuPG will still use the default public or
+secret keyrings.
+
+@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-key-data
+Print key listings delimited by colons (like @option{--with-colons}) and
+print the public key data.
+
+@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. If you are missing some information, don't
+use this option.
+
+@item --no-literal
+This is not for normal use. Use the source to see for what it might be useful.
+
+@item --set-filesize
+This is not for normal use. Use the source to see for what it might be useful.
+
+@item --show-session-key
+Display the session key used for one message. See
+@option{--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.
+
+@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
+@option{--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
+When making a data signature, prompt for an expiration time. If this
+option is not specified, the expiration time set via
+@option{--default-sig-expire} is used. @option{--no-ask-sig-expire}
+disables this option. Note that by default, @option{--force-v3-sigs} is
+set which also disables this option. If you want signature expiration,
+you must set @option{--no-force-v3-sigs} as well as turning
+@option{--ask-sig-expire} on.
+
+@item --default-sig-expire
+The default expiration time to use for signature expiration. Valid
+values are "0" for no expiration, a number followed by the letter d
+(for days), w (for weeks), m (for months), or y (for years) (for
+example "2m" for two months, or "5y" for five years), or an absolute
+date in the form YYYY-MM-DD. Defaults to "0".
+
+@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 set via
+@option{--default-cert-expire} is used. @option{--no-ask-cert-expire}
+disables this option.
+
+@item --default-cert-expire
+The default expiration time to use for key signature expiration.
+Valid values are "0" for no expiration, a number followed by the
+letter d (for days), w (for weeks), m (for months), or y (for years)
+(for example "2m" for two months, or "5y" for five years), or an
+absolute date in the form YYYY-MM-DD. Defaults to "0".
+
+@item --allow-secret-key-import
+This is an obsolete option and is not used anywhere.
+
+@item --allow-multisig-verification
+Allow verification of concatenated signed messages. This will run a
+signature verification for each data+signature block. There are some
+security issues with this option and thus it is off by default. Note
+that versions of GPG prior to version 1.4.3 implicitly allowed this.
+
+@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
+Experimental use only.
+
+@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 --default-preference-list @code{string}
+@opindex default-preference-list
+Set the list of default preferences to @code{string}. This preference
+list is used for new keys and becomes the default for "setpref" in the
+edit menu.
+
+@item --default-keyserver-url @code{name}
+@opindex default-keyserver-url
+Set the default keyserver URL to @code{name}. This keyserver will be
+used as the keyserver URL when writing a new self-signature on a key,
+which includes key generation and changing preferences.
+
+@item --list-config
+@opindex 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. @option{--list-config} is only usable with
+@option{--with-colons} set.
+
+@item --gpgconf-list
+@opindex gpgconf-list
+This command is simliar to @option{--list-config} but in general only
+internally used by the @command{gpgconf} tool.
+
+@item --gpgconf-test
+@opindex gpgconf-test
+This is more or less dummy action. However it parses the configuration
+file and returns with failure if the configuraion file would prevent
+@command{gpg} from startup. Thus it may be used to run a syntax check
+on the configuration file.
+
+@end table
+
+@c *******************************
+@c ******* Deprecated ************
+@c *******************************
+@subsection Deprecated options
+
+@table @gnupgtabopt
+
+@ifset gpgone
+@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.
+@end ifset
+
+@item --show-photos
+@itemx --no-show-photos
+Causes @option{--list-keys}, @option{--list-sigs},
+@option{--list-public-keys}, @option{--list-secret-keys}, and verifying
+a signature to also display the photo ID attached to the key, if
+any. See also @option{--photo-viewer}. These options are deprecated. Use
+@option{--list-options [no-]show-photos} and/or @option{--verify-options
+[no-]show-photos} instead.
+
+@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
+@option{--list-options [no-]show-keyring} instead.
+
+@item --ctapi-driver @code{file}
+Use @code{file} to access the smartcard reader. The current default
+is `libtowitoko.so'. Note that the use of this interface is
+deprecated; it may be removed in future releases.
+
+@item --always-trust
+Identical to @option{--trust-model always}. This option is deprecated.
+
+@item --show-notation
+@itemx --no-show-notation
+Show signature notations in the @option{--list-sigs} or @option{--check-sigs} listings
+as well as when verifying a signature with a notation in it. These
+options are deprecated. Use @option{--list-options [no-]show-notation}
+and/or @option{--verify-options [no-]show-notation} instead.
+
+@item --show-policy-url
+@itemx --no-show-policy-url
+Show policy URLs in the @option{--list-sigs} or @option{--check-sigs}
+listings as well as when verifying a signature with a policy URL in
+it. These options are deprecated. Use @option{--list-options
+[no-]show-policy-url} and/or @option{--verify-options
+[no-]show-policy-url} instead.
+
+
+@end table
+
+
+@c *******************************************
+@c *************** ****************
+@c *************** FILES ****************
+@c *************** ****************
+@c *******************************************
+@mansect files
+@node GPG Configuration
+@section Configuration files
+
+There are a few configuration files to control certain aspects of
+@command{@gpgname}'s operation. Unless noted, they are expected in the
+current home directory (@pxref{option --homedir}).
+
+@table @file
+
+@item gpg.conf
+@cindex gpgsm.conf
+This is the standard configuration file read by @command{@gpgname} on
+startup. It may contain any valid long option; the leading two dashes
+may not be entered and the option may not be abbreviated. This default
+name may be changed on the command line (@pxref{option
+ --options}).
+
+@end table
+
+@c man:.RE
+Note that on larger installations, it is useful to put predefined files
+into the directory @file{/etc/skel/.gnupg/} so that newly created users
+start up with a working configuration.
+@ifclear gpgone
+For existing users the a small
+helper script is provided to create these files (@pxref{addgnupghome}).
+@end ifclear
+
+For internal purposes @command{@gpgname} creates and maintaines a few other
+files; They all live in in the current home directory (@pxref{option
+--homedir}). Only the @command{@gpgname} may modify these files.
+
+
+@table @file
+@item ~/.gnupg/secring.gpg
+The secret keyring.
+
+@item ~/.gnupg/secring.gpg.lock
+and the lock file
+
+@item ~/.gnupg/pubring.gpg
+The public keyring
+
+@item ~/.gnupg/pubring.gpg.lock
+and the lock file
+
+@item ~/.gnupg/trustdb.gpg
+The trust database
+
+@item ~/.gnupg/trustdb.gpg.lock
+and the lock file
+
+@item ~/.gnupg/random_seed
+used to preserve the internal random pool
+
+@item /usr[/local]/share/gnupg/options.skel
+Skeleton options file
+
+@item /usr[/local]/lib/gnupg/
+Default location for extensions
+
+@end table
+
+@c man:.RE
+Operation is further controlled by a few environment variables:
+
+@table @asis
+
+@item HOME
+Used to locate the default home directory.
+
+@item GNUPGHOME
+If set directory used instead of "~/.gnupg".
+
+@item GPG_AGENT_INFO
+Used to locate the gpg-agent.
+@ifset gpgone
+This is only honored when @option{--use-agent} is set.
+@end ifset
+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 @option{--gpg-agent-info} can be used to override it.
+
+@item COLUMNS
+@itemx LINES
+Used to size some displays to the full size of the screen.
+
+@end table
+
+
+@c *******************************************
+@c *************** ****************
+@c *************** EXAMPLES ****************
+@c *************** ****************
+@c *******************************************
+@mansect examples
+@node GPG Examples
+@section Examples
+
+@table @asis
+
+@item gpg -se -r @code{Bob} @code{file}
+sign and encrypt for user Bob
+
+@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}
+show keys
+
+@item gpg --fingerprint @code{user_ID}
+show fingerprint
+
+@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
+
+
+@c *******************************************
+@c *************** ****************
+@c *************** USER ID ****************
+@c *************** ****************
+@c *******************************************
+@mansect how to specify a user id
+@ifset isman
+@include specify-user-id.texi
+@end ifset
+
+@mansect return vaue
+@chapheading 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.
+
+@mansect warnings
+@chapheading 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
+are very easy to write and so you should protect your "~/.gnupg/"
+directory very well.
+
+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 give both filenames on the command line
+or use @samp{-} to specify stdin.
+
+@mansect interoperability
+@chapheading 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 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 @option{--cipher-algo}, @option{--digest-algo},
+@option{--cert-digest-algo}, or @option{--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.
+
+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 @option{--pgp6}, @option{--pgp7}, or @option{--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.
+
+@mansect bugs
+@chapheading 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 (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.
+
+@mansect see also
+@ifset isman
+@command{gpgv}(1),
+@ifclear gpgone
+@command{gpgsm}(1),
+@command{gpg-agent}(1)
+@end ifclear
+@end ifset
+@include see-also-note.texi
diff --git a/doc/gpgv.texi b/doc/gpgv.texi
new file mode 100644
index 000000000..a09d1d061
--- /dev/null
+++ b/doc/gpgv.texi
@@ -0,0 +1,167 @@
+@c Copyright (C) 2004 Free Software Foundation, Inc.
+@c This is part of the GnuPG manual.
+@c For copying conditions, see the file GnuPG.texi.
+
+@c
+@c This is included by tools.texi.
+@c
+
+@c Begin GnuPG 1.x specific stuff
+@ifset gpgone
+@macro gpgvname
+gpgv
+@end macro
+@manpage gpgv.1
+@node gpgv
+@section Verify OpenPGP signatures
+@ifset manverb
+.B gpgv
+\- Verify OpenPGP signatures
+@end ifset
+
+@mansect synopsis
+@ifset manverb
+.B gpgv
+.RI [ options ]
+.I signed_files
+@end ifset
+@end ifset
+@c End GnuPG 1.x specific stuff
+
+@c Begin GnuPG 2 specific stuff
+@ifclear gpgone
+@macro gpgvname
+gpgv2
+@end macro
+@manpage gpgv2.1
+@node gpgv
+@section Verify OpenPGP signatures
+@ifset manverb
+.B gpgv2
+\- Verify OpenPGP signatures
+@end ifset
+
+@mansect synopsis
+@ifset manverb
+.B gpgv2
+.RI [ options ]
+.I signed_files
+@end ifset
+@end ifclear
+@c End GnuPG 2 specific stuff
+
+
+
+@mansect description
+@code{@gpgvname} is an OpenPGP signature verification tool.
+
+This program is actually a stripped down version of @code{gpg} which is
+only able to check signatures. It is somewhat smaller than the fully blown
+@code{gpg} and uses a different (and simpler) way to check that
+the public keys used to make the signature are valid. There are
+no configuration files and only a few options are implemented.
+
+@code{@gpgvname} assumes that all keys in the keyring are trustworthy.
+By default it uses 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.
+
+@noindent
+@mansect options
+@code{@gpgvname} recognizes these options:
+
+@table @gnupgtabopt
+
+@item --verbose
+@itemx -v
+@opindex verbose
+Gives more information during processing. If used
+twice, the input data is listed in detail.
+
+@item --quiet
+@itemx -q
+@opindex quiet
+Try to be as quiet as possible.
+
+@item --keyring @var{file}
+@opindex keyring
+Add @var{file} to the list of keyrings.
+If @var{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).
+
+@item --status-fd @var{n}
+@opindex status-fd
+Write special status strings to the file descriptor @var{n}. See the
+file DETAILS in the documentation for a listing of them.
+
+@item --logger-fd @code{n}
+@opindex logger-fd
+Write log output to file descriptor @code{n} and not to stderr.
+
+@item --ignore-time-conflict
+@opindex 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 turns these
+checks into warnings.
+
+@include opt-homedir.texi
+
+@end table
+
+@mansect 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.
+
+@mansect examples
+@subsection Examples
+
+@table @asis
+
+@item @gpgvname @code{pgpfile}
+@itemx @gpgvname @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 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
+
+@mansect environment
+@subsection Environment
+
+@table @asis
+
+@item HOME
+Used to locate the default home directory.
+
+@item GNUPGHOME
+If set directory used instead of "~/.gnupg".
+
+@end table
+
+@mansect files
+@subsection FILES
+
+@table @asis
+
+@item ~/.gnupg/trustedkeys.gpg
+The default keyring with the allowed keys
+
+@end table
+
+@mansect see also
+@ifset gpgone
+@command{gpg}(1)
+@end ifset
+@ifclear gpgone
+@command{gpg2}(1)
+@end ifclear
+@include see-also-note.texi
+
diff --git a/doc/gpl.texi b/doc/gpl.texi
new file mode 100644
index 000000000..00108d230
--- /dev/null
+++ b/doc/gpl.texi
@@ -0,0 +1,397 @@
+@node Copying
+@appendix GNU GENERAL PUBLIC LICENSE
+
+@cindex GPL, GNU General Public License
+@center Version 2, June 1991
+
+@display
+Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+@end display
+
+@appendixsubsec Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software---to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+@iftex
+@appendixsubsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+@end iftex
+@ifinfo
+@center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+@end ifinfo
+
+@enumerate
+@item
+This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The ``Program'', below,
+refers to any such program or work, and a ``work based on the Program''
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term ``modification''.) Each licensee is addressed as ``you''.
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+@item
+You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+@item
+You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+@enumerate a
+@item
+You must cause the modified files to carry prominent notices
+stating that you changed the files and the date of any change.
+
+@item
+You must cause any work that you distribute or publish, that in
+whole or in part contains or is derived from the Program or any
+part thereof, to be licensed as a whole at no charge to all third
+parties under the terms of this License.
+
+@item
+If the modified program normally reads commands interactively
+when run, you must cause it, when started running for such
+interactive use in the most ordinary way, to print or display an
+announcement including an appropriate copyright notice and a
+notice that there is no warranty (or else, saying that you provide
+a warranty) and that users may redistribute the program under
+these conditions, and telling the user how to view a copy of this
+License. (Exception: if the Program itself is interactive but
+does not normally print such an announcement, your work based on
+the Program is not required to print an announcement.)
+@end enumerate
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+@item
+You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+@enumerate a
+@item
+Accompany it with the complete corresponding machine-readable
+source code, which must be distributed under the terms of Sections
+1 and 2 above on a medium customarily used for software interchange; or,
+
+@item
+Accompany it with a written offer, valid for at least three
+years, to give any third party, for a charge no more than your
+cost of physically performing source distribution, a complete
+machine-readable copy of the corresponding source code, to be
+distributed under the terms of Sections 1 and 2 above on a medium
+customarily used for software interchange; or,
+
+@item
+Accompany it with the information you received as to the offer
+to distribute corresponding source code. (This alternative is
+allowed only for noncommercial distribution and only if you
+received the program in object code or executable form with such
+an offer, in accord with Subsection b above.)
+@end enumerate
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+@item
+You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+@item
+You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+@item
+Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+@item
+If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+@item
+If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+@item
+The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and ``any
+later version'', you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+@item
+If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+@iftex
+@heading NO WARRANTY
+@end iftex
+@ifinfo
+@center NO WARRANTY
+@end ifinfo
+
+@item
+BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM ``AS IS'' WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+@item
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+@end enumerate
+
+@iftex
+@heading END OF TERMS AND CONDITIONS
+@end iftex
+@ifinfo
+@center END OF TERMS AND CONDITIONS
+@end ifinfo
+
+@page
+@unnumberedsec How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the ``copyright'' line and a pointer to where the full notice is found.
+
+@smallexample
+@var{one line to give the program's name and an idea of what it does.}
+Copyright (C) 19@var{yy} @var{name of author}
+
+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 the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+@end smallexample
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+@smallexample
+Gnomovision version 69, Copyright (C) 19@var{yy} @var{name of author}
+Gnomovision comes with ABSOLUTELY NO WARRANTY; for details
+type `show w'. This is free software, and you are welcome
+to redistribute it under certain conditions; type `show c'
+for details.
+@end smallexample
+
+The hypothetical commands @samp{show w} and @samp{show c} should show
+the appropriate parts of the General Public License. Of course, the
+commands you use may be called something other than @samp{show w} and
+@samp{show c}; they could even be mouse-clicks or menu items---whatever
+suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a ``copyright disclaimer'' for the program, if
+necessary. Here is a sample; alter the names:
+
+@smallexample
+@group
+Yoyodyne, Inc., hereby disclaims all copyright
+interest in the program `Gnomovision'
+(which makes passes at compilers) written
+by James Hacker.
+
+@var{signature of Ty Coon}, 1 April 1989
+Ty Coon, President of Vice
+@end group
+@end smallexample
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/doc/opt-homedir.texi b/doc/opt-homedir.texi
new file mode 100644
index 000000000..387bd02ba
--- /dev/null
+++ b/doc/opt-homedir.texi
@@ -0,0 +1,14 @@
+@c This option is included at several places.
+@item --homedir @var{dir}
+@opindex homedir
+Set the name of the home directory to @var{dir}. If his option is not
+used, the home directory defaults to @file{~/.gnupg}. It is only
+recognized when given on the command line. It also overrides any home
+directory stated through the environment variable @env{GNUPGHOME} or
+(on W32 systems) by means on the Registry entry
+@ifset isman
+@var{HKCU\\Software\\GNU\\GnuPG:HomeDir}.
+@end ifset
+@ifclear isman
+@var{HKCU\Software\GNU\GnuPG:HomeDir}.
+@end ifclear
diff --git a/doc/see-also-note.texi b/doc/see-also-note.texi
new file mode 100644
index 000000000..c0563fe97
--- /dev/null
+++ b/doc/see-also-note.texi
@@ -0,0 +1,14 @@
+@c We append this note to all ``see also'' sections of the man pages
+
+@ifset isman
+The full documentation for this tool is maintained as a Texinfo manual.
+If GnuPG and the info program are properly installed at your site, the
+command
+
+@example
+info gnupg1
+@end example
+
+should give you access to the complete manual including a menu structure
+and an index.
+@end ifset
diff --git a/doc/specify-user-id.texi b/doc/specify-user-id.texi
new file mode 100644
index 000000000..7643f93ec
--- /dev/null
+++ b/doc/specify-user-id.texi
@@ -0,0 +1,171 @@
+@c Include file to allow for different placements in man pages and the manual
+
+There are different ways to specify a user ID to GnuPG. Some of them
+are only valid for @command{gpg} others are only good for
+@command{gpgsm}. Here is the entire list of ways to specify a key:
+
+@itemize @bullet
+
+@item By key Id.
+This format is deduced from the length of the string and its content or
+@code{0x} prefix. The key Id of an X.509 certificate are the low 64 bits
+of its SHA-1 fingerprint. The use of key Ids is just a shortcut, for
+all automated processing the fingerprint should be used.
+
+When using @command{gpg} an exclamation mark may be appended to force
+using the specified primary or secondary key and not to try and
+calculate which primary or secondary key to use.
+
+The last four lines of the example give the key ID in their long form as
+internally used by the OpenPGP protocol. You can see the long key ID
+using the option @option{--with-colons}.
+
+@cartouche
+@example
+234567C4
+0F34E556E
+01347A56A
+0xAB123456
+
+234AABBCC34567C4
+0F323456784E56EAB
+01AB3FED1347A5612
+0x234AABBCC34567C4
+@end example
+@end cartouche
+
+
+
+@item By fingerprint.
+This format is deduced from the length of the string and its content or
+the @code{0x} prefix. Note, that only the 20 byte version fingerprint
+is available with @command{gpgsm} (i.e. the SHA-1 hash of the
+certificate).
+
+When using @command{gpg} an exclamation mark may be appended to force
+using the specified primary or secondary key and not to try and
+calculate which primary or secondary key to use.
+
+The best way to specify a key Id is by using the fingerprint. This
+avoids any ambiguities in case that there are duplicated key IDs.
+
+@cartouche
+@example
+1234343434343434C434343434343434
+123434343434343C3434343434343734349A3434
+0E12343434343434343434EAB3484343434343434
+0xE12343434343434343434EAB3484343434343434
+@end example
+@end cartouche
+
+@noindent
+(@command{gpgsm} also accepts colons between each pair of hexadecimal
+digits because this is the de-facto standard on how to present X.509
+fingerprints.)
+
+@item By exact match on OpenPGP user ID.
+This is denoted by a leading equal sign. It does not make sense for
+X.509 certificates.
+
+@cartouche
+@example
+=Heinrich Heine <heinrichh@@uni-duesseldorf.de>
+@end example
+@end cartouche
+
+@item By exact match on an email address.
+This is indicated by enclosing the email address in the usual way
+with left and right angles.
+
+@cartouche
+@example
+<heinrichh@@uni-duesseldorf.de>
+@end example
+@end cartouche
+
+
+@item By word match.
+All words must match exactly (not case sensitive) but can appear in any
+order in the user ID or a subjects name. Words are any sequences of
+letters, digits, the underscore and all characters with bit 7 set.
+
+@cartouche
+@example
++Heinrich Heine duesseldorf
+@end example
+@end cartouche
+
+@item By exact match on the subject's DN.
+This is indicated by a leading slash, directly followed by the RFC-2253
+encoded DN of the subject. Note that you can't use the string printed
+by "gpgsm --list-keys" because that one as been reordered and modified
+for better readability; use --with-colons to print the raw (but standard
+escaped) RFC-2253 string
+
+@cartouche
+@example
+/CN=Heinrich Heine,O=Poets,L=Paris,C=FR
+@end example
+@end cartouche
+
+@item By exact match on the issuer's DN.
+This is indicated by a leading hash mark, directly followed by a slash
+and then directly followed by the rfc2253 encoded DN of the issuer.
+This should return the Root cert of the issuer. See note above.
+
+@cartouche
+@example
+#/CN=Root Cert,O=Poets,L=Paris,C=FR
+@end example
+@end cartouche
+
+
+@item By exact match on serial number and issuer's DN.
+This is indicated by a hash mark, followed by the hexadecmal
+representation of the serial number, the followed by a slash and the
+RFC-2253 encoded DN of the issuer. See note above.
+
+@cartouche
+@example
+#4F03/CN=Root Cert,O=Poets,L=Paris,C=FR
+@end example
+@end cartouche
+
+@item By keygrip
+This is indicated by an ampersand followed by the 40 hex digits of a
+keygrip. @command{gpgsm} prints the keygrip when using the command
+@option{--dump-cert}. It does not yet work for OpenPGP keys.
+
+@cartouche
+@example
+&D75F22C3F86E355877348498CDC92BD21010A480
+@end example
+@end cartouche
+
+
+@item By substring match.
+This is the default mode but applications may want to explicitly
+indicate this by putting the asterisk in front. Match is not case
+sensitive.
+
+@cartouche
+@example
+Heine
+*Heine
+@end example
+@end cartouche
+
+@end itemize
+
+
+Please note that we have reused the hash mark identifier which was used
+in old GnuPG versions to indicate the so called local-id. It is not
+anymore used and there should be no conflict when used with X.509 stuff.
+
+Using the RFC-2253 format of DNs has the drawback that it is not
+possible to map them back to the original encoding, however we don't
+have to do this because our key database stores this encoding as meta
+data.
+
+
+
diff --git a/doc/texi.css b/doc/texi.css
new file mode 100644
index 000000000..a369abc3e
--- /dev/null
+++ b/doc/texi.css
@@ -0,0 +1,6 @@
+/* The gnupg.org standard stylesheet. */
+ @import url(/share/site.css);
+
+
+
+
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 6cc2548e1..20d3ec178 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,17 @@
+2006-12-04 Werner Koch <[email protected]>
+
+ * filter.h (armor_filter_context_t): New field REFCOUNT.
+ * armor.c (new_armor_context, release_armor_context)
+ (push_armor_filter): New.
+ (armor_filter): Call releae_armor_context for IOBUFCTRL_FREE.
+ * import.c (import): Use the new function here instead of the
+ old hack using the iobuf_push_filter2.
+ * keyserver.c (keyserver_spawn): Ditto.
+
+2006-12-03 Werner Koch <[email protected]>
+
+ * keyedit.c (menu_clean): Made strings translatable.
+
2006-12-03 David Shaw <[email protected]>
* keyedit.c (menu_clean): Show "already minimized" rather than
diff --git a/g10/armor.c b/g10/armor.c
index e437d3db0..65804a75b 100644
--- a/g10/armor.c
+++ b/g10/armor.c
@@ -114,6 +114,58 @@ static char *tail_strings[] = {
};
+/* Create a new context for armor filters. */
+armor_filter_context_t *
+new_armor_context (void)
+{
+ armor_filter_context_t *afx;
+
+ afx = xcalloc (1, sizeof *afx);
+ afx->refcount = 1;
+
+ return afx;
+}
+
+/* Release an armor filter context. Passing NULL is explicitly
+ allowed and a no-op. */
+void
+release_armor_context (armor_filter_context_t *afx)
+{
+ if (!afx)
+ return;
+
+ /* In contrast to 2.0, we use in 1.4 heap based contexts only in a
+ very few places and in general keep the stack based contexts. A
+ REFCOUNT of 0 indicates a stack based context and thus we don't
+ do anything in this case. */
+ if (!afx->refcount)
+ return;
+
+ if ( --afx->refcount )
+ return;
+ xfree (afx);
+}
+
+/* Push the armor filter onto the iobuf stream IOBUF. */
+int
+push_armor_filter (armor_filter_context_t *afx, iobuf_t iobuf)
+{
+ int rc;
+
+ if (!afx->refcount)
+ return iobuf_push_filter (iobuf, armor_filter, afx);
+
+ afx->refcount++;
+ rc = iobuf_push_filter (iobuf, armor_filter, afx);
+ if (rc)
+ afx->refcount--;
+ return rc;
+}
+
+
+
+
+
static void
initialize(void)
{
@@ -1168,6 +1220,7 @@ armor_filter( void *opaque, int control,
"probably a buggy MTA has been used\n") );
xfree( afx->buffer );
afx->buffer = NULL;
+ release_armor_context (afx);
}
else if( control == IOBUFCTRL_DESC )
*(char**)buf = "armor_filter";
diff --git a/g10/encr-data.c b/g10/encr-data.c
index 924b35f0c..acb090abe 100644
--- a/g10/encr-data.c
+++ b/g10/encr-data.c
@@ -45,7 +45,27 @@ typedef struct {
char defer[22];
int defer_filled;
int eof_seen;
-} decode_filter_ctx_t;
+ int refcount;
+} *decode_filter_ctx_t;
+
+
+/* Helper to release the decode context. */
+static void
+release_dfx_context (decode_filter_ctx_t dfx)
+{
+ if (!dfx)
+ return;
+
+ assert (dfx->refcount);
+ if ( !--dfx->refcount )
+ {
+ cipher_close (dfx->cipher_hd);
+ dfx->cipher_hd = NULL;
+ md_close (dfx->mdc_hash);
+ dfx->mdc_hash = NULL;
+ xfree (dfx);
+ }
+}
/****************
@@ -61,7 +81,10 @@ decrypt_data( void *procctx, PKT_encrypted *ed, DEK *dek )
unsigned blocksize;
unsigned nprefix;
- memset( &dfx, 0, sizeof dfx );
+
+ dfx = xcalloc (1, sizeof *dfx);
+ dfx->refcount = 1;
+
if( opt.verbose && !dek->algo_info_printed ) {
const char *s = cipher_algo_to_string( dek->algo );
if( s )
@@ -80,15 +103,15 @@ decrypt_data( void *procctx, PKT_encrypted *ed, DEK *dek )
BUG();
if( ed->mdc_method ) {
- dfx.mdc_hash = md_open( ed->mdc_method, 0 );
+ dfx->mdc_hash = md_open ( ed->mdc_method, 0 );
if ( DBG_HASHING )
- md_start_debug(dfx.mdc_hash, "checkmdc");
+ md_start_debug (dfx->mdc_hash, "checkmdc");
}
- dfx.cipher_hd = cipher_open( dek->algo,
- ed->mdc_method? CIPHER_MODE_CFB
- : CIPHER_MODE_AUTO_CFB, 1 );
+ dfx->cipher_hd = cipher_open ( dek->algo,
+ ed->mdc_method? CIPHER_MODE_CFB
+ : CIPHER_MODE_AUTO_CFB, 1 );
/* log_hexdump( "thekey", dek->key, dek->keylen );*/
- rc = cipher_setkey( dfx.cipher_hd, dek->key, dek->keylen );
+ rc = cipher_setkey ( dfx->cipher_hd, dek->key, dek->keylen );
if( rc == G10ERR_WEAK_KEY )
{
log_info(_("WARNING: message was encrypted with"
@@ -106,7 +129,7 @@ decrypt_data( void *procctx, PKT_encrypted *ed, DEK *dek )
goto leave;
}
- cipher_setiv( dfx.cipher_hd, NULL, 0 );
+ cipher_setiv ( dfx->cipher_hd, NULL, 0 );
if( ed->len ) {
for(i=0; i < (nprefix+2) && ed->len; i++, ed->len-- ) {
@@ -123,8 +146,8 @@ decrypt_data( void *procctx, PKT_encrypted *ed, DEK *dek )
else
temp[i] = c;
}
- cipher_decrypt( dfx.cipher_hd, temp, temp, nprefix+2);
- cipher_sync( dfx.cipher_hd );
+ cipher_decrypt ( dfx->cipher_hd, temp, temp, nprefix+2);
+ cipher_sync ( dfx->cipher_hd );
p = temp;
/* log_hexdump( "prefix", temp, nprefix+2 ); */
if(dek->symmetric
@@ -134,17 +157,18 @@ decrypt_data( void *procctx, PKT_encrypted *ed, DEK *dek )
goto leave;
}
- if( dfx.mdc_hash )
- md_write( dfx.mdc_hash, temp, nprefix+2 );
+ if ( dfx->mdc_hash )
+ md_write ( dfx->mdc_hash, temp, nprefix+2 );
- if( ed->mdc_method )
- iobuf_push_filter( ed->buf, mdc_decode_filter, &dfx );
+ dfx->refcount++;
+ if ( ed->mdc_method )
+ iobuf_push_filter( ed->buf, mdc_decode_filter, dfx );
else
- iobuf_push_filter( ed->buf, decode_filter, &dfx );
+ iobuf_push_filter( ed->buf, decode_filter, dfx );
proc_packets( procctx, ed->buf );
ed->buf = NULL;
- if( ed->mdc_method && dfx.eof_seen == 2 )
+ if( ed->mdc_method && dfx->eof_seen == 2 )
rc = G10ERR_INVALID_PACKET;
else if( ed->mdc_method ) { /* check the mdc */
/* We used to let parse-packet.c handle the MDC packet but
@@ -162,24 +186,25 @@ decrypt_data( void *procctx, PKT_encrypted *ed, DEK *dek )
that we know that 22 bytes are appended. */
int datalen = md_digest_length( ed->mdc_method );
- cipher_decrypt( dfx.cipher_hd, dfx.defer, dfx.defer, 22);
- md_write (dfx.mdc_hash, dfx.defer, 2);
- md_final( dfx.mdc_hash );
- if (dfx.defer[0] != '\xd3' || dfx.defer[1] != '\x14' ) {
+ assert (dfx->cipher_hd);
+ assert (dfx->mdc_hash);
+ cipher_decrypt ( dfx->cipher_hd, dfx->defer, dfx->defer, 22);
+ md_write ( dfx->mdc_hash, dfx->defer, 2);
+ md_final ( dfx->mdc_hash );
+ if (dfx->defer[0] != '\xd3' || dfx->defer[1] != '\x14' ) {
log_error("mdc_packet with invalid encoding\n");
rc = G10ERR_INVALID_PACKET;
}
else if ( datalen != 20
- || memcmp(md_read( dfx.mdc_hash, 0 ), dfx.defer+2, datalen) )
+ || memcmp(md_read( dfx->mdc_hash, 0 ), dfx->defer+2, datalen) )
rc = G10ERR_BAD_SIGN;
- /*log_hexdump("MDC calculated:", md_read( dfx.mdc_hash, 0), datalen);*/
- /*log_hexdump("MDC message :", dfx.defer, 20);*/
+ /*log_hexdump("MDC calculated:",md_read( dfx->mdc_hash, 0), datalen);*/
+ /*log_hexdump("MDC message :", dfx->defer, 20);*/
}
leave:
- cipher_close(dfx.cipher_hd);
- md_close( dfx.mdc_hash );
+ release_dfx_context (dfx);
return rc;
}
@@ -190,7 +215,7 @@ static int
mdc_decode_filter( void *opaque, int control, IOBUF a,
byte *buf, size_t *ret_len)
{
- decode_filter_ctx_t *dfx = opaque;
+ decode_filter_ctx_t dfx = opaque;
size_t n, size = *ret_len;
int rc = 0;
int c;
@@ -245,8 +270,10 @@ mdc_decode_filter( void *opaque, int control, IOBUF a,
}
if( n ) {
- cipher_decrypt( dfx->cipher_hd, buf, buf, n);
- md_write( dfx->mdc_hash, buf, n );
+ if (dfx->cipher_hd)
+ cipher_decrypt( dfx->cipher_hd, buf, buf, n);
+ if (dfx->mdc_hash)
+ md_write( dfx->mdc_hash, buf, n );
}
else {
assert( dfx->eof_seen );
@@ -254,6 +281,9 @@ mdc_decode_filter( void *opaque, int control, IOBUF a,
}
*ret_len = n;
}
+ else if ( control == IOBUFCTRL_FREE ) {
+ release_dfx_context (dfx);
+ }
else if( control == IOBUFCTRL_DESC ) {
*(char**)buf = "mdc_decode_filter";
}
@@ -263,7 +293,7 @@ mdc_decode_filter( void *opaque, int control, IOBUF a,
static int
decode_filter( void *opaque, int control, IOBUF a, byte *buf, size_t *ret_len)
{
- decode_filter_ctx_t *fc = opaque;
+ decode_filter_ctx_t fc = opaque;
size_t n, size = *ret_len;
int rc = 0;
@@ -271,12 +301,17 @@ decode_filter( void *opaque, int control, IOBUF a, byte *buf, size_t *ret_len)
assert(a);
n = iobuf_read( a, buf, size );
if( n == -1 ) n = 0;
- if( n )
- cipher_decrypt( fc->cipher_hd, buf, buf, n);
+ if( n ) {
+ if (fc->cipher_hd)
+ cipher_decrypt( fc->cipher_hd, buf, buf, n);
+ }
else
rc = -1; /* eof */
*ret_len = n;
}
+ else if ( control == IOBUFCTRL_FREE ) {
+ release_dfx_context (fc);
+ }
else if( control == IOBUFCTRL_DESC ) {
*(char**)buf = "decode_filter";
}
diff --git a/g10/filter.h b/g10/filter.h
index bb06ecc6e..c9fe872d2 100644
--- a/g10/filter.h
+++ b/g10/filter.h
@@ -32,6 +32,9 @@ typedef struct {
} md_filter_context_t;
typedef struct {
+ int refcount; /* Reference counter. If 0 this structure
+ is not allocated on the heap. */
+
/* these fields may be initialized */
int what; /* what kind of armor headers to write */
int only_keyblocks; /* skip all headers but ".... key block" */
@@ -130,6 +133,9 @@ int md_filter( void *opaque, int control, IOBUF a, byte *buf, size_t *ret_len);
void free_md_filter_context( md_filter_context_t *mfx );
/*-- armor.c --*/
+armor_filter_context_t *new_armor_context (void);
+void release_armor_context (armor_filter_context_t *afx);
+int push_armor_filter (armor_filter_context_t *afx, IOBUF iobuf);
int use_armor_filter( IOBUF a );
int armor_filter( void *opaque, int control,
IOBUF chain, byte *buf, size_t *ret_len);
diff --git a/g10/import.c b/g10/import.c
index e2ad0e314..7260301f6 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -249,9 +249,10 @@ import( IOBUF inp, const char* fname,struct stats_s *stats,
getkey_disable_caches();
if( !opt.no_armor ) { /* armored reading is not disabled */
- armor_filter_context_t *afx = xmalloc_clear( sizeof *afx );
+ armor_filter_context_t *afx = new_armor_context ();
afx->only_keyblocks = 1;
- iobuf_push_filter2( inp, armor_filter, afx, 1 );
+ push_armor_filter (afx, inp);
+ release_armor_context (afx);
}
while( !(rc = read_block( inp, &pending_pkt, &keyblock) )) {
diff --git a/g10/keyedit.c b/g10/keyedit.c
index c6f594730..c1e0ec3ca 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -3232,25 +3232,25 @@ menu_clean(KBNODE keyblock,int self_only)
else
reason=_("invalid");
- tty_printf("User ID \"%s\" compacted: %s\n",user,reason);
+ tty_printf (_("User ID \"%s\" compacted: %s\n"), user, reason);
modified=1;
}
else if(sigs)
{
- tty_printf(sigs==1?
- "User ID \"%s\": %d signature removed\n":
- "User ID \"%s\": %d signatures removed\n",
- user,sigs);
+ tty_printf (sigs==1?
+ _("User ID \"%s\": %d signature removed\n"):
+ _("User ID \"%s\": %d signatures removed\n"),
+ user,sigs);
modified=1;
}
else
{
- tty_printf(self_only==1?
- "User ID \"%s\": already minimized\n":
- "User ID \"%s\": already clean\n",
- user);
+ tty_printf (self_only==1?
+ _("User ID \"%s\": already minimized\n"):
+ _("User ID \"%s\": already clean\n"),
+ user);
}
xfree(user);
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 939bcea92..4f692457b 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -1187,23 +1187,24 @@ keyserver_spawn(enum ks_action action,STRLIST list,KEYDB_SEARCH_DESC *desc,
for(key=list;key!=NULL;key=key->next)
{
- armor_filter_context_t afx;
+ armor_filter_context_t *afx;
IOBUF buffer=iobuf_temp();
KBNODE block;
temp=NULL;
add_to_strlist(&temp,key->d);
- memset(&afx,0,sizeof(afx));
- afx.what=1;
+ afx = new_armor_context ();
+ afx->what = 1;
/* Tell the armor filter to use Unix-style \n line
endings, since we're going to fprintf this to a file
that (on Win32) is open in text mode. The win32 stdio
will transform the \n to \r\n and we'll end up with the
proper line endings on win32. This is a no-op on
Unix. */
- afx.eol[0]='\n';
- iobuf_push_filter(buffer,armor_filter,&afx);
+ afx->eol[0]='\n';
+ push_armor_filter (afx, buffer);
+ release_armor_context (afx);
/* TODO: Remove Comment: lines from keys exported this
way? */
diff --git a/include/ChangeLog b/include/ChangeLog
index c2fdcb140..b73f0cb1c 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-04 Werner Koch <[email protected]>
+
+ * iobuf.h (iobuf_t): New. That is the name we use in 2.0.
+
2006-09-28 David Shaw <[email protected]>
* compat.h: Move strsep prototype and ascii_isspace macro to from
diff --git a/include/iobuf.h b/include/iobuf.h
index 0e3584c18..a1d58c9c6 100644
--- a/include/iobuf.h
+++ b/include/iobuf.h
@@ -36,6 +36,7 @@
#define IOBUFCTRL_USER 16
typedef struct iobuf_struct *IOBUF;
+typedef struct iobuf_struct *iobuf_t;
/* fixme: we should hide most of this stuff */
struct iobuf_struct {
diff --git a/po/be.po b/po/be.po
index d755fa85e..6fd96c027 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: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\n"
"PO-Revision-Date: 2003-10-30 16:35+0200\n"
"Last-Translator: Ales Nyakhaychyk <[email protected]>\n"
"Language-Team: Belarusian <[email protected]>\n"
@@ -41,7 +41,7 @@ msgstr "запіс у stdout\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -77,7 +77,7 @@ msgstr ""
msgid "note: random_seed file not updated\n"
msgstr ""
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, c-format
@@ -295,76 +295,76 @@ msgstr ""
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr ""
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr ""
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr ""
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr ""
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr ""
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr ""
-#: g10/armor.c:568
+#: g10/armor.c:620
#, fuzzy
msgid "unexpected armor: "
msgstr "нечаканыя даньні"
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr ""
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr ""
-#: g10/armor.c:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr ""
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr ""
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr ""
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "памылка CRC; %06lx - %06lx\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
msgid "premature eof (in trailer)\n"
msgstr ""
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr ""
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr ""
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr ""
-#: g10/armor.c:1167
+#: g10/armor.c:1219
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -449,7 +449,7 @@ msgstr ""
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr ""
@@ -720,7 +720,7 @@ msgstr "Паўтарыце пароль: "
msgid "PIN not correctly repeated; try again"
msgstr ""
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -730,13 +730,13 @@ msgstr "немагчыма адкрыць \"%s\"\n"
msgid "--output doesn't work for this command\n"
msgstr ""
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "грамадскі ключ ня знойдзены"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %s\n"
@@ -843,22 +843,22 @@ msgstr ""
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr ""
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr ""
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr ""
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
msgid "problem handling encrypted packet\n"
msgstr ""
@@ -983,7 +983,7 @@ msgstr ""
msgid "WARNING: nothing exported\n"
msgstr ""
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -991,128 +991,128 @@ msgstr ""
"@Загады:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[файл]|зрабіць подпіс"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "зрабіць адчэплены подпіс"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "зашыфраваць даньні"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr "шыфраваньне толькі сымэтрычнымі шыфрамі"
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "разшыфраваць даньні (дапомна)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "праверыць подпіс"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "паказаць сьпіс ключоў"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "паказаць сьпіс ключоў і подпісаў"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
#, fuzzy
msgid "list and check key signatures"
msgstr "праверыць подпісы ключа"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "паказаць ключы й адбіткі пальцаў"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "паказаць сакрэтныя ключы"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "стварыць новую пару ключоў"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "remove keys from the public keyring"
msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
msgid "remove keys from the secret keyring"
msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "падпісаць ключ"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "падпісаць ключ толькі мясцова"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "падпісаць ці рэдагаваць ключ"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr ""
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "экспарт ключоў"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "экспартаваць ключы на паслужнік ключоў"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "імпартаваць ключы з паслужніка ключоў"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "search for keys on a key server"
msgstr ""
-#: g10/gpg.c:411
+#: g10/gpg.c:412
msgid "update all keys from a keyserver"
msgstr "абнавіць усе ключы з паслужніка ключоў"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "імпартаваць/аб'яднаць ключы"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr ""
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr ""
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1122,51 +1122,51 @@ msgstr ""
"Выбары:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr ""
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|ІМЯ| зашыфраваць для вылучанай асобы"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
msgid "use this user-id to sign or decrypt"
msgstr ""
-#: g10/gpg.c:456
+#: g10/gpg.c:457
msgid "|N|set compress level N (0 disables)"
msgstr ""
-#: g10/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr ""
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "выкарыстоўваць у якасьці файла вываду"
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "шматслоўнасьць"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "не рабіць ніякіх зьменаў"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr "пытацца перад перазапісам"
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1174,7 +1174,7 @@ msgstr ""
"@\n"
"(Глядзіце man старонку, для больш поўнага апісаньня ўсіх загадаў і выбараў)\n"
-#: g10/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1194,15 +1194,15 @@ msgstr ""
" --list-keys [назвы] паказаць ключы\n"
" --fingerprint [назвы] паказаць адбіткі пальцаў\n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Калі ласка, паведамляйце пра памылкі на <[email protected]>.\n"
-#: g10/gpg.c:778
+#: g10/gpg.c:780
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
-#: g10/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1212,7 +1212,7 @@ msgstr ""
"sign, check, encrypt ці decrypt\n"
"Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
-#: g10/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1220,566 +1220,566 @@ msgstr ""
"\n"
"Альгарытмы, якія падтрымліваюцца:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr ""
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr ""
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr ""
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
msgid "Compression: "
msgstr ""
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "Выкарыстаньне: gpg [выбары] "
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "несумяшчальныя загады\n"
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr ""
-#: g10/gpg.c:1259
+#: g10/gpg.c:1261
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr ""
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr ""
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr ""
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr ""
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr ""
-#: g10/gpg.c:1277
+#: g10/gpg.c:1279
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr ""
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
-#: g10/gpg.c:1286
+#: g10/gpg.c:1288
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr ""
-#: g10/gpg.c:1289
+#: g10/gpg.c:1291
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
-#: g10/gpg.c:1295
+#: g10/gpg.c:1297
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
-#: g10/gpg.c:1298
+#: g10/gpg.c:1300
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr ""
-#: g10/gpg.c:1301
+#: g10/gpg.c:1303
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
-#: g10/gpg.c:1442
+#: g10/gpg.c:1444
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "невядомая вэрсыя"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
msgid "show all notations during signature listings"
msgstr ""
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
msgid "show the keyring name in key listings"
msgstr ""
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
msgid "show expiration dates during signature listings"
msgstr ""
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr ""
-#: g10/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr ""
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr ""
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr ""
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr ""
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, c-format
msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr ""
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s - гэта недапушчальнае мноства знакаў\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s - гэта недапушчальнае мноства знакаў\n"
-#: g10/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
msgid "could not parse keyserver URL\n"
msgstr ""
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "недапушчальныя выбары экспартаваньня\n"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
msgid "invalid import options\n"
msgstr "недапушчальныя выбары імпартаваньня\n"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
msgid "invalid export options\n"
msgstr "недапушчальныя выбары экспартаваньня\n"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
#, fuzzy
msgid "invalid list options\n"
msgstr "недапушчальныя выбары імпартаваньня\n"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s - гэта недапушчальнае мноства знакаў\n"
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s - гэта недапушчальнае мноства знакаў\n"
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
#, fuzzy
msgid "invalid verify options\n"
msgstr "недапушчальныя выбары экспартаваньня\n"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr ""
-#: g10/gpg.c:2764
+#: g10/gpg.c:2768
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
msgid "WARNING: program may create a core file!\n"
msgstr ""
-#: g10/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr ""
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s не дазваляецца разам з %s!\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ня мае сэнсу разам з %s!\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2865
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr ""
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "запіс у stdout\n"
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
-#: g10/gpg.c:2896
+#: g10/gpg.c:2900
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
-#: g10/gpg.c:2902
+#: g10/gpg.c:2906
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
-#: g10/gpg.c:2915
+#: g10/gpg.c:2919
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
-#: g10/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr ""
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr ""
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
msgid "selected compression algorithm is invalid\n"
msgstr ""
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
msgid "selected certification digest algorithm is invalid\n"
msgstr ""
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
msgid "completes-needed must be greater than 0\n"
msgstr ""
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr ""
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr ""
-#: g10/gpg.c:3021
+#: g10/gpg.c:3025
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr ""
-#: g10/gpg.c:3023
+#: g10/gpg.c:3027
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr ""
-#: g10/gpg.c:3026
+#: g10/gpg.c:3030
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr ""
-#: g10/gpg.c:3030
+#: g10/gpg.c:3034
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr ""
-#: g10/gpg.c:3037
+#: g10/gpg.c:3041
msgid "invalid default preferences\n"
msgstr "недапушчальныя дапомныя перавагі\n"
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
msgid "invalid personal cipher preferences\n"
msgstr ""
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
msgid "invalid personal digest preferences\n"
msgstr ""
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
msgid "invalid personal compress preferences\n"
msgstr ""
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ня мае сэнсу разам з %s!\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr ""
-#: g10/gpg.c:3139
+#: g10/gpg.c:3143
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr ""
-#: g10/gpg.c:3144
+#: g10/gpg.c:3148
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr ""
-#: g10/gpg.c:3246
+#: g10/gpg.c:3250
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr ""
-#: g10/gpg.c:3257
+#: g10/gpg.c:3261
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
-#: g10/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [назва_файла]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [назва_файла]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "збой падпісаньня: %s\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [назва_файла]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [назва_файла]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr ""
-#: g10/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--sign [назва_файла]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [назва_файла]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [назва_файла]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
-#: g10/gpg.c:3376
+#: g10/gpg.c:3380
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [назва_файла]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [назва_файла]"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [назва_файла]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [загады]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr ""
-#: g10/gpg.c:3556
+#: g10/gpg.c:3560
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "збой падпісаньня: %s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "збой падпісаньня: %s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "збой падпісаньня: %s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "збой падпісаньня: %s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr ""
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr ""
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, c-format
msgid "enarmoring failed: %s\n"
msgstr ""
-#: g10/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[назва_файла]"
-#: g10/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr ""
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
msgid "the given certification policy URL is invalid\n"
msgstr ""
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
msgid "the given signature policy URL is invalid\n"
msgstr ""
-#: g10/gpg.c:4193
+#: g10/gpg.c:4197
msgid "the given preferred keyserver URL is invalid\n"
msgstr ""
@@ -1802,7 +1802,7 @@ msgstr ""
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr ""
@@ -2106,419 +2106,419 @@ msgstr ""
msgid "remove as much as possible from key after import"
msgstr ""
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr ""
-#: g10/import.c:275
+#: g10/import.c:276
#, c-format
msgid "%lu keys processed so far\n"
msgstr ""
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr ""
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " skipped new keys: %lu\n"
msgstr ""
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr ""
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr ""
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr ""
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr ""
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr ""
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr ""
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr ""
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr ""
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr ""
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr ""
-#: g10/import.c:321
+#: g10/import.c:322
#, c-format
msgid " not imported: %lu\n"
msgstr ""
-#: g10/import.c:323
+#: g10/import.c:324
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr ""
-#: g10/import.c:566
+#: g10/import.c:567
#, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr ""
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
msgid " algorithms on these user IDs:\n"
msgstr ""
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
-#: g10/import.c:619
+#: g10/import.c:620
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
-#: g10/import.c:749
+#: g10/import.c:750
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr ""
-#: g10/import.c:764
+#: g10/import.c:765
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
-#: g10/import.c:770
+#: g10/import.c:771
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr ""
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "грамадскі ключ ня знойдзены"
-#: g10/import.c:788
+#: g10/import.c:789
#, c-format
msgid "key %s: new key - skipped\n"
msgstr ""
-#: g10/import.c:797
+#: g10/import.c:798
#, c-format
msgid "no writable keyring found: %s\n"
msgstr ""
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr ""
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr ""
-#: g10/import.c:825
+#: g10/import.c:826
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr ""
-#: g10/import.c:849
+#: g10/import.c:850
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr ""
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "%s: немагчыма стварыць тэчку: %s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "%s: немагчыма стварыць тэчку: %s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr ""
-#: g10/import.c:914
+#: g10/import.c:915
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr ""
-#: g10/import.c:917
+#: g10/import.c:918
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "паказаць сьпіс ключоў і подпісаў"
-#: g10/import.c:920
+#: g10/import.c:921
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "паказаць сьпіс ключоў і подпісаў"
-#: g10/import.c:923
+#: g10/import.c:924
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr ""
-#: g10/import.c:926
+#: g10/import.c:927
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr ""
-#: g10/import.c:929
+#: g10/import.c:930
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "паказаць сьпіс ключоў і подпісаў"
-#: g10/import.c:932
+#: g10/import.c:933
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "паказаць сьпіс ключоў і подпісаў"
-#: g10/import.c:935
+#: g10/import.c:936
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "паказаць сьпіс ключоў і подпісаў"
-#: g10/import.c:938
+#: g10/import.c:939
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "паказаць сьпіс ключоў і подпісаў"
-#: g10/import.c:961
+#: g10/import.c:962
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr ""
-#: g10/import.c:1124
+#: g10/import.c:1125
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr ""
-#: g10/import.c:1135
+#: g10/import.c:1136
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "сакрэтны ключ недаступны"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, c-format
msgid "no default secret keyring: %s\n"
msgstr ""
-#: g10/import.c:1163
+#: g10/import.c:1164
#, c-format
msgid "key %s: secret key imported\n"
msgstr ""
-#: g10/import.c:1193
+#: g10/import.c:1194
#, fuzzy, c-format
msgid "key %s: already in secret keyring\n"
msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, fuzzy, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "збой падпісаньня: %s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
-#: g10/import.c:1276
+#: g10/import.c:1277
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr ""
-#: g10/import.c:1308
+#: g10/import.c:1309
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr ""
-#: g10/import.c:1374
+#: g10/import.c:1375
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr ""
-#: g10/import.c:1389
+#: g10/import.c:1390
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "грамадскі ключ ня знойдзены"
-#: g10/import.c:1391
+#: g10/import.c:1392
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
-#: g10/import.c:1409
+#: g10/import.c:1410
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr ""
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr ""
-#: g10/import.c:1422
+#: g10/import.c:1423
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr ""
-#: g10/import.c:1437
+#: g10/import.c:1438
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr ""
-#: g10/import.c:1459
+#: g10/import.c:1460
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr ""
-#: g10/import.c:1472
+#: g10/import.c:1473
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
-#: g10/import.c:1487
+#: g10/import.c:1488
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr ""
-#: g10/import.c:1529
+#: g10/import.c:1530
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
-#: g10/import.c:1550
+#: g10/import.c:1551
#, c-format
msgid "key %s: skipped subkey\n"
msgstr ""
-#: g10/import.c:1577
+#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "Ключ абаронены.\n"
-#: g10/import.c:1587
+#: g10/import.c:1588
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr ""
-#: g10/import.c:1604
+#: g10/import.c:1605
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr ""
-#: g10/import.c:1618
+#: g10/import.c:1619
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr ""
-#: g10/import.c:1626
+#: g10/import.c:1627
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr ""
-#: g10/import.c:1726
+#: g10/import.c:1727
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr ""
-#: g10/import.c:1788
+#: g10/import.c:1789
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
-#: g10/import.c:1802
+#: g10/import.c:1803
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
-#: g10/import.c:1861
+#: g10/import.c:1862
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr ""
-#: g10/import.c:1895
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "%s: тэчка створана\n"
-#: g10/import.c:2284
+#: g10/import.c:2285
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr ""
-#: g10/import.c:2292
+#: g10/import.c:2293
msgid "NOTE: primary key is online and stored on card\n"
msgstr ""
-#: g10/import.c:2294
+#: g10/import.c:2295
msgid "NOTE: secondary key is online and stored on card\n"
msgstr ""
@@ -2799,8 +2799,8 @@ msgstr ""
msgid "Really sign? (y/N) "
msgstr ""
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "збой падпісаньня: %s\n"
@@ -3298,7 +3298,7 @@ msgid ""
" of PGP to reject this key.\n"
msgstr ""
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
msgid "Are you sure you still want to add it? (y/N) "
msgstr ""
@@ -3340,201 +3340,221 @@ msgstr ""
msgid "invalid"
msgstr ""
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "грамадскі ключ ня знойдзены"
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "паказаць сьпіс ключоў і подпісаў"
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "паказаць сьпіс ключоў і подпісаў"
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "грамадскі ключ ня знойдзены"
+
+#: g10/keyedit.c:3252
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "грамадскі ключ ня знойдзены"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
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:3352
+#: g10/keyedit.c:3357
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
-#: g10/keyedit.c:3372
+#: g10/keyedit.c:3377
msgid "Enter the user ID of the designated revoker: "
msgstr ""
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3402
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3417
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
-#: g10/keyedit.c:3434
+#: g10/keyedit.c:3439
msgid "this key has already been designated as a revoker\n"
msgstr ""
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3458
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
-#: g10/keyedit.c:3459
+#: g10/keyedit.c:3464
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3525
msgid "Please remove selections from the secret keys.\n"
msgstr ""
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3531
#, fuzzy
msgid "Please select at most one subkey.\n"
msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
msgid "Changing expiration time for a subkey.\n"
msgstr ""
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
msgid "Changing expiration time for the primary key.\n"
msgstr ""
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3584
msgid "You can't change the expiration date of a v3 key\n"
msgstr ""
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3600
msgid "No corresponding signature in secret ring\n"
msgstr ""
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3673
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
msgid "Please select exactly one user ID.\n"
msgstr ""
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr ""
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
msgid "Are you sure you want to replace it? (y/N) "
msgstr ""
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4132
msgid "Are you sure you want to delete it? (y/N) "
msgstr ""
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4194
msgid "Enter the notation: "
msgstr ""
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Перазапісаць (y/N)?"
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, c-format
msgid "No user ID with index %d\n"
msgstr ""
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4465
#, c-format
msgid "No user ID with hash %s\n"
msgstr ""
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, c-format
msgid "No subkey with index %d\n"
msgstr ""
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "памылка чытаньня файла"
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr ""
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr ""
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, c-format
msgid "This signature expired on %s.\n"
msgstr ""
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr ""
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4644
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr ""
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4671
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr ""
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
msgid " (non-revocable)"
msgstr ""
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr ""
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr ""
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
msgid "Really create the revocation certificates? (y/N) "
msgstr ""
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr ""
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr ""
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4863
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
-#: g10/keyedit.c:4922
+#: g10/keyedit.c:4927
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@ -4108,7 +4128,7 @@ msgstr ""
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "недапушчальныя выбары экспартаваньня\n"
@@ -4143,104 +4163,104 @@ msgstr "імпартаваць ключы з паслужніка ключоў"
msgid "searching for names from %s\n"
msgstr ""
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr ""
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr "грамадскі ключ ня знойдзены"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr ""
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr ""
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
#, fuzzy
msgid "no keyserver action!\n"
msgstr "недапушчальныя выбары экспартаваньня\n"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
#, fuzzy
msgid "keyserver timed out\n"
msgstr "збой падпісаньня: %s\n"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
#, fuzzy
msgid "keyserver internal error\n"
msgstr "агульная памылка"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "збой падпісаньня: %s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr ""
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr ""
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr ""
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "немагчыма адкрыць %s: %s\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr ""
@@ -4646,11 +4666,11 @@ msgstr "Увядзіце пароль\n"
msgid "cancelled by user\n"
msgstr "скасавана карыстальнікам\n"
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
msgid "can't query passphrase in batch mode\n"
msgstr ""
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "Увядзіце пароль: "
@@ -4674,7 +4694,7 @@ msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "Паўтарыце пароль: "
@@ -6027,14 +6047,6 @@ msgstr ""
#~ msgstr "немагчыма адкрыць %s: %s\n"
#, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "паказаць сьпіс ключоў і подпісаў"
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "паказаць сьпіс ключоў і подпісаў"
-
-#, fuzzy
#~ msgid "error getting serial number: %s\n"
#~ msgstr "памылка стварэньня \"%s\": %s\n"
diff --git a/po/ca.po b/po/ca.po
index a37346be3..7c9adb487 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.0\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\n"
"PO-Revision-Date: 2005-02-04 02:04+0100\n"
"Last-Translator: Jordi Mallach <[email protected]>\n"
"Language-Team: Catalan <[email protected]>\n"
@@ -61,7 +61,7 @@ msgstr "s'està escrivint la clau secreta a «%s»\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -98,7 +98,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:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, c-format
@@ -328,80 +328,80 @@ msgstr ""
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr ""
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr "armadura: %s\n"
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr "la capçalera d'armadura és invàlida: "
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr "capçalera d'armadura: "
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr "la capçalera de signatura clara és invàlida\n"
# És un missatge d'error? ivb
# «Anidada» és un castellanisme. Niuades? Imbricades (SC)?? ivb
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr "signatures en text pla imbricades\n"
# FIXME: un-indiar. jm
-#: g10/armor.c:568
+#: g10/armor.c:620
#, fuzzy
msgid "unexpected armor: "
msgstr "armadura inesperada:"
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr "la línia escapada amb guió és invàlida: "
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, 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:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr "fi de fitxer prematur (no CRC)\n"
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr "fi de fitxer prematur (en CRC)\n"
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr "CRC malformat\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "error de CRC; %06lx - %06lx\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "fí de fitxer prematur (al final)\n"
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr "error en l'última línia\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr "no s'han trobat dades OpenPGP vàlides.\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, 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:1167
+#: g10/armor.c:1219
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -495,7 +495,7 @@ msgstr "no hi ha cap clau pública corresponent: %s\n"
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr "error en la lectura de «%s»: %s\n"
@@ -773,7 +773,7 @@ msgstr "Repetiu la contrasenya: "
msgid "PIN not correctly repeated; try again"
msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -783,13 +783,13 @@ msgstr "no s'ha pogut obrir «%s»\n"
msgid "--output doesn't work for this command\n"
msgstr "--output no funciona per a aquesta ordre\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "no s'ha trobat la clau «%s»: %s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %s\n"
@@ -907,26 +907,26 @@ msgstr "no podeu usar %s mentre esteu en mode %s\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s xifrat per a: «%s»\n"
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr "dades xifrades amb %s\n"
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "xifrat amb l'algoritme %d (desconegut)\n"
# És no-wrap? ivb
# Com? jm
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"ATENCIÓ: el missatge s'ha xifrat amb una clau feble durant el xifratge\n"
"simètric.\n"
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
msgid "problem handling encrypted packet\n"
msgstr "problema en tractar amb un paquet xifrat\n"
@@ -1062,7 +1062,7 @@ msgstr "AVÍS: la clau secreta %08lX no te una simple suma de comprovació SK\n"
msgid "WARNING: nothing exported\n"
msgstr "AVÍS: no s'ha exportat res\n"
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -1070,130 +1070,130 @@ msgstr ""
"@Ordres:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[fitxer]|crea una signatura"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[fitxer]|crea una signatura en text clar"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "crea una signatura separada"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "xifra dades"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr "xifra només amb xifratge simètric"
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "desxifra dades (predeterminat)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "verifica una signatura"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "llista claus"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "llista claus i signatures"
# «de les claus» o «de la clau»? ivb
-#: g10/gpg.c:393
+#: g10/gpg.c:394
#, fuzzy
msgid "list and check key signatures"
msgstr "comprova les signatures de la claus"
# «dactilars» o «digitals»? ivb
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "llista claus i empremtes digitals"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "llista claus secretes"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "genera un nou parell de claus"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "remove keys from the public keyring"
msgstr "elimina claus de l'anell públic"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
msgid "remove keys from the secret keyring"
msgstr "elimina claus de l'anell secret"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "signa una clau"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "signa una clau localment"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "signa o edita una clau"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr "genera un certificat de revocació"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "exporta claus"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "exporta claus a un servidor de claus"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "importa claus d'un servidor de claus"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "search for keys on a key server"
msgstr "cerca claus en un servidor de claus"
-#: g10/gpg.c:411
+#: g10/gpg.c:412
msgid "update all keys from a keyserver"
msgstr "actualitza totes les claus des d'un servidor de claus"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "importa/fon claus"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr "actualitza la base de dades de confiança"
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr "|algo [fitxers]|imprimeix resums de missatges"
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1203,52 +1203,52 @@ msgstr ""
"Opcions:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr "crea eixida amb armadura ascii"
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|NOM|xifra per a NOM"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
msgid "use this user-id to sign or decrypt"
msgstr "usa aquest id per a signar o desxifrar"
-#: g10/gpg.c:456
+#: g10/gpg.c:457
msgid "|N|set compress level N (0 disables)"
msgstr "|N|nivell de compressió N (0 no comprimeix)"
-#: g10/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr "usa el mode de text canònic"
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "fitxer d'eixida"
# Un dels dos és en la llista d'opcions amb --help. Urgh. jm
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "detall"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "no fa cap canvi"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr "pregunta abans de sobreescriure"
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1259,7 +1259,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/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1279,15 +1279,15 @@ msgstr ""
" --list-keys [noms] mostra claus\n"
" --fingerprint [noms] mostra empremtes digitals\n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Si us plau, informeu sobre els errors a <[email protected]>.\n"
-#: g10/gpg.c:778
+#: g10/gpg.c:780
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
-#: g10/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1302,7 +1302,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/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1310,586 +1310,586 @@ msgstr ""
"\n"
"Algoritmes suportats:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr "Clau pública: "
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr "Xifratge: "
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr "Dispersió: "
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
msgid "Compression: "
msgstr "Compressió: "
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "forma d'ús: gpg [opcions] "
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "les ordres entren en conflicte\n"
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "no s'ha trobat cap signe = a la definició de grup «%s»\n"
# Indi. ivb
-#: g10/gpg.c:1259
+#: g10/gpg.c:1261
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
# Indi. ivb
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
# Indi. ivb
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
-#: g10/gpg.c:1277
+#: g10/gpg.c:1279
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, fuzzy, c-format
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/gpg.c:1286
+#: g10/gpg.c:1288
#, fuzzy, c-format
msgid ""
"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/gpg.c:1289
+#: g10/gpg.c:1291
#, fuzzy, c-format
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/gpg.c:1295
+#: g10/gpg.c:1297
#, fuzzy, c-format
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/gpg.c:1298
+#: g10/gpg.c:1300
#, fuzzy, c-format
msgid ""
"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/gpg.c:1301
+#: g10/gpg.c:1303
#, fuzzy, c-format
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/gpg.c:1442
+#: g10/gpg.c:1444
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
#, fuzzy
msgid "show all notations during signature listings"
msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "la URL de política de signatura donada no és vàlida\n"
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mostra en quin anell de claus està una clau llistada"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n"
-#: g10/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n"
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr "fitxer d'opcions «%s»: %s\n"
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr "s'estan llegint opcions de «%s»\n"
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: %s no és per a ús normal!\n"
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, 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/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s no és un joc de caràcters vàlid\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, 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/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opcions d'exportació no vàlides\n"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opcions d'importanció no vàlides\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
msgid "invalid import options\n"
msgstr "opcions d'importació no vàlides\n"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
msgid "invalid export options\n"
msgstr "opcions d'exportació no vàlides\n"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opcions d'importanció no vàlides\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
#, fuzzy
msgid "invalid list options\n"
msgstr "opcions d'importació no vàlides\n"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s no és un joc de caràcters vàlid\n"
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "la URL de política de signatura donada no és vàlida\n"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s no és un joc de caràcters vàlid\n"
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
#, fuzzy
msgid "invalid verify options\n"
msgstr "opcions d'exportació no vàlides\n"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "no s'ha pogut fixar l'exec-path a %s\n"
-#: g10/gpg.c:2764
+#: g10/gpg.c:2768
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
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/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVÍS: %s té preferència sobre %s\n"
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s no és permés amb %s!\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s no té sentit amb %s!\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2865
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "gpg-agent no està disponible en aquesta sessió\n"
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
# clares -> en clar? ivb
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
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/gpg.c:2896
+#: g10/gpg.c:2900
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/gpg.c:2902
+#: g10/gpg.c:2906
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/gpg.c:2915
+#: g10/gpg.c:2919
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/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorisme de xifratge triat no és vàlid\n"
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr "l'algorisme de resum seleccionat no és vàlid\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "l'algorisme de xifratge triat no és vàlid\n"
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
msgid "selected certification digest algorithm is invalid\n"
msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed ha de ser major que 0\n"
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed ha de ser major que 1\n"
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
#, 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/gpg.c:3021
+#: g10/gpg.c:3025
#, 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/gpg.c:3023
+#: g10/gpg.c:3027
#, 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/gpg.c:3026
+#: g10/gpg.c:3030
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: el mode S2K simple (0) no és gens recomanable\n"
-#: g10/gpg.c:3030
+#: g10/gpg.c:3034
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/gpg.c:3037
+#: g10/gpg.c:3041
msgid "invalid default preferences\n"
msgstr "les preferències per defecte són invàlides\n"
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
msgid "invalid personal cipher preferences\n"
msgstr "les preferències personals de xifrat són invàlides\n"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
msgid "invalid personal digest preferences\n"
msgstr "les preferències personals de digest són invàlides\n"
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
msgid "invalid personal compress preferences\n"
msgstr "les preferències personals de compressió són invàlides\n"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s encara no funciona amb %s\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, 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/gpg.c:3139
+#: g10/gpg.c:3143
#, 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/gpg.c:3144
+#: g10/gpg.c:3148
#, 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/gpg.c:3246
+#: g10/gpg.c:3250
#, 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/gpg.c:3257
+#: g10/gpg.c:3261
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/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [nom_del_fitxer]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [nom_del_fitxer]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "ha fallat el desxifratge: %s\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [nom_del_fitxer]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nom_del_fitxer]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, 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/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--sign [nom_del_fitxer]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nom_del_fitxer]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nom_del_fitxer]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, 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/gpg.c:3376
+#: g10/gpg.c:3380
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nom_del_fitxer]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [nom_del_fitxer]"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [nom_del_fitxer]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [ordres]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [user-id] [anell]"
-#: g10/gpg.c:3556
+#: g10/gpg.c:3560
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "l'enviament al servidor de claus ha fallat: %s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "la recepció des del servidor de claus ha fallat: %s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, c-format
msgid "key export failed: %s\n"
msgstr "l'exportació de la clau ha fallat: %s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "ha fallat la cerca al servidor de claus: %s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "ha fallat el refresc des del servidor de claus: %s\n"
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "no s'ha pogut llevar l'armadura: %s\n"
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
-#: g10/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "l'algoritme de dispersió és invàlid «%s»\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[nom_del_fitxer]"
-#: g10/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr "Endavant, escriviu el missatge...\n"
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
msgid "the given certification policy URL is invalid\n"
msgstr "la URL de política de certificació donada no és vàlida\n"
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
msgid "the given signature policy URL is invalid\n"
msgstr "la URL de política de signatura donada no és vàlida\n"
-#: g10/gpg.c:4193
+#: g10/gpg.c:4197
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la URL de política de signatura donada no és vàlida\n"
@@ -1916,7 +1916,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"La clau invàlida %08lX s'ha fet vàlida amb --allow-non-selfsigned-uid\n"
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, fuzzy, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr ""
@@ -2326,287 +2326,287 @@ msgstr "la clau secreta és inusable"
msgid "remove as much as possible from key after import"
msgstr ""
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr "es descarta un bloc de tipus %d\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "fins ara s'han processat %lu claus\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Nombre total processat: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " claus noves descartades: %lu\n"
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sense ID: %lu\n"
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr " importades: %lu"
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr " no modificades: %lu\n"
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr " ID d'usuaris nous: %lu\n"
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr " subclaus noves: %lu\n"
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr " signatures noves: %lu\n"
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr " noves revocacions: %lu\n"
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr " claus privades llegides: %lu\n"
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "claus privades importades: %lu\n"
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "claus privades no canviades: %lu\n"
-#: g10/import.c:321
+#: g10/import.c:322
#, c-format
msgid " not imported: %lu\n"
msgstr " importades: %lu\n"
-#: g10/import.c:323
+#: g10/import.c:324
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " signatures noves: %lu\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " claus privades llegides: %lu\n"
-#: g10/import.c:566
+#: g10/import.c:567
#, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr ""
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
#, fuzzy
msgid " algorithms on these user IDs:\n"
msgstr "Heu signat els següents ID d'usuari:\n"
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
-#: g10/import.c:619
+#: g10/import.c:620
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "signatura %s, algorisme de resum %s\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "clau %08lX: sense ID\n"
-#: g10/import.c:749
+#: g10/import.c:750
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "clau %08lX: corrupció de la subclau HKP reparada\n"
-#: g10/import.c:764
+#: g10/import.c:765
#, fuzzy, c-format
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:770
+#: g10/import.c:771
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "clau %08lX: l'ID no és vàlid\n"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr "açò pot ser causat per l'absència d'autosignatura\n"
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "clau %08lX: no s'ha trobat la clau pública: %s\n"
-#: g10/import.c:788
+#: g10/import.c:789
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "clau %08lX: clau nova - es descarta \n"
-#: g10/import.c:797
+#: g10/import.c:798
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "no s'ha trobat cap anell escrivible: %s\n"
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr "s'està escrivint en «%s»\n"
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
-#: g10/import.c:825
+#: g10/import.c:826
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "clau %08lX: s'ha importat la clau pública «%s»\n"
-#: g10/import.c:849
+#: g10/import.c:850
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "clau %08lX: no correspon a la nostra còpia\n"
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "clau %08lX: no s'ha trobat el bloc de claus original: %s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "clau %08lX: no s'ha pogut llegir el bloc de claus original: %s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "clau %08lX: «%s» 1 ID d'usuari nou\n"
-#: g10/import.c:914
+#: g10/import.c:915
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
-#: g10/import.c:917
+#: g10/import.c:918
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "clau %08lX: «%s» 1 signatura nova\n"
-#: g10/import.c:920
+#: g10/import.c:921
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "clau %08lX: «%s» %d signatures noves\n"
-#: g10/import.c:923
+#: g10/import.c:924
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "clau %08lX: «%s» 1 subclau nova\n"
-#: g10/import.c:926
+#: g10/import.c:927
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "clau %08lX: «%s» %d subclaus noves\n"
-#: g10/import.c:929
+#: g10/import.c:930
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "clau %08lX: «%s» %d signatures noves\n"
-#: g10/import.c:932
+#: g10/import.c:933
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "clau %08lX: «%s» %d signatures noves\n"
-#: g10/import.c:935
+#: g10/import.c:936
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
-#: g10/import.c:938
+#: g10/import.c:939
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
-#: g10/import.c:961
+#: g10/import.c:962
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "clau %08lX: «%s» no ha estat modificada\n"
-#: g10/import.c:1124
+#: g10/import.c:1125
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "clau %08lX: clau secreta amb xifrat %d no vàlid - es descarta\n"
-#: g10/import.c:1135
+#: g10/import.c:1136
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "no hi ha anell secret predeterminat: %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "clau %08lX: s'ha importat la clau secreta\n"
-#: g10/import.c:1193
+#: g10/import.c:1194
#, fuzzy, c-format
msgid "key %s: already in secret keyring\n"
msgstr "clau %08lX: ja es troba en l'anell privat\n"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, fuzzy, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "clau %08lX: no s'ha trobat la clau secreta: %s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
@@ -2616,22 +2616,22 @@ msgstr ""
# O «rebutjara»? ivb
# Per tots els canvis d'anglicisme «ignorat» -> «es descarta»,
# «es rebutja» està bé. jm
-#: g10/import.c:1276
+#: g10/import.c:1277
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "clau %08lX: el certificat de revocació és invàlid: %s: es rebutja\n"
-#: g10/import.c:1308
+#: g10/import.c:1309
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "clau %08lX: s'ha importat el certificat de revocació «%s»\n"
-#: g10/import.c:1374
+#: g10/import.c:1375
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "clau %08lX: no hi ha ID per a la signatura\n"
-#: g10/import.c:1389
+#: g10/import.c:1390
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
@@ -2639,126 +2639,126 @@ msgstr ""
"s»\n"
"\n"
-#: g10/import.c:1391
+#: g10/import.c:1392
#, fuzzy, c-format
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"
-#: g10/import.c:1409
+#: g10/import.c:1410
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "clau %08lX: no hi ha una subclau per a l'enllaç de la clau\n"
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "clau %08lX: l'algoritme de clau pública no és suportat\n"
-#: g10/import.c:1422
+#: g10/import.c:1423
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "clau %08lX: l'enllaç de subclau és invàlid\n"
-#: g10/import.c:1437
+#: g10/import.c:1438
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "clau %08lX: s'ha eliminat un enllaç de subclau múltiple\n"
-#: g10/import.c:1459
+#: g10/import.c:1460
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "clau %08lX: no hi ha una subclau per a la clau de revocació\n"
-#: g10/import.c:1472
+#: g10/import.c:1473
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "clau %08lX: Subclau de revocació no vàlida\n"
-#: g10/import.c:1487
+#: g10/import.c:1488
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "clau %08lX: s'han eliminat subclaus de revocació múltiples\n"
-#: g10/import.c:1529
+#: g10/import.c:1530
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "clau %08lX: es descarta l'ID d'usuari '"
-#: g10/import.c:1550
+#: g10/import.c:1551
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "clau %08lX: es descarta la subclau\n"
-#: g10/import.c:1577
+#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "clau %08lX: la signatura és inexportable (classe %02x) - es descarta\n"
-#: g10/import.c:1587
+#: g10/import.c:1588
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr ""
"clau %08lX: el certificat de revocació és en el lloc equivocat - es "
"descarta\n"
-#: g10/import.c:1604
+#: g10/import.c:1605
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "clau %08lX: el certificat de revocació és invàlid: %s - es descarta\n"
-#: g10/import.c:1618
+#: g10/import.c:1619
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr ""
"clau %08lX: la signatura de la subclau és en el lloc equivocat - es "
"descarta\n"
-#: g10/import.c:1626
+#: g10/import.c:1627
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr ""
"clau %08lX: la classe de signatura és inesperada (0x%02x) - es descarta\n"
-#: g10/import.c:1726
+#: g10/import.c:1727
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "clau %08lX: s'ha detectat un ID d'usuari duplicat - es fusiona\n"
-#: g10/import.c:1788
+#: g10/import.c:1789
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"AVÍS: la clau %08lX pot estar revocada: s'adquireix la clau de revocació %"
"08lX\n"
-#: g10/import.c:1802
+#: g10/import.c:1803
#, 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:1861
+#: g10/import.c:1862
#, 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:1895
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
-#: g10/import.c:2284
+#: g10/import.c:2285
#, fuzzy
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "la clau pública no coincideix amb la clau secreta!\n"
-#: g10/import.c:2292
+#: g10/import.c:2293
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "es descarta: la clau secreta ja és present\n"
-#: g10/import.c:2294
+#: g10/import.c:2295
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "es descarta: la clau secreta ja és present\n"
@@ -3084,8 +3084,8 @@ msgstr ""
msgid "Really sign? (y/N) "
msgstr "Signar realment? "
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "Ha fallat el procés de signatura: %s\n"
@@ -3635,7 +3635,7 @@ 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Esteu segur que encara voleu afegir-lo? (s/N) "
@@ -3681,12 +3681,32 @@ msgstr "No s'hi ha eliminat res.\n"
msgid "invalid"
msgstr "invàlida"
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "L'ID d'usuari «%s» està revocat."
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "L'ID d'usuari «%s» està revocat."
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "L'ID d'usuari «%s» està revocat."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "l'ID d'usuari «%s» ja està revocat\n"
+
+#: g10/keyedit.c:3252
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "l'ID d'usuari «%s» ja està revocat\n"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3695,205 +3715,205 @@ msgstr ""
"AVÍS: Aquesta és una clau d'estil PGP 2.x. Afegir un revocador designat pot\n"
"fer que algunes versions de PGP rebutjen aquesta clau.\n"
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3357
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:3372
+#: g10/keyedit.c:3377
msgid "Enter the user ID of the designated revoker: "
msgstr "Introduïu l'ID d'usuari del revocador designat: "
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3402
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:3412
+#: g10/keyedit.c:3417
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:3434
+#: g10/keyedit.c:3439
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3458
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:3459
+#: g10/keyedit.c:3464
#, fuzzy
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:3520
+#: g10/keyedit.c:3525
msgid "Please remove selections from the secret keys.\n"
msgstr "Per favor, elimineu les seleccions de les claus secretes.\n"
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3531
#, fuzzy
msgid "Please select at most one subkey.\n"
msgstr "Per favor, seleccioneu com a molt una clau secundària.\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "S'està canviant la data de caducitat per a una clau secundària.\n"
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
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:3579
+#: g10/keyedit.c:3584
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:3595
+#: g10/keyedit.c:3600
msgid "No corresponding signature in secret ring\n"
msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3673
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr ""
"AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
msgid "Please select exactly one user ID.\n"
msgstr "Heu de seleccionar exactament un ID.\n"
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, 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:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4132
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4194
#, fuzzy
msgid "Enter the notation: "
msgstr "Notació de signatura: "
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Voleu sobreescriure? (s/N) "
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, c-format
msgid "No user ID with index %d\n"
msgstr "No hi ha cap ID amb l'índex %d\n"
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4465
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "No hi ha cap ID amb l'índex %d\n"
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "No hi ha cap ID amb l'índex %d\n"
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID d'usuari: «"
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr ""
"»\n"
"signat amb la vostra clau %08lX el %s\n"
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr " (no-exportable)"
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Aquesta signatura va caducar el %s.\n"
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
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:4639
+#: g10/keyedit.c:4644
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:4666
+#: g10/keyedit.c:4671
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Heu signat els següents ID d'usuari:\n"
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
#, fuzzy
msgid " (non-revocable)"
msgstr " (no-exportable)"
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revocat per %08lX el %s\n"
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr "Esteu a punt de revocar aquestes signatures:\n"
# (s/N)? ivb
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
msgid "Really create the revocation certificates? (y/N) "
msgstr "Realment voleu crear els certificats de revocació? (s/N) "
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr "ho hi ha clau secreta\n"
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "l'ID d'usuari «%s» ja està revocat\n"
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4863
#, 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:4922
+#: g10/keyedit.c:4927
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "l'ID d'usuari «%s» ja està revocat\n"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "l'ID d'usuari «%s» ja està revocat\n"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@ -4528,7 +4548,7 @@ msgstr "disable"
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr ""
@@ -4563,107 +4583,107 @@ msgstr "s'està cercant «%s» al servidor HKP %s\n"
msgid "searching for names from %s\n"
msgstr "s'està cercant «%s» al servidor HKP %s\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "s'està cercant «%s» al servidor HKP %s\n"
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "s'està cercant «%s» al servidor HKP %s\n"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "s'està cercant «%s» al servidor HKP %s\n"
# «del servidor», «en el servidor»? ivb
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
#, fuzzy
msgid "no keyserver action!\n"
msgstr "error de servidor de claus"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr "no es coneix cap servidor de claus (useu l'opció \"--keyserver\")\n"
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
# «del servidor», «en el servidor»? ivb
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
#, fuzzy
msgid "keyserver timed out\n"
msgstr "error de servidor de claus"
# «del servidor», «en el servidor»? ivb
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
#, fuzzy
msgid "keyserver internal error\n"
msgstr "error de servidor de claus"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "la recepció des del servidor de claus ha fallat: %s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s: no és un ID vàlid\n"
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n"
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
@@ -5096,12 +5116,12 @@ msgstr "Introduïu la contrasenya\n"
msgid "cancelled by user\n"
msgstr "s'ha cancel·lat per l'usuari\n"
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
#, fuzzy
msgid "can't query passphrase in batch mode\n"
msgstr "no es pot demanar la contrasenya en mode desatès\n"
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "Introduïu la contrasenya: "
@@ -5125,7 +5145,7 @@ msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "Repetiu la contrasenya: "
@@ -6642,18 +6662,6 @@ msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
#~ msgstr "no s'ha pogut executar %s «%s»: %s\n"
#, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "L'ID d'usuari «%s» està revocat."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "L'ID d'usuari «%s» està revocat."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "L'ID d'usuari «%s» està revocat."
-
-#, fuzzy
#~ msgid "No user IDs are removable.\n"
#~ msgstr "No hi ha usuari per a la clau\n"
diff --git a/po/cs.po b/po/cs.po
index c531378cc..8947f805e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.3.92\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\n"
"PO-Revision-Date: 2004-11-26 09:12+0200\n"
"Last-Translator: Roman Pavlik <[email protected]>\n"
"Language-Team: Czech <[email protected]>\n"
@@ -41,7 +41,7 @@ msgstr "zapisuji tajn� kl�� do `%s'\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -77,7 +77,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:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, c-format
@@ -304,75 +304,75 @@ msgstr ""
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "p��stup na %s se nezda�il - vadn� OpenPGP karta?\n"
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr "ASCII k�dov�n�: %s\n"
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr "neplatn� hlavi�ka ASCII k�dov�n�: "
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr "ASCII hlavi�ka: "
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr "neplatn� hlavi�ka podpisu v �iteln�m form�tu\n"
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr "vno�en� podpisy v �iteln�m form�tu\n"
-#: g10/armor.c:568
+#: g10/armor.c:620
msgid "unexpected armor: "
msgstr "neo�ek�van� ASCII armor: "
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr "nespr�vn� ozna�en� ��dku m�nusy: "
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "neplatn� radix64 znak %02X byl p�esko�en\n"
-#: g10/armor.c:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr "p�ed�asn� konec souboru (��dn� CRC)\n"
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr "p�ed�asn� konec souboru (��dn� CRC)\n"
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr "�patn� form�t CRC\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "Chyba CRC; %06lX - %06lX\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
msgid "premature eof (in trailer)\n"
msgstr "p�ed�asn� konec souboru (v pati�ce)\n"
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr "chyba v pati�ce\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr "nenalezena ��dn� platn� data ve form�tu OpenPGP.\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, 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:1167
+#: g10/armor.c:1219
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -458,7 +458,7 @@ msgstr "URL pro z�sk�n� ve�ejn�ho kl��e: "
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Chyba: URL je p��li� dlouh� (limit je %d znak�).\n"
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr "chyba p�i �ten� `%s': %s\n"
@@ -716,7 +716,7 @@ msgstr "Opakujte tento PIN: "
msgid "PIN not correctly repeated; try again"
msgstr "PIN nen� zopakov�n spr�vn�; zkuste to znovu"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -726,13 +726,13 @@ msgstr "nelze otev��t `%s'\n"
msgid "--output doesn't work for this command\n"
msgstr "--output pro tento p��kaz nen� platn�\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "kl�� \"%s\" nenalezen: %s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %s\n"
@@ -843,22 +843,22 @@ msgstr "pou�it� %s nen� v m�du %s dovoleno\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s za�ifrovan� pro: %s\n"
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr "%s za�ifrovan� data\n"
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "za�ifrov�no nezn�m�m algoritmem %d\n"
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr "VAROV�N�: zpr�va byla za�ifrov�na slab�m kl��em v symetrick� �if�e.\n"
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
msgid "problem handling encrypted packet\n"
msgstr "probl�m se za�ifrovan�m paketem\n"
@@ -987,7 +987,7 @@ msgstr "VAROV�N�: tajn� kl�� %s nen� chr�n�n pomoc� simple SK checksum\n"
msgid "WARNING: nothing exported\n"
msgstr "VAROV�N�: nebylo nic vyexportov�no\n"
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -995,127 +995,127 @@ msgstr ""
"@P��kazy:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[soubor]|vytvo�it podpis"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "vytvo�it podpis odd�len� od dokumentu"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "�ifrovat data"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr "�ifrov�n� pouze se symetrickou �ifrou"
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "de�ifrovat data (implicitn�)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "verifikovat podpis"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "vypsat seznam kl���"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "vypsat seznam kl��� a podpis�"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "list and check key signatures"
msgstr "vypsat a zkontrolovat podpisy kl���"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "vypsat seznam kl��� a fingerprint�"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "vypsat seznam tajn�ch kl���"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "vytvo�it nov� p�r kl���"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "remove keys from the public keyring"
msgstr "odstranit kl�� ze souboru ve�ejn�ch kl���"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
msgid "remove keys from the secret keyring"
msgstr "odstranit kl�� ze souboru tajn�ch kl���"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "podepsat kl��"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "podepsat kl�� lok�ln�"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "podepsat nebo modifikovat kl��"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr "vytvo�it revoka�n� certifik�t"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "exportovat kl��e"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "exportovat kl��e na server kl���"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "importovat kl��e ze serveru kl���"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "search for keys on a key server"
msgstr "vyhledat kl��e na serveru kl���"
-#: g10/gpg.c:411
+#: g10/gpg.c:412
msgid "update all keys from a keyserver"
msgstr "aktualizovat v�echny kl��e ze serveru kl���"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "importovat/slou�it kl��e"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr "vytisknout stav karty"
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr "zm�nit data na kart�"
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr "zm�nit PIN karty"
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr "aktualizovat datab�zi d�v�ry"
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr "|algo [soubory] vypi� hash"
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1125,55 +1125,55 @@ msgstr ""
"Mo�nosti:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|JM�NO|�ifrovat pro JM�NO"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
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/gpg.c:456
+#: g10/gpg.c:457
msgid "|N|set compress level N (0 disables)"
msgstr ""
"|N|nastavit �rov�� komprimace N (0 - ��dn�\n"
" komprimace)"
-#: g10/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr "pou��t kanonick� textov� m�d"
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "pou��t jako v�stupn� soubor"
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "s dodate�n�mi informacemi"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "neprov�d�t ��dn� zm�ny"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr "vy��dat potvrzen� p�ed p�eps�n�m"
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr "pou��t chov�n� striktn� podle OpenPGP"
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr "generovat zpr�vu komplatibiln� s PGP 2.x"
-#: g10/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1181,7 +1181,7 @@ msgstr ""
"@\n"
"(Pou�ijte manu�lov� str�nky pro kompletn� seznam v�ech p��kaz� a mo�nost�)\n"
-#: g10/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1199,17 +1199,17 @@ msgstr ""
" --list-keys [jm�na] vypsat kl��e\n"
" --fingerprint [jm�na] vypsat fingerprinty \n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
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/gpg.c:778
+#: g10/gpg.c:780
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
-#: g10/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1219,7 +1219,7 @@ msgstr ""
"podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
"implicitn� operace z�vis� na vstupn�ch datech\n"
-#: g10/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1227,79 +1227,79 @@ msgstr ""
"\n"
"Podporovan� algoritmy:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr "Ve�ejn� kl��: "
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr "�ifra: "
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr "Hash: "
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
msgid "Compression: "
msgstr "Komprese: "
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "u�it�: gpg [mo�nosti]"
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "konfliktn� p��kazy\n"
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "no = podpis nalezen v definici skupiny `%s'\n"
# g10/g10.c:1179#, c-format
-#: g10/gpg.c:1259
+#: g10/gpg.c:1261
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr ""
"VAROV�N�: vlastnictv� domovsk�ho adres��e nen� nastaveno bezpe�n� `%s'\n"
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr ""
"VAROV�N�: vlastnictv� konfigura�n�ho souboru nen� nastaveno bezpe�n� `%s'\n"
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr ""
"VAROV�N�: vlastnictv� roz�i�uj�c�ho modulu nen� nastaveno bezpe�n� `%s'\n"
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr ""
"VAROV�N�: p��stupov� pr�va pro domovsk� adres��e nejsou bezpe�n� `%s'\n"
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr ""
"VAROV�N�: p��stupov� pr�va pro konfigura�n� soubor nejsou bezpe�n� `%s'\n"
-#: g10/gpg.c:1277
+#: g10/gpg.c:1279
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "VAROV�N�: p��stupov� pr�va roz�i�uj�c�mu modulu nejsou bezpe�n� `%s'\n"
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"VAROV�N�: vlastnictv� adres��e s domovk�m adres��em nen� nastaveno "
"nebezpe�n� `%s'\n"
-#: g10/gpg.c:1286
+#: g10/gpg.c:1288
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1307,21 +1307,21 @@ msgstr ""
"VAROV�N�: vlastnictv� adres��e s konfigura�n�m souborem nen� nastaveno "
"nebezpe�n� `%s'\n"
-#: g10/gpg.c:1289
+#: g10/gpg.c:1291
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
"VAROV�N�: vlastnictv� adres��e s roz�i�uj�c�m modulem nen� nastaveno "
"nebezpe�n� `%s'\n"
-#: g10/gpg.c:1295
+#: g10/gpg.c:1297
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"VAROV�N�: p��stupov� pr�va k adres��i s domovsk�m adres��em nejsou nastavena "
"bezpe�n� `%s'\n"
-#: g10/gpg.c:1298
+#: g10/gpg.c:1300
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1329,7 +1329,7 @@ msgstr ""
"VAROV�N�: p��stupov� pr�va k aders��i s konfigura�n�m souborem nejsou "
"nastavena bezpe�n� `%s'\n"
-#: g10/gpg.c:1301
+#: g10/gpg.c:1303
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
@@ -1337,484 +1337,484 @@ msgstr ""
"nastavena bezpe�n� `%s'\n"
# c-format
-#: g10/gpg.c:1442
+#: g10/gpg.c:1444
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
#, fuzzy
msgid "show all notations during signature listings"
msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "p�epnout mezi vypisem seznamu tajn�ch a ve�ejn�ch kl���"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, 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/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "POZN�MKA: neexistuje implicitn� soubor s mo�nostmi `%s'\n"
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr "soubor s mo�nostmi `%s': %s\n"
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr "�tu mo�nosti z `%s'\n"
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "POZN�MKA: %s nen� pro norm�ln� pou�it�!\n"
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, 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/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "`%s' nen� platn� doba expirace podpisu\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "`%s' nen� platn� znakov� sada\n"
-#: g10/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
msgid "could not parse keyserver URL\n"
msgstr "nelze zpracovat URL serveru kl���\n"
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: neplatn� parametr pro server kl���\n"
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
msgid "invalid keyserver options\n"
msgstr "neplatn� parametr pro server kl���\n"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: neplatn� parametr pro import\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
msgid "invalid import options\n"
msgstr "neplatn� parametr pro import\n"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: neplatn� parametr pro export\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
msgid "invalid export options\n"
msgstr "neplatn� parametr pro export\n"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: neplatn� parametr pro v�pis\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
msgid "invalid list options\n"
msgstr "neplatn� parametr pro v�pis\n"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
#, fuzzy
msgid "show all notations during signature verification"
msgstr "`%s' nen� platn� doba expirace podpisu\n"
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "`%s' nen� platn� doba expirace podpisu\n"
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
msgid "invalid verify options\n"
msgstr "neplatn� parametr pro ov��en�\n"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nelze nastavit exec-path na %s\n"
-#: g10/gpg.c:2764
+#: g10/gpg.c:2768
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
msgid "WARNING: program may create a core file!\n"
msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
-#: g10/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROV�N�: %s p�ep��e %s\n"
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Nen� dovoleno pou��vat %s s %s!\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ned�v� s %s smysl!\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2865
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "POZN�MKA: %s nen� v t�to verzi dostupn�\n"
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "nelze spustit s nebezpe�nou pam�t� vzhledem k %s\n"
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
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/gpg.c:2896
+#: g10/gpg.c:2900
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/gpg.c:2902
+#: g10/gpg.c:2906
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/gpg.c:2915
+#: g10/gpg.c:2919
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/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr "vybran� hashovac� algoritmus je neplatn�\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
msgid "selected compression algorithm is invalid\n"
msgstr "vybran� komprimovac� algoritmus je neplatn�\n"
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
msgid "selected certification digest algorithm is invalid\n"
msgstr "vybran� hashovac� algoritmus je neplatn�\n"
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
msgid "completes-needed must be greater than 0\n"
msgstr "polo�ka completes-needed mus� b�t v�t�� ne� 0\n"
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr "polo�ka marginals-needed mus� b�t v�t�� ne� 1\n"
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
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/gpg.c:3021
+#: g10/gpg.c:3025
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/gpg.c:3023
+#: g10/gpg.c:3027
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/gpg.c:3026
+#: g10/gpg.c:3030
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/gpg.c:3030
+#: g10/gpg.c:3034
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/gpg.c:3037
+#: g10/gpg.c:3041
msgid "invalid default preferences\n"
msgstr "neplatn� defaultn� p�edvolby\n"
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
msgid "invalid personal cipher preferences\n"
msgstr "neplatn� u�ivatelsk� p�edvolby pro �ifrov�n�\n"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
msgid "invalid personal digest preferences\n"
msgstr "neplatn� u�ivatelsk� p�edvolby pro hashov�n�\n"
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
msgid "invalid personal compress preferences\n"
msgstr "neplatn� u�ivatelsk� p�edvolby pro komprimaci\n"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s dosud nen� funk�n� s %s\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, 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/gpg.c:3139
+#: g10/gpg.c:3143
#, 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/gpg.c:3144
+#: g10/gpg.c:3148
#, 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/gpg.c:3246
+#: g10/gpg.c:3250
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
-#: g10/gpg.c:3257
+#: g10/gpg.c:3261
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/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [jm�no souboru]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [jm�no souboru]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "symetrick� �ifrov�n� `%s' se nepovedlo: %s\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [jm�no souboru]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [jm�no souboru]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "nelze pou��t --symmetric --encrypt s p��kazem --s2k-mode 0\n"
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "nelze pou��t --symmetric --encrypt v m�du %s\n"
-#: g10/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--sign [jm�no souboru]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [jm�no souboru]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [jm�no souboru]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "nelze pou��t --symmetric --sign --encrypt s p��kazem --s2k-mode 0\n"
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "nelze pou��t --symmetric --sign --encrypt v m�du %s\n"
-#: g10/gpg.c:3376
+#: g10/gpg.c:3380
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [jm�no souboru]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [jm�no souboru]"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [jm�no souboru]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key id u�ivatele"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key id u�ivatele"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id u�ivatele [p��kazy]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id u�ivatele] [soubor s kl��i (keyring)]"
-#: g10/gpg.c:3556
+#: g10/gpg.c:3560
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, c-format
msgid "key export failed: %s\n"
msgstr "export kl��e se nepoda�il: %s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "hled�n� na keyserveru se nezda�ilo: %s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "refresh dat na keyserveru se nezda�il: %s\n"
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
-#: g10/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "neplatn� hashovac� algoritmus `%s'\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[jm�no souboru]"
-#: g10/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr "Za�n�te ps�t svou zpr�vu ...\n"
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
msgid "the given certification policy URL is invalid\n"
msgstr "zadan� URL pro certifika�n� politiku je neplatn�\n"
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
msgid "the given signature policy URL is invalid\n"
msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
-#: g10/gpg.c:4193
+#: g10/gpg.c:4197
msgid "the given preferred keyserver URL is invalid\n"
msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
@@ -1838,7 +1838,7 @@ msgstr ""
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "Neplatn� kl�� %s zm�n�n na platn� pomoc� --always-non-selfsigned-uid\n"
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "neexistuje tajn� podkl�� pro ve�ejn� kl�� %s - ignorov�no\n"
@@ -2245,425 +2245,425 @@ msgstr "odstranit nepou�iteln� ��sti z kl��e"
msgid "remove as much as possible from key after import"
msgstr ""
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr "blok typu %d byl p�esko�en\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu kl��e byly doposud zpracov�ny\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Celkov� po�et zpracovan�ch kl���: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " p�esko�eny nov� kl��e: %lu\n"
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " bez ID u�ivatele: %lu\n"
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr " importov�no: %lu"
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr " beze zm�n: %lu\n"
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nov� ID u�ivatel�: %lu\n"
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nov� podkl��e: %lu\n"
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr " nov� podpisy: %lu\n"
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nov� revokace kl���: %lu\n"
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr " p�e�ten� tajn� kl��e: %lu\n"
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " importovan� tajn� kl��e: %lu\n"
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " tajn� kl��e nezm�n�ny: %lu\n"
-#: g10/import.c:321
+#: g10/import.c:322
#, c-format
msgid " not imported: %lu\n"
msgstr " neimportov�no: %lu\n"
-#: g10/import.c:323
+#: g10/import.c:324
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " odstran�n� podpisy: %lu\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " odstran�n� u�ivatelsk� ID: %lu\n"
-#: g10/import.c:566
+#: g10/import.c:567
#, fuzzy, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr "VAROV�N�: kl�� %s obsahuje preference pro algoritmy,\n"
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
#, fuzzy
msgid " algorithms on these user IDs:\n"
msgstr "kter� nesjou k dispozici. T�k� se to t�chto user ID:\n"
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": preference pro �ifrovac� algortimus %s\n"
-#: g10/import.c:619
+#: g10/import.c:620
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": preference pro podepisovac� algoritmus %s\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": preference pro komprima�n� algoritmus %s\n"
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "velmi doporu�ujeme aktualiaci nastaven� va�ich preferenc� a\n"
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"distribuci tohoto kl��e aby jste p�ede�el probl�m�m s neshodou algoritm�\n"
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "nelze aktualizovat preference s: gpg --edit-key %s updpref save\n"
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, c-format
msgid "key %s: no user ID\n"
msgstr "kl�� %s: chyb� identifik�tor u�ivatele\n"
-#: g10/import.c:749
+#: g10/import.c:750
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "kl�� %s: PKS po�kozen� podkl��e opraveno\n"
# c-format
-#: g10/import.c:764
+#: g10/import.c:765
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "kl�� %s: p�ijat id u�ivatele \"%s\",kter� nen� podeps�n j�m sam�m\n"
-#: g10/import.c:770
+#: g10/import.c:771
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "kl�� %s: chyb� platn� identifik�tor u�ivatele\n"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr "m��e to b�t zp�sobeno chyb�j�c�m podpisem kl��e j�m sam�m\n"
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "kl�� %s: ve�ejn� kl�� nenalezen: %s\n"
-#: g10/import.c:788
+#: g10/import.c:789
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "kl�� %s: nov� kl�� - p�esko�en\n"
-#: g10/import.c:797
+#: g10/import.c:798
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "nenalezen zapisovateln� soubor kl��� (keyring): %s\n"
# g10/import.c:766 g10/openfile.c:261#, c-format
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr "zapisuji do '%s'\n"
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "chyba p�i z�pisu souboru kl��� (keyring) `%s': %s\n"
-#: g10/import.c:825
+#: g10/import.c:826
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "kl�� %s: ve�ejn� kl�� \"%s\" importov�n\n"
-#: g10/import.c:849
+#: g10/import.c:850
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "kl�� %s: neodpov�d� na�� kopii\n"
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "kl�� %s: nemohu naj�t origin�ln� blok kl��e: %s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "kl�� %s: nemohu ��st origin�ln� blok kl��e: %s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "kl�� %s: \"%s\" 1 nov� identifik�tor u�ivatele\n"
-#: g10/import.c:914
+#: g10/import.c:915
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "kl�� %s: \"%s\" %d nov�ch identifik�tor� u�ivatele\n"
-#: g10/import.c:917
+#: g10/import.c:918
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "kl�� %s: \"%s\" 1 nov� podpis\n"
-#: g10/import.c:920
+#: g10/import.c:921
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "kl�� %s: \"%s\" %d nov�ch podpis�\n"
-#: g10/import.c:923
+#: g10/import.c:924
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "kl�� %s: \"%s\" 1 nov� podkl��\n"
-#: g10/import.c:926
+#: g10/import.c:927
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "kl�� %s: \"%s\" %d nov�ch podkl���\n"
-#: g10/import.c:929
+#: g10/import.c:930
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
-#: g10/import.c:932
+#: g10/import.c:933
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
-#: g10/import.c:935
+#: g10/import.c:936
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "kl�� %s: \"%s\" %d ID u�ivatele odstran�no\n"
-#: g10/import.c:938
+#: g10/import.c:939
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "kl�� %s: \"%s\" %d ID u�ivatele odstran�no\n"
-#: g10/import.c:961
+#: g10/import.c:962
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "kl�� %s: \"%s\" beze zm�n\n"
-#: g10/import.c:1124
+#: g10/import.c:1125
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "kl�� %s: tajn� kl�� s neplatnou �ifrou %d - p�esko�eno\n"
-#: g10/import.c:1135
+#: g10/import.c:1136
msgid "importing secret keys not allowed\n"
msgstr "import tajn�ch kl��� nen� povolen\n"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "nen� nastaven implicitn� soubor tajn�ch kl��� %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, c-format
msgid "key %s: secret key imported\n"
msgstr "kl�� %s: tajn� kl�� importov�n\n"
-#: g10/import.c:1193
+#: g10/import.c:1194
#, c-format
msgid "key %s: already in secret keyring\n"
msgstr "kl�� %s: je ji� v souboru tajn�ch kl���\n"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "kl�� %s: nenalezen tajn� kl��: %s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "kl�� %s: chyb� ve�ejn� kl�� - nemohu aplikovat revoka�n� certifik�t\n"
-#: g10/import.c:1276
+#: g10/import.c:1277
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "kl�� %s: neplatn� revoka�n� certifik�t: %s - zam�tnuto\n"
-#: g10/import.c:1308
+#: g10/import.c:1309
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "kl�� %s: \"%s\" revoka�n� certifik�t importov�n\n"
-#: g10/import.c:1374
+#: g10/import.c:1375
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "kl�� %s: neexistuje id u�ivatele pro podpis\n"
-#: g10/import.c:1389
+#: g10/import.c:1390
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"kl�� %s: nepodporovan� algoritmus ve�ejn�ho kl��e u u�ivatelsk�ho id \"%s"
"\"\n"
-#: g10/import.c:1391
+#: g10/import.c:1392
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "kl�� %s neplatn� podpis kl��e j�m sam�m u u�ivatelsk�ho id \"%s\"\n"
-#: g10/import.c:1409
+#: g10/import.c:1410
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "kl�� %s: neexistuje podkl�� pro v�z�n� kl���\n"
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "kl�� %s: nepodporovan� algoritmus ve�ejn�ho kl��e\n"
-#: g10/import.c:1422
+#: g10/import.c:1423
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "kl�� %s: neplatn� vazba podkl��e\n"
-#: g10/import.c:1437
+#: g10/import.c:1438
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "kl�� %s: smaz�na v�cen�sobn� vazba podkl��e\n"
-#: g10/import.c:1459
+#: g10/import.c:1460
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "kl�� %s: neexistuje podkl�� pro revokaci kl��e\n"
-#: g10/import.c:1472
+#: g10/import.c:1473
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "kl�� %s: neplatn� revoka�n� podkl��\n"
-#: g10/import.c:1487
+#: g10/import.c:1488
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "kl�� %s: smaz�na v�cen�sobn� revokace podkl��e\n"
-#: g10/import.c:1529
+#: g10/import.c:1530
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "kl�� %s: p�esko�en identifik�tor u�ivatele \"%s\"\n"
-#: g10/import.c:1550
+#: g10/import.c:1551
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "kl�� %s: podkl�� p�esko�en\n"
-#: g10/import.c:1577
+#: g10/import.c:1578
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "kl�� %s: podpis nen� exportovateln� (t��da %02X) - p�esko�eno\n"
-#: g10/import.c:1587
+#: g10/import.c:1588
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "kl�� %s: revoka�n� certifik�t na �patn�m m�st� - p�esko�eno \n"
-#: g10/import.c:1604
+#: g10/import.c:1605
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "kl�� %s: neplatn� revoka�n� certifik�t: %s - p�esko�en\n"
-#: g10/import.c:1618
+#: g10/import.c:1619
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "kl�� %s: podpis podkl��e na �patn�m m�st� - p�esko�eno \n"
-#: g10/import.c:1626
+#: g10/import.c:1627
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "kl�� %s: neo�ek�van� podpisov� t��da (0x%02X) - p�esko�eno\n"
-#: g10/import.c:1726
+#: g10/import.c:1727
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "kl�� %s: objeven duplikovan� identifik�tor u�ivatele - slou�en\n"
-#: g10/import.c:1788
+#: g10/import.c:1789
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"VAROV�N�: kl�� %s m��e b�t revokov�n: zkou��m z�skat revoka�n� kl�� %s\n"
-#: g10/import.c:1802
+#: g10/import.c:1803
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "VAROV�N�: kl�� %s m��e b�t revokov�n: revoka�n� kl�� %s nenalezen.\n"
-#: g10/import.c:1861
+#: g10/import.c:1862
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "kl�� %s: \"%s\" p�id�n revoka�n� certifik�t\n"
-#: g10/import.c:1895
+#: g10/import.c:1896
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "kl�� %s: podpis kl��e j�m sam�m (direct key signature) p�id�n\n"
-#: g10/import.c:2284
+#: g10/import.c:2285
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "POZN�MKA: S/N kl��e neodpov�d� S/N karty\n"
-#: g10/import.c:2292
+#: g10/import.c:2293
msgid "NOTE: primary key is online and stored on card\n"
msgstr "POZN�MKA: prim�rn� kl�� je online a je ulo�en na kart�\n"
-#: g10/import.c:2294
+#: g10/import.c:2295
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "POZN�MKA: sekund�rn� kl�� je online a je ulo�en na kart�\n"
@@ -2968,8 +2968,8 @@ msgstr "Velmi pe�liv� jsem ov��il tento kl��.\n"
msgid "Really sign? (y/N) "
msgstr "Skute�n� podepsat? (a/N) "
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "podeps�n� selhalo: %s\n"
@@ -3468,7 +3468,7 @@ 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
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) "
@@ -3510,12 +3510,32 @@ msgstr "Nic nebylo smaz�no.\n"
msgid "invalid"
msgstr "neplatn�"
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
+
+#: g10/keyedit.c:3252
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3524,190 +3544,190 @@ 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:3352
+#: g10/keyedit.c:3357
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:3372
+#: g10/keyedit.c:3377
msgid "Enter the user ID of the designated revoker: "
msgstr "Vlo�te identifik�tor u�ivatele pov��en�ho revokac�: "
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3402
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:3412
+#: g10/keyedit.c:3417
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:3434
+#: g10/keyedit.c:3439
msgid "this key has already been designated as a revoker\n"
msgstr "tento kl�� ji� bykl pov��en revokac�\n"
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3458
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:3459
+#: g10/keyedit.c:3464
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:3520
+#: g10/keyedit.c:3525
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:3526
+#: g10/keyedit.c:3531
msgid "Please select at most one subkey.\n"
msgstr "Pros�m, vyberte nejv��e jeden podkl��.\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
msgid "Changing expiration time for a subkey.\n"
msgstr "M�n�m dobu expirace podkl��e.\n"
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
msgid "Changing expiration time for the primary key.\n"
msgstr "M�n�m dobu expirace prim�rn�ho kl��e.\n"
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3584
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:3595
+#: g10/keyedit.c:3600
msgid "No corresponding signature in secret ring\n"
msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3673
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "VAROV�N�: podepisovac� podkl�� %s nen� k���ov� certifikov�n\n"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
msgid "Please select exactly one user ID.\n"
msgstr "Pros�m, vyberte pr�v� jeden id u�ivatele .\n"
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, 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:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr "Vlo�te URL preferovan�ho keyserveru: "
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Jste si jist�(�), �e jej chcete p�epsat? (a/N) "
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4132
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Jste si jist�(�), �e jej chcete smazat? (a/N) "
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4194
#, fuzzy
msgid "Enter the notation: "
msgstr "Podepisovac� notace: "
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "P�epsat (a/N)? "
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, c-format
msgid "No user ID with index %d\n"
msgstr "Neexistuje identifik�tor u�ivatele s indexem %d\n"
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4465
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Neexistuje u�ivatelsk� ID s hashem %s\n"
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, c-format
msgid "No subkey with index %d\n"
msgstr "Neexistuje podkl�� s indexem %d\n"
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "id u�ivatele:\"%s\"\n"
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "podeps�no va��m kl��em %s v %s%s%s\n"
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr " (neexportovateln�)"
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Platnost podpisu vypr�� %s.\n"
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
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:4639
+#: g10/keyedit.c:4644
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:4666
+#: g10/keyedit.c:4671
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Podepsal(a) jste n�sleduj�c� identifik�tory u�ivatele: %s:\n"
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
msgid " (non-revocable)"
msgstr " (nerevokovateln�)"
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "revokov�no va��m kl��em %s v %s\n"
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr "Chyst�te se revokovat tyto podpisy:\n"
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
msgid "Really create the revocation certificates? (y/N) "
msgstr "Opravdu vytvo�it revoka�n� certifik�ty? (a/N) "
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr "neexistuje tajn� kl��\n"
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4863
#, 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:4922
+#: g10/keyedit.c:4927
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Kl�� %s je ji� revokov�n.\n"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Podkl�� %s je ji� revokov�n.\n"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, 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�� %s (uid %d)\n"
@@ -4319,7 +4339,7 @@ msgstr "disabled"
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Vlo�te ��slo (��sla), 'N' pro dal�� nebo 'Q' pro konec> "
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "neplatn� protokol serveru kl��� (us %d!=handler %d)\n"
@@ -4353,101 +4373,101 @@ msgstr "vyhled�v�m \"%s\" na %s serveru %s\n"
msgid "searching for names from %s\n"
msgstr "vyhled�v�m \"%s\" na serveru %s\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "pos�l�m kl�� %s na %s server %s\n"
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, c-format
msgid "sending key %s to %s\n"
msgstr "pos�l�m kl�� %s na %s\n"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "vyhled�v�m \"%s\" na %s serveru %s\n"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "vyhled�v�m \"%s\" na serveru %s\n"
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
msgid "no keyserver action!\n"
msgstr "��dn� operace se serverem kl���!\n"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "VAROV�N�: keyserver handler z jin� verze GnuPG (%s)\n"
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr "server kl��� neposlal VERSION\n"
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr "�adn� server kl��� nen� zn�m (pou��jte volbu --keyserver)\n"
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr "vol�n� extern�ho keyserver nen� v t�to verzi podporov�no\n"
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr "protokol serveru kl��� `%s' nen� podporov�n\n"
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "akce `%s' nen� podporov�na v protokolu `%s' serveru kl���\n"
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, c-format
msgid "%s does not support handler version %d\n"
msgstr "%s nepodporuje protokol verze %d\n"
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
msgid "keyserver timed out\n"
msgstr "�asov� limit pro server kl��� vypr�el\n"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
msgid "keyserver internal error\n"
msgstr "intern� chyba serveru kl���\n"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "chyba komunikace se serverem kl���: %s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" nen� ID kl��e: p�esko�eno\n"
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "aktualizuji 1 kl�� z %s\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "aktualizuji %d kl��� z %s\n"
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
@@ -4856,11 +4876,11 @@ msgstr "Vlo�it heslo\n"
msgid "cancelled by user\n"
msgstr "zru�eno u�ivatelem\n"
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
msgid "can't query passphrase in batch mode\n"
msgstr "v d�vkov�m re�imu se nelze pt�t na heslo\n"
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "Vlo�te heslo: "
@@ -4883,7 +4903,7 @@ msgstr "d�lka %u bit�, typ %s, kl�� %s, vytvo�en� %s"
msgid " (subkey on main key ID %s)"
msgstr " (podkl�� na hlavn�m kl��i ID %s)"
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "Opakujte heslo: "
diff --git a/po/da.po b/po/da.po
index c39791e2d..a47b210f2 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: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\n"
"PO-Revision-Date: 2003-12-03 16:11+0100\n"
"Last-Translator: Birger Langkjer <[email protected]>\n"
"Language-Team: Danish <[email protected]>\n"
@@ -42,7 +42,7 @@ msgstr "skriver hemmeligt certifikat til '%s'\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -78,7 +78,7 @@ msgstr "kan ikke �bne '%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr ""
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, fuzzy, c-format
@@ -307,77 +307,77 @@ msgstr ""
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "ingen gyldig OpenPGP data fundet.\n"
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr "panser: %s\n"
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr "ugyldigt panserhoved: "
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr "panserhoved: "
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr ""
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr ""
-#: g10/armor.c:568
+#: g10/armor.c:620
#, fuzzy
msgid "unexpected armor: "
msgstr "uforventet beskyttelse:"
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr ""
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "ugyldigt radix64 tegn %02x udeladt\n"
-#: g10/armor.c:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr "for tidlig eof (ingen CRC)\n"
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr "for tidlig eof (i CRC)\n"
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr "d�rlig CRC\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC fejl; %06lx - %06lx\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "for tidlig eof (i trailer)\n"
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr "fejl i trailerlinie\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr "ingen gyldig OpenPGP data fundet.\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "ugyldigt panser: linie l�ngere end %d tegn\n"
-#: g10/armor.c:1167
+#: g10/armor.c:1219
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"
@@ -465,7 +465,7 @@ msgstr "skriver offentligt certifikat til '%s'\n"
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr "fejl ved l�sning af '%s': %s\n"
@@ -746,7 +746,7 @@ msgstr "Gentag kodes�tning: "
msgid "PIN not correctly repeated; try again"
msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -756,13 +756,13 @@ msgstr "kan ikke �bne `%s'\n"
msgid "--output doesn't work for this command\n"
msgstr ""
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "%s: bruger ikke fundet: %s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, fuzzy, c-format
msgid "error reading keyblock: %s\n"
@@ -869,22 +869,22 @@ msgstr ""
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s krypteret for: %s\n"
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr ""
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr ""
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
msgid "problem handling encrypted packet\n"
msgstr ""
@@ -1009,7 +1009,7 @@ msgstr ""
msgid "WARNING: nothing exported\n"
msgstr "ADVARSEL: intet blev eksporteret\n"
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -1017,132 +1017,132 @@ msgstr ""
"@Kommandoer:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[filer]|opret en signatur"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[filer]|opret rentekst signatur"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "opret en separat signatur"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "krypt�r data"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr "krypt�r kun med symmetriske cifre"
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "afkrypt�r data (standard)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "godkend en signatur"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "vis n�gler"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "vis n�gler og signaturer"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
#, fuzzy
msgid "list and check key signatures"
msgstr "tjek n�glesignaturer"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "vis n�gle og fingeraftryk"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "vis hemmelige n�gler"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "gener�r et nyt n�glepar"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
#, fuzzy
msgid "remove keys from the public keyring"
msgstr "fjern n�gle fra den offentlige n�glering"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
#, fuzzy
msgid "remove keys from the secret keyring"
msgstr "fjern n�gle fra den hemmelige n�glering"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "sign�r en n�gle"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "sign�r en n�gle lokalt"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "sign�r eller redig�r en n�gle"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr "Gener�r en annull�rbar certifikat"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "eksport�r n�gler"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "eksport�r n�gler til en n�gletjener"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "import�r n�gler fra en n�gleserver"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
#, fuzzy
msgid "search for keys on a key server"
msgstr "eksport�r n�gler til en n�gletjener"
-#: g10/gpg.c:411
+#: g10/gpg.c:412
#, fuzzy
msgid "update all keys from a keyserver"
msgstr "import�r n�gler fra en n�gleserver"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "import�r/fusion�r n�gler"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr "opdat�r tillidsdatabasen"
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr "|algo [filer]|print meddelelsesresum�"
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1152,57 +1152,57 @@ msgstr ""
"Indstillinger:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr "opret ascii beskyttet uddata"
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|NAME|krypt�r for NAME"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
msgid "use this user-id to sign or decrypt"
msgstr "brug denne bruger-id til at signere eller dekryptere"
-#: g10/gpg.c:456
+#: g10/gpg.c:457
msgid "|N|set compress level N (0 disables)"
msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
-#: g10/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr "brug kanonisk tekstmodus"
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "brug som uddatafil"
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "meddelsom"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "lav ingen �ndringer"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr ""
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-#: g10/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1222,16 +1222,16 @@ msgstr ""
" --list-keys [navne] vis n�gler\n"
" --fingerprint [navne] vis fingeraftryk\n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
-#: g10/gpg.c:778
+#: g10/gpg.c:780
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/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1241,7 +1241,7 @@ msgstr ""
"sign, check, encrypt eller decrypt\n"
"standard operation afh�nger af inddata\n"
-#: g10/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1249,585 +1249,585 @@ msgstr ""
"\n"
"Underst�ttede algoritmer:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr ""
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr ""
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr ""
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
#, fuzzy
msgid "Compression: "
msgstr "Kommentar: "
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "brug: gpg [flag] "
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "konfliktende kommandoer\n"
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr ""
-#: g10/gpg.c:1259
+#: g10/gpg.c:1261
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr ""
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr ""
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr ""
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr ""
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr ""
-#: g10/gpg.c:1277
+#: g10/gpg.c:1279
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr ""
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
-#: g10/gpg.c:1286
+#: g10/gpg.c:1288
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr ""
-#: g10/gpg.c:1289
+#: g10/gpg.c:1291
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
-#: g10/gpg.c:1295
+#: g10/gpg.c:1297
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
-#: g10/gpg.c:1298
+#: g10/gpg.c:1300
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr ""
-#: g10/gpg.c:1301
+#: g10/gpg.c:1303
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
-#: g10/gpg.c:1442
+#: g10/gpg.c:1444
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "ukendt standard modtager '%s'\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
msgid "show all notations during signature listings"
msgstr ""
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "den givne politik-URL er ugyldig\n"
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "skift imellem hemmelig og offentlig n�gle visning"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
msgid "show expiration dates during signature listings"
msgstr ""
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, fuzzy, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTITS: ingen standard alternativfil '%s'\n"
-#: g10/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTITS: ingen standard alternativfil '%s'\n"
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr "alternativfil`%s': %s\n"
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr "l�ser indstillinger fra `%s'\n"
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTITS: %s er ikke til normal brug!\n"
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, c-format
msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr ""
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s er ikke et gyldigt tegns�t\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s er ikke et gyldigt tegns�t\n"
-#: g10/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "import�r n�gler fra en n�gleserver: %s\n"
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "ADVARSEL: '%s' er en tom fil\n"
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "ugyldig n�glering"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, fuzzy, c-format
msgid "%s:%d: invalid import options\n"
msgstr "ADVARSEL: '%s' er en tom fil\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
#, fuzzy
msgid "invalid import options\n"
msgstr "ugyldig rustning"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, fuzzy, c-format
msgid "%s:%d: invalid export options\n"
msgstr "ADVARSEL: '%s' er en tom fil\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
#, fuzzy
msgid "invalid export options\n"
msgstr "ugyldig n�glering"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "ADVARSEL: '%s' er en tom fil\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
#, fuzzy
msgid "invalid list options\n"
msgstr "ugyldig rustning"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s er ikke et gyldigt tegns�t\n"
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "den givne politik-URL er ugyldig\n"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s er ikke et gyldigt tegns�t\n"
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "ADVARSEL: '%s' er en tom fil\n"
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
#, fuzzy
msgid "invalid verify options\n"
msgstr "ugyldig n�glering"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr ""
-#: g10/gpg.c:2764
+#: g10/gpg.c:2768
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "ADVARSEL: '%s' er en tom fil\n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
msgid "WARNING: program may create a core file!\n"
msgstr ""
-#: g10/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr ""
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ikke tilladt med %s!\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s er meningsl�s sammen med %s!\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2865
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "RSA n�gle kan ikke bruges i denne version\n"
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "skriver hemmeligt certifikat til '%s'\n"
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
-#: g10/gpg.c:2896
+#: g10/gpg.c:2900
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
-#: g10/gpg.c:2902
+#: g10/gpg.c:2906
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
-#: g10/gpg.c:2915
+#: g10/gpg.c:2919
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
-#: g10/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr "valgte cifferalgoritme er ugyldig\n"
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr "valgte resum�algoritme er ugyldig\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "valgte cifferalgoritme er ugyldig\n"
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
#, fuzzy
msgid "selected certification digest algorithm is invalid\n"
msgstr "valgte resum�algoritme er ugyldig\n"
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
msgid "completes-needed must be greater than 0\n"
msgstr ""
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr ""
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr ""
-#: g10/gpg.c:3021
+#: g10/gpg.c:3025
#, 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/gpg.c:3023
+#: g10/gpg.c:3027
#, 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/gpg.c:3026
+#: g10/gpg.c:3030
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTE: simpel S2K modus (0) frar�des p� det skarpeste\n"
-#: g10/gpg.c:3030
+#: g10/gpg.c:3034
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3041
#, fuzzy
msgid "invalid default preferences\n"
msgstr "vis pr�ferencer"
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
#, fuzzy
msgid "invalid personal cipher preferences\n"
msgstr "vis pr�ferencer"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
#, fuzzy
msgid "invalid personal digest preferences\n"
msgstr "vis pr�ferencer"
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
#, fuzzy
msgid "invalid personal compress preferences\n"
msgstr "vis pr�ferencer"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s er meningsl�s sammen med %s!\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr ""
-#: g10/gpg.c:3139
+#: g10/gpg.c:3143
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr ""
-#: g10/gpg.c:3144
+#: g10/gpg.c:3148
#, 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/gpg.c:3246
+#: g10/gpg.c:3250
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "kunne ikke initialisere TillidsDB: %s\n"
-#: g10/gpg.c:3257
+#: g10/gpg.c:3261
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
-#: g10/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [filnavn (som gemmes)]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [filnavn]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "fjernelse af beskyttelse fejlede: %s\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [filnavn (som krypteres)]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [filnavn]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr ""
-#: g10/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--sign [filnavn (som signeres)]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnavn]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [filnavn]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
-#: g10/gpg.c:3376
+#: g10/gpg.c:3380
#, fuzzy
msgid "--sign --symmetric [filename]"
msgstr "--symmetric [filnavn]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [filnavn]"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [filnavn (som dekrypteres)]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key bruger-id"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key bruger-id"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key bruger-id [kommandoer]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
-#: g10/gpg.c:3556
+#: g10/gpg.c:3560
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "signering fejlede: %s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr ""
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "fjernelse af beskyttelse fejlede: %s\n"
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
-#: g10/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "ugyldig hash-algoritme `%s'\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[filnavn]"
-#: g10/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr "G� til sagen og skriv meddelelsen ...\n"
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
#, fuzzy
msgid "the given certification policy URL is invalid\n"
msgstr "den givne politik-URL er ugyldig\n"
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
#, fuzzy
msgid "the given signature policy URL is invalid\n"
msgstr "den givne politik-URL er ugyldig\n"
-#: g10/gpg.c:4193
+#: g10/gpg.c:4197
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "den givne politik-URL er ugyldig\n"
@@ -1852,7 +1852,7 @@ msgstr ""
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr ""
@@ -2161,421 +2161,421 @@ msgstr "d�rlig hemmelig n�gle"
msgid "remove as much as possible from key after import"
msgstr ""
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr "sprang over blok af typen %d\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu n�gler behandlet indtil nu\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Totalt antal behandlede: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, fuzzy, c-format
msgid " skipped new keys: %lu\n"
msgstr " nye undern�gler: %lu\n"
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr ""
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr " importerede: %lu"
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr " u�ndrede: %lu\n"
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nye bruger-id'er: %lu\n"
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nye undern�gler: %lu\n"
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr " nye signaturer: %lu\n"
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nye n�gletilbagekald: %lu\n"
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr " hemmelige n�gler l�st: %lu\n"
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "hemmelige n�gler import: %lu\n"
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "hemmelige n�gler u�ndre: %lu\n"
-#: g10/import.c:321
+#: g10/import.c:322
#, fuzzy, c-format
msgid " not imported: %lu\n"
msgstr " importerede: %lu"
-#: g10/import.c:323
+#: g10/import.c:324
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " nye signaturer: %lu\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " hemmelige n�gler l�st: %lu\n"
-#: g10/import.c:566
+#: g10/import.c:567
#, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr ""
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
#, fuzzy
msgid " algorithms on these user IDs:\n"
msgstr " nye bruger-id'er: %lu\n"
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
-#: g10/import.c:619
+#: g10/import.c:620
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s signatur fra: %s\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "n�gle %08lX: ingen bruger-id\n"
-#: g10/import.c:749
+#: g10/import.c:750
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
-#: g10/import.c:764
+#: g10/import.c:765
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
-#: g10/import.c:770
+#: g10/import.c:771
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr ""
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
-#: g10/import.c:788
+#: g10/import.c:789
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
-#: g10/import.c:797
+#: g10/import.c:798
#, fuzzy, c-format
msgid "no writable keyring found: %s\n"
msgstr "fejl ved skrivning af n�glering `%s': %s\n"
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr "skriver til `%s'\n"
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "fejl ved skrivning af n�glering `%s': %s\n"
-#: g10/import.c:825
+#: g10/import.c:826
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "n�gle %08lX: offentlig n�gle importeret\n"
-#: g10/import.c:849
+#: g10/import.c:850
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "n�gle %08lX: stemmer ikke med vores kopi\n"
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "n�gle %08lX: kan ikke lokalisere original n�gleblok: %s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "n�gle %08lX: kan ikke l�se original n�gleblok: %s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "n�gle %08lX: ingen bruger-id\n"
-#: g10/import.c:914
+#: g10/import.c:915
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "n�gle %08lX: ingen bruger-id\n"
-#: g10/import.c:917
+#: g10/import.c:918
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "n�gle %08lX: offentlig n�gle importeret\n"
-#: g10/import.c:920
+#: g10/import.c:921
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "n�gle %08lX: offentlig n�gle importeret\n"
-#: g10/import.c:923
+#: g10/import.c:924
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
-#: g10/import.c:926
+#: g10/import.c:927
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
-#: g10/import.c:929
+#: g10/import.c:930
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "n�gle %08lX: offentlig n�gle importeret\n"
-#: g10/import.c:932
+#: g10/import.c:933
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "n�gle %08lX: offentlig n�gle importeret\n"
-#: g10/import.c:935
+#: g10/import.c:936
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "n�gle %08lX: ingen bruger-id\n"
-#: g10/import.c:938
+#: g10/import.c:939
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "n�gle %08lX: ingen bruger-id\n"
-#: g10/import.c:961
+#: g10/import.c:962
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "n�gle %08lX: ingen bruger-id\n"
-#: g10/import.c:1124
+#: g10/import.c:1125
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
-#: g10/import.c:1135
+#: g10/import.c:1136
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "skriver hemmeligt certifikat til '%s'\n"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, fuzzy, c-format
msgid "no default secret keyring: %s\n"
msgstr "ingen standard offentlig n�glering\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "hemmelige n�gler import: %lu\n"
-#: g10/import.c:1193
+#: g10/import.c:1194
#, fuzzy, c-format
msgid "key %s: already in secret keyring\n"
msgstr "fjern n�gle fra den hemmelige n�glering"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, fuzzy, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "%s: bruger ikke fundet: %s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "Gener�r en annull�rbar certifikat"
-#: g10/import.c:1276
+#: g10/import.c:1277
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "Gener�r en annull�rbar certifikat"
-#: g10/import.c:1308
+#: g10/import.c:1309
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "Gener�r en annull�rbar certifikat"
-#: g10/import.c:1374
+#: g10/import.c:1375
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "n�gle %08lX: ingen bruger-id\n"
-#: g10/import.c:1389
+#: g10/import.c:1390
#, fuzzy, c-format
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:1391
+#: g10/import.c:1392
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
-#: g10/import.c:1409
+#: g10/import.c:1410
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
-#: g10/import.c:1422
+#: g10/import.c:1423
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
-#: g10/import.c:1437
+#: g10/import.c:1438
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
-#: g10/import.c:1459
+#: g10/import.c:1460
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
-#: g10/import.c:1472
+#: g10/import.c:1473
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
-#: g10/import.c:1487
+#: g10/import.c:1488
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
-#: g10/import.c:1529
+#: g10/import.c:1530
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "%s: udelod: %s\n"
-#: g10/import.c:1550
+#: g10/import.c:1551
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "%s: udelod: %s\n"
-#: g10/import.c:1577
+#: g10/import.c:1578
#, fuzzy, c-format
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:1587
+#: g10/import.c:1588
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
-#: g10/import.c:1604
+#: g10/import.c:1605
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "Gener�r en annull�rbar certifikat"
-#: g10/import.c:1618
+#: g10/import.c:1619
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
-#: g10/import.c:1626
+#: g10/import.c:1627
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
-#: g10/import.c:1726
+#: g10/import.c:1727
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr ""
-#: g10/import.c:1788
+#: g10/import.c:1789
#, fuzzy, c-format
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:1802
+#: g10/import.c:1803
#, 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:1861
+#: g10/import.c:1862
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "n�gle %08lX: offentlig n�gle importeret\n"
-#: g10/import.c:1895
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "n�gle %08lX: offentlig n�gle importeret\n"
-#: g10/import.c:2284
+#: g10/import.c:2285
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr ""
-#: g10/import.c:2292
+#: g10/import.c:2293
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
-#: g10/import.c:2294
+#: g10/import.c:2295
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
@@ -2863,8 +2863,8 @@ msgstr ""
msgid "Really sign? (y/N) "
msgstr "Vil du gerne signere? "
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "signering fejlede: %s\n"
@@ -3387,7 +3387,7 @@ msgid ""
" of PGP to reject this key.\n"
msgstr ""
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
#, 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? "
@@ -3431,211 +3431,231 @@ msgstr ""
msgid "invalid"
msgstr "ugyldig rustning"
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "N�glen er beskyttet.\n"
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "N�glen er beskyttet.\n"
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "N�glen er beskyttet.\n"
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "N�glen er beskyttet.\n"
+
+#: g10/keyedit.c:3252
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "N�glen er beskyttet.\n"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
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:3352
+#: g10/keyedit.c:3357
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
-#: g10/keyedit.c:3372
+#: g10/keyedit.c:3377
#, fuzzy
msgid "Enter the user ID of the designated revoker: "
msgstr "Indtast n�glens st�rrelse"
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3402
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3417
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
-#: g10/keyedit.c:3434
+#: g10/keyedit.c:3439
#, 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:3453
+#: g10/keyedit.c:3458
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
-#: g10/keyedit.c:3459
+#: g10/keyedit.c:3464
#, 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:3520
+#: g10/keyedit.c:3525
msgid "Please remove selections from the secret keys.\n"
msgstr ""
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3531
#, fuzzy
msgid "Please select at most one subkey.\n"
msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
msgid "Changing expiration time for a subkey.\n"
msgstr ""
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
msgid "Changing expiration time for the primary key.\n"
msgstr ""
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3584
msgid "You can't change the expiration date of a v3 key\n"
msgstr ""
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3600
msgid "No corresponding signature in secret ring\n"
msgstr ""
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3673
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "N�glen er beskyttet.\n"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
#, fuzzy
msgid "Please select exactly one user ID.\n"
msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
#, 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:4127
+#: g10/keyedit.c:4132
#, 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:4189
+#: g10/keyedit.c:4194
msgid "Enter the notation: "
msgstr ""
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Overskriv (j/N)? "
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, c-format
msgid "No user ID with index %d\n"
msgstr "Ingen bruger-id med indeks %d\n"
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4465
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Ingen bruger-id med indeks %d\n"
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Ingen bruger-id med indeks %d\n"
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "bruger-id: \""
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr ""
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr ""
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, fuzzy, c-format
msgid "This signature expired on %s.\n"
msgstr "Denne n�gle er ikke beskyttet.\n"
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
#, 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:4639
+#: g10/keyedit.c:4644
#, fuzzy
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Gener�r en annull�rbar certifikat"
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4671
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr ""
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
#, fuzzy
msgid " (non-revocable)"
msgstr "sign�r en n�gle lokalt"
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr ""
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
#, fuzzy
msgid "Really create the revocation certificates? (y/N) "
msgstr "Gener�r en annull�rbar certifikat"
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr ""
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, fuzzy, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "N�glen er beskyttet.\n"
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4863
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
-#: g10/keyedit.c:4922
+#: g10/keyedit.c:4927
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "N�glen er beskyttet.\n"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "N�glen er beskyttet.\n"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@ -4230,7 +4250,7 @@ msgstr "sl�fra"
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "ugyldig n�glering"
@@ -4265,104 +4285,104 @@ msgstr "eksport�r n�gler til en n�gletjener"
msgid "searching for names from %s\n"
msgstr "l�ser indstillinger fra `%s'\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr ""
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr "import�r n�gler fra en n�gleserver: %s\n"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "eksport�r n�gler til en n�gletjener"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "l�ser indstillinger fra `%s'\n"
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
#, fuzzy
msgid "no keyserver action!\n"
msgstr "ugyldig n�glering"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
#, fuzzy
msgid "keyserver timed out\n"
msgstr "generel fejl"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
#, fuzzy
msgid "keyserver internal error\n"
msgstr "generel fejl"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s er ikke et gyldigt tegns�t\n"
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr ""
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "import�r n�gler fra en n�gleserver: %s\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "import�r n�gler fra en n�gleserver: %s\n"
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "kan ikke �bne %s: %s\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr ""
@@ -4771,11 +4791,11 @@ msgstr "Indtast kodes�tning: "
msgid "cancelled by user\n"
msgstr ""
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
msgid "can't query passphrase in batch mode\n"
msgstr ""
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "Indtast kodes�tning: "
@@ -4798,7 +4818,7 @@ msgstr ""
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "Gentag kodes�tning: "
@@ -6202,18 +6222,6 @@ msgstr "(du kan have brugt et forkert program til denne opgave)\n"
#~ msgstr "kan ikke �bne %s: %s\n"
#, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "N�glen er beskyttet.\n"
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "N�glen er beskyttet.\n"
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "N�glen er beskyttet.\n"
-
-#, fuzzy
#~ msgid "No user IDs are removable.\n"
#~ msgstr "Ingen bruger-ID for n�gle\n"
diff --git a/po/de.po b/po/de.po
index fc62c22f4..d8a7091ee 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.4.1\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\n"
"PO-Revision-Date: 2006-06-28 20:54+0200\n"
"Last-Translator: Walter Koch <[email protected]>\n"
"Language-Team: German <[email protected]>\n"
@@ -41,7 +41,7 @@ msgstr "es wird auf die Sperre `%s' gewartet...\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -78,7 +78,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:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, c-format
@@ -304,75 +304,75 @@ msgstr ""
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "Kann auf %s nicht zugreifen - ung�ltige OpenPGP-Karte?\n"
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr "ASCII-H�lle: %s\n"
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr "Ung�ltige ASCII-H�lle"
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr "ASCII-H�lle: "
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr "Ung�ltige Klartextsignatur-Einleitung\n"
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr "verschachtelte Klartextunterschriften\n"
-#: g10/armor.c:568
+#: g10/armor.c:620
msgid "unexpected armor: "
msgstr "Unerwartete ASCII-H�lle: "
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr "Ung�ltige mit Bindestrich \"escapte\" Zeile: "
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "Ung�ltiges \"radix64\" Zeichen %02x ignoriert\n"
-#: g10/armor.c:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr "vorzeitiges Dateiende (keine Pr�fsumme)\n"
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr "vorzeitiges Dateiende (innerhalb der Pr�fsumme)\n"
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr "Falsch aufgebaute Pr�fsumme\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "Pr�fsummenfehler; %06lx - %06lx\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
msgid "premature eof (in trailer)\n"
msgstr "vorzeitiges Dateiende (im Nachsatz)\n"
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr "Fehler in der Nachsatzzeile\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr "Keine g�ltigen OpenPGP-Daten gefunden.\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, 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:1167
+#: g10/armor.c:1219
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -459,7 +459,7 @@ msgstr "URL um den �ffentlichen Schl�ssel zu holen: "
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Fehler: URL ist zu lang (Grenze betr�gt %d Zeichen).\n"
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr "Fehler beim Lesen von `%s': %s\n"
@@ -720,7 +720,7 @@ msgstr "Geben Sie die PIN nochmal ein: "
msgid "PIN not correctly repeated; try again"
msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -730,13 +730,13 @@ msgstr "'%s' kann nicht ge�ffnet werden\n"
msgid "--output doesn't work for this command\n"
msgstr "--output funktioniert nicht bei diesem Kommando\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "Schl�ssel \"%s\" nicht gefunden: %s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %s\n"
@@ -857,23 +857,23 @@ msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s verschl�sselt f�r: %s\n"
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr "%s verschl�sselte Daten\n"
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "Mit unbekanntem Verfahren verschl�sselt %d\n"
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"Warnung: Botschaft wurde mit einem unsicheren Schl�ssel verschl�sselt.\n"
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
msgid "problem handling encrypted packet\n"
msgstr "Problem beim Bearbeiten des verschl�sselten Packets\n"
@@ -1000,7 +1000,7 @@ msgstr "WARNUNG: Der geheime Schl�ssel %s hat keine einfache SK-Pr�fsumme\n"
msgid "WARNING: nothing exported\n"
msgstr "WARNUNG: Nichts exportiert\n"
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -1008,127 +1008,127 @@ msgstr ""
"@Befehle:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[Datei]|Eine Unterschrift erzeugen"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "Eine abgetrennte Unterschrift erzeugen"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "Daten verschl�sseln"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr "Daten symmetrisch verschl�sseln"
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "Daten entschl�sseln (Voreinstellung)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "Signatur pr�fen"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "Liste der Schl�ssel"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "Liste der Schl�ssel und ihrer Signaturen"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "list and check key signatures"
msgstr "Signaturen der Schl�ssel auflisten und pr�fen"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\""
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "Liste der geheimen Schl�ssel"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "Ein neues Schl�sselpaar erzeugen"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "remove keys from the public keyring"
msgstr "Schl�ssel aus dem �ff. Schl�sselbund entfernen"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
msgid "remove keys from the secret keyring"
msgstr "Schl�ssel aus dem geh. Schl�sselbund entfernen"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "Schl�ssel signieren"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "Schl�ssel nur f�r diesen Rechner signieren"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "Unterschreiben oder bearbeiten eines Schl."
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "Schl�ssel exportieren"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "Schl�ssel zu einem Schl�.server exportieren"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "Schl�ssel von einem Schl�.server importieren"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "search for keys on a key server"
msgstr "Schl�ssel auf einem Schl�.server suchen"
-#: g10/gpg.c:411
+#: g10/gpg.c:412
msgid "update all keys from a keyserver"
msgstr "alle Schl�ssel per Schl�.server aktualisieren"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "Schl�ssel importieren/kombinieren"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr "den Karten-Status ausgeben"
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr "Daten auf einer Karte �ndern"
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr "PIN einer Karte �ndern"
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr "�ndern der \"Trust\"-Datenbank"
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr "|algo [Dateien]|Message-Digests f�r die Dateien ausgeben"
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1138,51 +1138,51 @@ msgstr ""
"Optionen:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr "Ausgabe mit ASCII-H�lle versehen"
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|NAME|Verschl�sseln f�r NAME"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
msgid "use this user-id to sign or decrypt"
msgstr "Mit dieser User-ID signieren"
-#: g10/gpg.c:456
+#: g10/gpg.c:457
msgid "|N|set compress level N (0 disables)"
msgstr "Kompressionsstufe auf N setzen (0=keine)"
-#: g10/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr "Textmodus benutzen"
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "Als Ausgabedatei benutzen"
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "Detaillierte Informationen"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "Keine wirklichen �nderungen durchf�hren"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr "vor �berschreiben nachfragen"
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr "OpenPGP-Verhalten strikt beachten"
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr "PGP 2.x-kompatibele Botschaften erzeugen"
-#: g10/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1191,7 +1191,7 @@ msgstr ""
"(Auf der \"man\"-Seite ist eine vollst�ndige Liste aller Kommandos und "
"Optionen)\n"
-#: g10/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1211,17 +1211,17 @@ msgstr ""
" --list-keys [Namen] Schl�ssel anzeigen\n"
" --fingerprint [Namen] \"Fingerabdr�cke\" anzeigen\n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
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/gpg.c:778
+#: g10/gpg.c:780
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
-#: g10/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1231,7 +1231,7 @@ msgstr ""
"Signieren, pr�fen, verschl�sseln, entschl�sseln.\n"
"Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n"
-#: g10/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1239,73 +1239,73 @@ msgstr ""
"\n"
"Unterst�tzte Verfahren:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr "�ff.Schl�ssel: "
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr "Verschl�.: "
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr "Hash: "
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
msgid "Compression: "
msgstr "Komprimierung: "
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "Aufruf: gpg [Optionen] "
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "Widerspr�chliche Befehle\n"
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
-#: g10/gpg.c:1259
+#: g10/gpg.c:1261
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverh�ltnis des Home-Verzeichnis `%s'\n"
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverh�ltnis der Konfigurationsdatei `%s'\n"
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverh�ltnis auf die Erweiterung `%s'\n"
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
-#: g10/gpg.c:1277
+#: g10/gpg.c:1279
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte auf die Erweiterung `%s'\n"
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"WARNUNG: Unsicheres Besitzverh�ltnis des umgebenden Verzeichnisses f�r Home-"
"Verzeichnis `%s'\n"
-#: g10/gpg.c:1286
+#: g10/gpg.c:1288
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1313,20 +1313,20 @@ msgstr ""
"WARNUNG: Unsicheres Besitzverh�ltnis des umgebenden Verzeichnisses der "
"Konfigurationsdatei `%s'\n"
-#: g10/gpg.c:1289
+#: g10/gpg.c:1291
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
"WARNUNG: Unsicheres Besitzverh�ltnis des umgebenden Verzeichnisses `%s'\n"
-#: g10/gpg.c:1295
+#: g10/gpg.c:1297
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses des Home-"
"Verzeichnisses `%s'\n"
-#: g10/gpg.c:1298
+#: g10/gpg.c:1300
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1334,494 +1334,494 @@ msgstr ""
"WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
"Konfigurationsdatei `%s'\n"
-#: g10/gpg.c:1301
+#: g10/gpg.c:1303
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
"WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses auf "
"Erweiterung `%s'\n"
-#: g10/gpg.c:1442
+#: g10/gpg.c:1444
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "Unbekanntes Konfigurationselement `%s'\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
msgid "show all notations during signature listings"
msgstr "Alle Notationen mit den Signaturen anlisten"
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
msgid "show preferred keyserver URLs during signature listings"
msgstr "Der bevorzugten Schl�sselserver mit den Signaturen anlisten"
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
msgid "show the keyring name in key listings"
msgstr "Anzeigen des Schl�sselbundes, in dem ein Schl�ssel drin ist"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
msgid "show expiration dates during signature listings"
msgstr "Das Ablaufdatum mit den Signaturen anlisten"
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
-#: g10/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr "Optionendatei '%s': %s\n"
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr "Optionen werden aus '%s' gelesen\n"
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "Hinweis: %s ist nicht f�r den �blichen Gebrauch gedacht!\n"
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, c-format
msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr ""
"Verschl�sselungserweiterung `%s' wurde wegen unsicherer Zugriffsrechte nicht "
"geladen\n"
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "`%s' ist kein g�ltiges Unterschriftablaufdatum\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "`%s' ist kein g�ltiger Zeichensatz\n"
-#: g10/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
msgid "could not parse keyserver URL\n"
msgstr "Schl�sselserver-URL konnte nicht analysiert werden\n"
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ung�ltige Schl�sselserver-Option\n"
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
msgid "invalid keyserver options\n"
msgstr "Ung�ltige Schl�sselserver-Option\n"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ung�ltige Import-Option\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
msgid "invalid import options\n"
msgstr "Ung�ltige Import-Option\n"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ung�ltige Export-Option.\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
msgid "invalid export options\n"
msgstr "Ung�ltige Export-Option\n"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ung�ltige Listen-Option.\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
msgid "invalid list options\n"
msgstr "Ung�ltige Listen-Option\n"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
msgid "show all notations during signature verification"
msgstr "Alle Notationen wahrend der Signaturpr�fung anzeigen"
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
"Die URL f�r den bevorzugten Schl�sselserver w�hrend der Signaturpr�fung "
"anzeigen"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
msgid "show user ID validity during signature verification"
msgstr "Die G�ltigkeit der User-ID w�hrend der Signaturpr�fung anzeigen"
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ung�ltige �berpr�funs-Option.\n"
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
msgid "invalid verify options\n"
msgstr "Ung�ltige �berpr�fungs-Option\n"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "Der Ausf�hrungspfad konnte nicht auf %s gesetzt werden.\n"
-#: g10/gpg.c:2764
+#: g10/gpg.c:2768
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ung�ltige �berpr�funs-Option.\n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
msgid "WARNING: program may create a core file!\n"
msgstr "WARNUNG: Programm k�nnte eine core-dump-Datei schreiben!\n"
-#: g10/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "WARNUNG: %s ersetzt %s\n"
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2865
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "HINWEIS: %s ist in dieser Version nicht vorhanden\n"
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
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/gpg.c:2896
+#: g10/gpg.c:2900
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/gpg.c:2902
+#: g10/gpg.c:2906
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/gpg.c:2915
+#: g10/gpg.c:2919
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/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr "Das ausgew�hlte Verschl�sselungsverfahren ist ung�ltig\n"
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
msgid "selected compression algorithm is invalid\n"
msgstr "Das ausgew�hlte Komprimierungsverfahren ist ung�ltig\n"
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
msgid "selected certification digest algorithm is invalid\n"
msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed m�ssen gr��er als 0 sein\n"
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
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/gpg.c:3021
+#: g10/gpg.c:3025
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/gpg.c:3023
+#: g10/gpg.c:3027
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/gpg.c:3026
+#: g10/gpg.c:3030
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
-#: g10/gpg.c:3030
+#: g10/gpg.c:3034
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/gpg.c:3037
+#: g10/gpg.c:3041
msgid "invalid default preferences\n"
msgstr "ung�ltige Standard Voreinstellungen\n"
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
msgid "invalid personal cipher preferences\n"
msgstr "ung�ltige private Verschl�sselungsvoreinstellungen\n"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
msgid "invalid personal digest preferences\n"
msgstr "ung�ltige private Hashvoreinstellungen\n"
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
msgid "invalid personal compress preferences\n"
msgstr "ung�ltige private Komprimierungsvoreinstellungen\n"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s arbeitet noch nicht mit %s zusammen\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, 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/gpg.c:3139
+#: g10/gpg.c:3143
#, 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/gpg.c:3144
+#: g10/gpg.c:3148
#, 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/gpg.c:3246
+#: g10/gpg.c:3250
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
-#: g10/gpg.c:3257
+#: g10/gpg.c:3261
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/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [Dateiname]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [Dateiname]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "Symmetrische Entschl�sselung von `%s' fehlgeschlagen: %s\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [Dateiname]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [Dateiname]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
"--symmetric --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet werden\n"
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, 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/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--sign [Dateiname]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [Dateiname]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [Dateiname]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
"--symmetric --sign --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet "
"werden\n"
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, 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/gpg.c:3376
+#: g10/gpg.c:3380
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [Dateiname]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [Dateiname]"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [Dateiname]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key User-ID"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key User-ID"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key User-ID [Befehle]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
-#: g10/gpg.c:3556
+#: g10/gpg.c:3560
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "Senden an Schl�sselserver fehlgeschlagen: %s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "Empfangen vom Schl�sselserver fehlgeschlagen: %s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, c-format
msgid "key export failed: %s\n"
msgstr "Schl�sselexport fehlgeschlagen: %s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Suche auf dem Schl�sselserver fehlgeschlagen: %s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Refresh vom Schl�sselserver fehlgeschlagen: %s\n"
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
-#: g10/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "Ung�ltiges Hashverfahren '%s'\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[Dateiname]"
-#: g10/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr "Auf geht's - Botschaft eintippen ...\n"
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
msgid "the given certification policy URL is invalid\n"
msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ung�ltig\n"
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
msgid "the given signature policy URL is invalid\n"
msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
-#: g10/gpg.c:4193
+#: g10/gpg.c:4197
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
@@ -1846,7 +1846,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Ung�ltiger Schl�ssel %s, g�ltig gemacht per --allow-non-selfsigned-uid\n"
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr ""
@@ -2262,441 +2262,441 @@ msgstr "unbrauchbarer geheimer Schl�ssel"
msgid "remove as much as possible from key after import"
msgstr ""
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr "�berspringe den Block vom Typ %d\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu Schl�ssel bislang bearbeitet\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Anzahl insgesamt bearbeiteter Schl�ssel: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ignorierte neue Schl�ssel: %lu\n"
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " ohne User-ID: %lu\n"
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr " importiert: %lu"
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr " unver�ndert: %lu\n"
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr " neue User-IDs: %lu\n"
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr " neue Unterschl�ssel: %lu\n"
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr " neue Signaturen: %lu\n"
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr " neue Schl�sselwiderrufe: %lu\n"
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr " gelesene geheime Schl�ssel: %lu\n"
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " geheime Schl�ssel importiert: %lu\n"
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " unver�nderte geh.Schl.: %lu\n"
-#: g10/import.c:321
+#: g10/import.c:322
#, c-format
msgid " not imported: %lu\n"
msgstr " nicht importiert: %lu\n"
-#: g10/import.c:323
+#: g10/import.c:324
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " neue Signaturen: %lu\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " gelesene geheime Schl�ssel: %lu\n"
-#: g10/import.c:566
+#: g10/import.c:567
#, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr "WARNING: Schl�ssel %s hat Einstellungen zu nicht verf�gbaren\n"
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
#, fuzzy
msgid " algorithms on these user IDs:\n"
msgstr " Algorithmen f�r diese User IDs:\n"
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
-#: g10/import.c:619
+#: g10/import.c:620
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, fuzzy, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr "Das ausgew�hlte Komprimierungsverfahren ist ung�ltig\n"
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, c-format
msgid "key %s: no user ID\n"
msgstr "Schl�ssel %s: Keine User-ID\n"
-#: g10/import.c:749
+#: g10/import.c:750
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "Schl�ssel %s: PKS Unterschl�sseldefekt repariert\n"
-#: g10/import.c:764
+#: g10/import.c:765
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "Schl�ssel %s: Nicht eigenbeglaubigte User-ID `%s' �bernommen\n"
-#: g10/import.c:770
+#: g10/import.c:771
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "Schl�ssel %08lX: Keine g�ltigen User-IDs\n"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr "dies k�nnte durch fehlende Eigenbeglaubigung verursacht worden sein\n"
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel nicht gefunden: %s\n"
-#: g10/import.c:788
+#: g10/import.c:789
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "Schl�ssel %08lX: neuer Schl�ssel - �bersprungen\n"
-#: g10/import.c:797
+#: g10/import.c:798
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "kein schreibbarer Schl�sselbund gefunden: %s\n"
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr "Schreiben nach '%s'\n"
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
-#: g10/import.c:825
+#: g10/import.c:826
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel \"%s\" importiert\n"
-#: g10/import.c:849
+#: g10/import.c:850
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "Schl�ssel %08lX: Stimmt nicht mit unserer Kopie �berein\n"
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr ""
"Schl�ssel %08lX: der lokale originale Schl�sselblocks wurde nicht gefunden: %"
"s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr ""
"Schl�ssel %08lX: Lesefehler im lokalen originalen Schl�sselblocks: %s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "Schl�ssel %08lX: \"%s\" 1 neue User-ID\n"
-#: g10/import.c:914
+#: g10/import.c:915
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "Schl�ssel %08lX: \"%s\" %d neue User-IDs\n"
-#: g10/import.c:917
+#: g10/import.c:918
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "Schl�ssel %08lX: \"%s\" 1 neue Signatur\n"
-#: g10/import.c:920
+#: g10/import.c:921
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "Schl�ssel %08lX: \"%s\" %d neue Signaturen\n"
-#: g10/import.c:923
+#: g10/import.c:924
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "Schl�ssel %08lX: \"%s\" 1 neuer Unterschl�ssel\n"
-#: g10/import.c:926
+#: g10/import.c:927
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "Schl�ssel %08lX: \"%s\" %d neue Unterschl�ssel\n"
-#: g10/import.c:929
+#: g10/import.c:930
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "Schl�ssel %08lX: \"%s\" %d neue Signaturen\n"
-#: g10/import.c:932
+#: g10/import.c:933
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "Schl�ssel %08lX: \"%s\" %d neue Signaturen\n"
-#: g10/import.c:935
+#: g10/import.c:936
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "Schl�ssel %08lX: \"%s\" %d neue User-IDs\n"
-#: g10/import.c:938
+#: g10/import.c:939
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "Schl�ssel %08lX: \"%s\" %d neue User-IDs\n"
-#: g10/import.c:961
+#: g10/import.c:962
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "Schl�ssel %08lX: \"%s\" Nicht ge�ndert\n"
-#: g10/import.c:1124
+#: g10/import.c:1125
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr ""
"Schl�ssel %08lX: geheimer Schl�ssel mit ung�ltiger Verschl�sselung %d - "
"�bersprungen\n"
-#: g10/import.c:1135
+#: g10/import.c:1136
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "Kein voreingestellter geheimer Schl�sselbund: %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "Schl�ssel %08lX: Geheimer Schl�ssel importiert\n"
-#: g10/import.c:1193
+#: g10/import.c:1194
#, fuzzy, c-format
msgid "key %s: already in secret keyring\n"
msgstr "Schl�ssel %08lX: Ist bereits im geheimen Schl�sselbund\n"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, fuzzy, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "Schl�ssel %08lX: geheimer Schl�ssel nicht gefunden: %s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"Schl�ssel %08lX: Kein �ffentlicher Schl�ssel - der Schl�sselwiderruf kann "
"nicht angebracht werden\n"
-#: g10/import.c:1276
+#: g10/import.c:1277
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - zur�ckgewiesen\n"
-#: g10/import.c:1308
+#: g10/import.c:1309
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "Schl�ssel %08lX: \"%s\" Widerrufzertifikat importiert\n"
-#: g10/import.c:1374
+#: g10/import.c:1375
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "Schl�ssel %08lX: Keine User-ID f�r Signatur\n"
-#: g10/import.c:1389
+#: g10/import.c:1390
#, fuzzy, c-format
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:1391
+#: g10/import.c:1392
#, fuzzy, c-format
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:1409
+#: g10/import.c:1410
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr ""
"Schl�ssel %08lX: Kein Unterschl�ssel f�r die Unterschl�sselanbindungs-"
"Beglaubigung\n"
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "Schl�ssel %08lX: Nicht unterst�tztes Public-Key-Verfahren\n"
-#: g10/import.c:1422
+#: g10/import.c:1423
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung\n"
-#: g10/import.c:1437
+#: g10/import.c:1438
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung entfernt\n"
-#: g10/import.c:1459
+#: g10/import.c:1460
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr ""
"Schl�ssel %08lX: Kein Unterschl�ssel f�r die Unterschl�sselwiderruf-"
"Beglaubigung\n"
-#: g10/import.c:1472
+#: g10/import.c:1473
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "Schl�ssel %08lX: Ung�ltiger Unterschl�sselwiderruf\n"
-#: g10/import.c:1487
+#: g10/import.c:1488
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr ""
"Schl�ssel %08lX: Mehrfacher Unterschl�ssel-Widerruf-Beglaubigung entfernt\n"
-#: g10/import.c:1529
+#: g10/import.c:1530
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "Schl�ssel %08lX: User-ID �bergangen '"
-#: g10/import.c:1550
+#: g10/import.c:1551
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
-#: g10/import.c:1577
+#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr ""
"Schl�ssel %08lX: Nicht exportf�hige Unterschrift (Klasse %02x) - �bergangen\n"
-#: g10/import.c:1587
+#: g10/import.c:1588
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "Schl�ssel %08lX: Widerrufzertifikat an falschem Platz - �bergangen\n"
-#: g10/import.c:1604
+#: g10/import.c:1605
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - �bergangen\n"
-#: g10/import.c:1618
+#: g10/import.c:1619
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "Schl�ssel %08lX: Widerrufzertifikat an falschem Platz - �bergangen\n"
-#: g10/import.c:1626
+#: g10/import.c:1627
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr ""
"Schl�ssel %08lX: unerwartete Unterschriftenklasse (0x%02x) - �bergangen\n"
-#: g10/import.c:1726
+#: g10/import.c:1727
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "Schl�ssel %08lX: Doppelte User-ID entdeckt - zusammengef�hrt\n"
-#: g10/import.c:1788
+#: g10/import.c:1789
#, fuzzy, c-format
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:1802
+#: g10/import.c:1803
#, 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:1861
+#: g10/import.c:1862
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "Schl�ssel %08lX: \"%s\" Widerrufzertifikat hinzugef�gt\n"
-#: g10/import.c:1895
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "Schl�ssel %08lX: \"direct-key\"-Signaturen hinzugef�gt\n"
-#: g10/import.c:2284
+#: g10/import.c:2285
#, fuzzy
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "�ffentliche Schl�ssel pa�t nicht zum geheimen Schl�ssel!\n"
-#: g10/import.c:2292
+#: g10/import.c:2293
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "�bersprungen: geheimer Schl�ssel bereits vorhanden\n"
-#: g10/import.c:2294
+#: g10/import.c:2295
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "�bersprungen: geheimer Schl�ssel bereits vorhanden\n"
@@ -3032,8 +3032,8 @@ msgstr ""
msgid "Really sign? (y/N) "
msgstr "Wirklich unterschreiben? (j/N) "
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "Beglaubigung fehlgeschlagen: %s\n"
@@ -3562,7 +3562,7 @@ msgstr ""
"k�nnte\n"
" bei einigen PGP-Versionen zur Zur�ckweisung des Schl�ssels f�hren.\n"
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Wollen Sie ihn immer noch hinzuf�gen? (j/N) "
@@ -3604,12 +3604,32 @@ msgstr "Nichts entfernt.\n"
msgid "invalid"
msgstr "ung�ltig"
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "User-ID \"%s\" ist widerrufen."
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "User-ID \"%s\" ist widerrufen."
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "User-ID \"%s\" ist widerrufen."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "User-ID \"%s\" ist bereits widerrufen\n"
+
+#: g10/keyedit.c:3252
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "User-ID \"%s\" ist bereits widerrufen\n"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3619,37 +3639,37 @@ msgstr ""
" Widerrufers k�nnte bei einigen PGP-Versionen zur Zur�ckweisung\n"
" des Schl�ssels f�hren.\n"
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3357
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 "
"hinzuf�gen.\n"
-#: g10/keyedit.c:3372
+#: g10/keyedit.c:3377
msgid "Enter the user ID of the designated revoker: "
msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3402
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:3412
+#: g10/keyedit.c:3417
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:3434
+#: g10/keyedit.c:3439
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:3453
+#: g10/keyedit.c:3458
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:3459
+#: g10/keyedit.c:3464
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3657,166 +3677,166 @@ msgstr ""
"M�chten Sie diesen Schl�ssel wirklich als vorgesehenen Widerrufer "
"deklarieren? (j/N): "
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3525
msgid "Please remove selections from the secret keys.\n"
msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schl�sseln.\n"
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3531
#, fuzzy
msgid "Please select at most one subkey.\n"
msgstr "Bitte w�hlen Sie h�chstens einen Zweitschl�ssel aus.\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "�ndern des Verfallsdatums des Zweitschl�ssels.\n"
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
msgid "Changing expiration time for the primary key.\n"
msgstr "�ndern des Verfallsdatums des Hauptschl�ssels.\n"
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3584
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:3595
+#: g10/keyedit.c:3600
msgid "No corresponding signature in secret ring\n"
msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3673
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "WARNUNG: Signaturunterschl�ssel %08lX hat keine R�cksignatur\n"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
msgid "Please select exactly one user ID.\n"
msgstr "Bitte genau eine User-ID ausw�hlen.\n"
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, 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:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Wollen Sie es wirklich benutzen? (j/N) "
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4132
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Wollen Sie es wirklich benutzen? (j/N) "
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4194
#, fuzzy
msgid "Enter the notation: "
msgstr "Beglaubigungs-\"Notation\": "
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "�berschreiben (j/N)? "
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, c-format
msgid "No user ID with index %d\n"
msgstr "Keine User-ID mit Index %d\n"
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4465
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Keine User-ID mit Index %d\n"
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Keine User-ID mit Index %d\n"
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "User-ID: \""
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " beglaubigt durch %08lX um %s%s%s\n"
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr " (nicht-exportierbar)"
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Diese Unterschrift ist seit %s verfallen.\n"
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Wollen Sie ihn immer noch widerrufen? (j/N) "
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4644
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Ein Widerrufszertifikat f�r diese Unterschrift erzeugen (j/N)"
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4671
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Sie haben folgende User-IDs beglaubigt:\n"
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
#, fuzzy
msgid " (non-revocable)"
msgstr " (nicht-exportierbar)"
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " widerrufen durch %08lX um %s\n"
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
msgid "Really create the revocation certificates? (y/N) "
msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr "Kein geheimer Schl�ssel\n"
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "User-ID \"%s\" ist bereits widerrufen\n"
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4863
#, 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:4922
+#: g10/keyedit.c:4927
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "User-ID \"%s\" ist bereits widerrufen\n"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "User-ID \"%s\" ist bereits widerrufen\n"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@ -4437,7 +4457,7 @@ msgstr "disable"
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "Ung�ltige export Option\n"
@@ -4472,108 +4492,108 @@ msgstr "suche nach \"%s\" auf HKP-Server %s\n"
msgid "searching for names from %s\n"
msgstr "suche nach \"%s\" auf HKP-Server %s\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "suche nach \"%s\" auf HKP-Server %s\n"
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "suche nach \"%s\" auf HKP-Server %s\n"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "suche nach \"%s\" auf HKP-Server %s\n"
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
#, fuzzy
msgid "no keyserver action!\n"
msgstr "Ung�ltige export Option\n"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr "Kein Schl�sselserver bekannt (Option --keyserver verwenden)\n"
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
#, fuzzy
msgid "keyserver timed out\n"
msgstr "Schl�sselserverfehler"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
#, fuzzy
msgid "keyserver internal error\n"
msgstr "Schl�sselserverfehler"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "Empfangen vom Schl�sselserver fehlgeschlagen: %s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s: Dies ist keine g�ltige Schl�ssel-ID\n"
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr ""
"WARNUNG: die tempor�re Datei (%s) `%s' konnte nicht entfernt werden: %s\n"
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "Schl�ssel %08lX wird von %s angefordert\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "Schl�ssel %08lX wird von %s angefordert\n"
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr ""
"WARNUNG: die tempor�re Datei (%s) `%s' konnte nicht entfernt werden: %s\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr ""
@@ -4988,12 +5008,12 @@ msgstr "Geben Sie die Passphrase ein\n"
msgid "cancelled by user\n"
msgstr "Abbruch durch Benutzer\n"
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
#, fuzzy
msgid "can't query passphrase in batch mode\n"
msgstr "Passphrase kann im Batchmodus nicht abgefragt werden\n"
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "Geben Sie die Passphrase ein: "
@@ -5017,7 +5037,7 @@ msgstr "%u-Bit %s Schl�ssel, ID %08lX, erzeugt %s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "Geben Sie die Passphrase nochmal ein: "
@@ -6523,18 +6543,6 @@ msgstr ""
#~ msgstr "Ausf�hren des Programms `%s' nicht m�glich: %s\n"
#, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "User-ID \"%s\" ist widerrufen."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "User-ID \"%s\" ist widerrufen."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "User-ID \"%s\" ist widerrufen."
-
-#, fuzzy
#~ msgid "No user IDs are removable.\n"
#~ msgstr "Keine User-ID f�r Schl�ssel\n"
diff --git a/po/el.po b/po/el.po
index 0c5e695a5..5b0716904 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: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\n"
"PO-Revision-Date: 2003-06-27 12:00+0200\n"
"Last-Translator: Dokianakis Theofanis <[email protected]>\n"
"Language-Team: Greek <[email protected]>\n"
@@ -40,7 +40,7 @@ msgstr "������� ��� �������� �������� ��� `%s'\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -78,7 +78,7 @@ msgstr "�������� ��������� ��� `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "��������: ��� ���� ��������� �� ������ random_seed\n"
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, c-format
@@ -307,77 +307,77 @@ msgstr ""
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "�� �������� ������ OpenPGP ��������.\n"
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr "��������: %s\n"
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr "�� ������ ����������� ���������: "
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr "����������� ���������: "
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr "�� ������ ����������� clearsig\n"
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr "����������� �� ���������������� ���������\n"
-#: g10/armor.c:568
+#: g10/armor.c:620
#, fuzzy
msgid "unexpected armor: "
msgstr "�� ����������� ��������:"
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr "�� ������ dash escaped ������: "
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "�� ������� radix64 ���������� %02x ���������\n"
-#: g10/armor.c:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr "������ ����� ������� (������� CRC)\n"
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr "������ ����� ������� (����� CRC)\n"
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr "����� ����� CRC\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "������ CRC: %06lx - %06lx\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "������ ����� ������� (��� �railer)\n"
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr "������ ��� ������ trailer\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr "�� �������� ������ OpenPGP ��������.\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "�� ������ ��������: � ������ ����� ���� ��� %d ����������\n"
-#: g10/armor.c:1167
+#: g10/armor.c:1219
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -469,7 +469,7 @@ msgstr "������ ��������� ������� ������: %s\n"
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@ -745,7 +745,7 @@ msgstr "����������� �� ����� ������: "
msgid "PIN not correctly repeated; try again"
msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -755,13 +755,13 @@ msgstr "�������� ��������� ��� `%s'\n"
msgid "--output doesn't work for this command\n"
msgstr "--output ��� ���������� ��� ���� ��� ������\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "�� ������ '%s' �� �������: %s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %s\n"
@@ -881,24 +881,24 @@ msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s ��������������� ���: \"%s\"\n"
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr "%s ��������������� ��������\n"
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "��������������� �� ������� ��������� %d\n"
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"�������������: �� ������ ��������������� �� ������� ������ ���\n"
"���������� ��������������.\n"
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
msgid "problem handling encrypted packet\n"
msgstr "�������� ��� �������� ���������������� �������\n"
@@ -1032,7 +1032,7 @@ msgstr "�������������: �� ������� ������ %08lX ��� ���� ���� SK checksum\n"
msgid "WARNING: nothing exported\n"
msgstr "�������������: ��� ����� ������ �������\n"
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -1040,128 +1040,128 @@ msgstr ""
"@�������:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[������]|���������� ���� ���������"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[������]|���������� ���� �� ���������������� ���������"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "���������� ���� �� ������������� ���������"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "������������� ���������"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr "������������� �� ����� ���� ����������� ����������"
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "���������������� ��������� (��������������)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "���������� ���� ���������"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "���������� ��� ������ ��������"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "���������� ��� ������ �������� ��� ���������"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
#, fuzzy
msgid "list and check key signatures"
msgstr "������� ��������� ��������"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "���������� ��� ������ �������� ��������"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "���������� ���� ���� ������� ��������"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "remove keys from the public keyring"
msgstr "�������� ��� �������� ��� �� ������� ����������"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
msgid "remove keys from the secret keyring"
msgstr "�������� ��� �������� ��� �� ������� ����������"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "�������� ���� ��������"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "�������� ���� �������� ������"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "�������� � ����������� ���� ��������"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr "���������� ���� �������������� ���������"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "������� ��������"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "������� �������� �� ��� ���������� ��������"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "�������� �������� ��� ��� ���������� ��������"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "search for keys on a key server"
msgstr "��������� �������� �� ��� ���������� ��������"
-#: g10/gpg.c:411
+#: g10/gpg.c:412
msgid "update all keys from a keyserver"
msgstr "�������� ���� ��� �������� ��� ��� ���������� ��������"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "��������/���������� ��������"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr "�������� ��� ����� ��������� ������������"
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr "|����� [������]| ���������� ���������� ��� ���������"
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1171,51 +1171,51 @@ msgstr ""
"��������:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr "���������� ascii ������������ ������"
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|�����|������������� ��� �����"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
msgid "use this user-id to sign or decrypt"
msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
-#: g10/gpg.c:456
+#: g10/gpg.c:457
msgid "|N|set compress level N (0 disables)"
msgstr "|N|���������� �������� ��������� N (0 �������������)"
-#: g10/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr "����� ��������� ���������� ��������"
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "����� �� ������� ������"
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "���������"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "�� �� ����� ������ ������"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr "������� ���� ��� ���������"
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1223,7 +1223,7 @@ msgstr ""
"@\n"
"(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
-#: g10/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1243,15 +1243,15 @@ msgstr ""
" --list-keys [�������] ���������� ��������\n"
" --fingerprint [�������] ���������� ������������ (fingerprints)\n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
msgid "Please report bugs to <[email protected]>.\n"
msgstr "��������� �� ���������� ��� <[email protected]>\n"
-#: g10/gpg.c:778
+#: g10/gpg.c:780
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "�����: gpg [��������] [������] (-h ��� �������)"
-#: g10/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1261,7 +1261,7 @@ msgstr ""
"��������, �������, ������������� � ����������������\n"
"� �������������� ���������� ��������� ��� �� �������� �������\n"
-#: g10/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1269,589 +1269,589 @@ msgstr ""
"\n"
"��������������� ����������:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr "�����������:"
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr "���������������: "
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr "Hash: "
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
msgid "Compression: "
msgstr "��������: "
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "�����: gpg [��������] "
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "������������� �������\n"
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, fuzzy, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
-#: g10/gpg.c:1259
+#: g10/gpg.c:1261
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
-#: g10/gpg.c:1277
+#: g10/gpg.c:1279
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
-#: g10/gpg.c:1286
+#: g10/gpg.c:1288
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr ""
"�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
-#: g10/gpg.c:1289
+#: g10/gpg.c:1291
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
"�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
-#: g10/gpg.c:1295
+#: g10/gpg.c:1297
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
-#: g10/gpg.c:1298
+#: g10/gpg.c:1300
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
-#: g10/gpg.c:1301
+#: g10/gpg.c:1303
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
-#: g10/gpg.c:1442
+#: g10/gpg.c:1444
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "������� ����������� ��������� \"%s\"\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
#, fuzzy
msgid "show all notations during signature listings"
msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
-#: g10/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "��������: �� �������������� ������ �������� `%s'\n"
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr "������ �������� `%s': %s\n"
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr "�������� �������� ��� `%s'\n"
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, fuzzy, c-format
msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr ""
"� �������� ��� ��������������� \"%s\" ��� ��������� ������ ��������\n"
"���������� ������\n"
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
-#: g10/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "�� ������� �������� ��������\n"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: �� ������� �������� ���������\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
msgid "invalid import options\n"
msgstr "�� ������� �������� ���������\n"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
msgid "invalid export options\n"
msgstr "�� ������� �������� ��������\n"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: �� ������� �������� ���������\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
#, fuzzy
msgid "invalid list options\n"
msgstr "�� ������� �������� ���������\n"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
#, fuzzy
msgid "show all notations during signature verification"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
#, fuzzy
msgid "invalid verify options\n"
msgstr "�� ������� �������� ��������\n"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "�������� ������� ��� exec-path �� %s\n"
-#: g10/gpg.c:2764
+#: g10/gpg.c:2768
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
msgid "WARNING: program may create a core file!\n"
msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
-#: g10/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "�������������: �� %s ����������� �� %s\n"
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "�� %s ��� ����������� �� �� %s!\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2865
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
-#: g10/gpg.c:2896
+#: g10/gpg.c:2900
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
"��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
"���������\n"
-#: g10/gpg.c:2902
+#: g10/gpg.c:2906
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
-#: g10/gpg.c:2915
+#: g10/gpg.c:2919
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
"� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
-#: g10/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
msgid "selected certification digest algorithm is invalid\n"
msgstr ""
"� ����������� ���������� ��������� ��� �����������\n"
"��� ����� �������\n"
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
#, fuzzy
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth ������ �� ����� ������ 1 ��� 255\n"
-#: g10/gpg.c:3021
+#: g10/gpg.c:3025
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "�� ������ default-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
-#: g10/gpg.c:3023
+#: g10/gpg.c:3027
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
-#: g10/gpg.c:3026
+#: g10/gpg.c:3030
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
-#: g10/gpg.c:3030
+#: g10/gpg.c:3034
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3041
msgid "invalid default preferences\n"
msgstr "�� ������� �����������\n"
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
msgid "invalid personal cipher preferences\n"
msgstr "�� ������� ����������� ���������� ���������������\n"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
msgid "invalid personal digest preferences\n"
msgstr "�� ������� ����������� ���������� ���������� ���������\n"
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
msgid "invalid personal compress preferences\n"
msgstr "�� ������� ����������� ���������� ���������� ���������\n"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, fuzzy, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
-#: g10/gpg.c:3139
+#: g10/gpg.c:3143
#, fuzzy, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr ""
"����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3148
#, fuzzy, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr ""
"����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
-#: g10/gpg.c:3246
+#: g10/gpg.c:3250
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "�������� ������������� ��� TrustDB: %s\n"
-#: g10/gpg.c:3257
+#: g10/gpg.c:3261
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"�������������: ������� ���������� (-r) ����� ����� ��������������\n"
"�������� ��������\n"
-#: g10/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [����� �������]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [����� �������]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "���������������� �������: %s\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [����� �������]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [����� �������]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
-#: g10/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--sign [����� �������]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [����� �������]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [����� �������]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
-#: g10/gpg.c:3376
+#: g10/gpg.c:3380
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [����� �������]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [����� �������]"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [����� �������]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [�������]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [user-id] [����������]"
-#: g10/gpg.c:3556
+#: g10/gpg.c:3560
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "keyserver �������� �������: %s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "keyserver ���� �������: %s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, c-format
msgid "key export failed: %s\n"
msgstr "������� �������� �������: %s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "keyserver ��������� �������: %s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "keyserver �������� �������: %s\n"
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "����������� �������: %s\n"
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "�������� �������: %s\n"
-#: g10/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "�� ������� ���������� hash `%s'\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[����� �������]"
-#: g10/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
msgid "the given certification policy URL is invalid\n"
msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
msgid "the given signature policy URL is invalid\n"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
-#: g10/gpg.c:4193
+#: g10/gpg.c:4197
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
@@ -1877,7 +1877,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"�� ������ ������ %08lX ����� ������ ��� �� --allow-non-selfsigned-uid\n"
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, fuzzy, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "������ ������� ��������� ��� �� ������� ��������� %08lX - �������\n"
@@ -2281,432 +2281,432 @@ msgstr "�� ��������������� ������� ������"
msgid "remove as much as possible from key after import"
msgstr ""
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr "��������� �������� ��� ����� %d\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu ������� ����� ����� ���� ������������\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr "��������� ������� ��� ��������������: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ��� ������� ��� �������������: %lu\n"
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " ����� user ID: %lu\n"
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr " ����������: %lu"
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr " ����������: %lu\n"
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr " ��� user ID: %lu\n"
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr " ��� ����������: %lu\n"
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr " ���� ���������: %lu\n"
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr " ���� ���������� ��������: %lu\n"
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr " ����������� ������� �������: %lu\n"
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " ���������� ������� �������: %lu\n"
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " ���������� ������� �������: %lu\n"
-#: g10/import.c:321
+#: g10/import.c:322
#, c-format
msgid " not imported: %lu\n"
msgstr " �� ����������: %lu\n"
-#: g10/import.c:323
+#: g10/import.c:324
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " ���� ���������: %lu\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " ����������� ������� �������: %lu\n"
-#: g10/import.c:566
+#: g10/import.c:567
#, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr ""
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
#, fuzzy
msgid " algorithms on these user IDs:\n"
msgstr "����� ��������� ���� �� user ID:\n"
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
-#: g10/import.c:619
+#: g10/import.c:620
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s ��������, ���������� ��������� %s\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
-#: g10/import.c:749
+#: g10/import.c:750
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "������ %08lX: ����������� ��������� ����������� HKP\n"
-#: g10/import.c:764
+#: g10/import.c:765
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "������ %08lX: ����� �� ����-������������� user ID '%s'\n"
-#: g10/import.c:770
+#: g10/import.c:771
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "������ %08lX: ��� ���� ������ user ID\n"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr "���� ������ �� ������� ��� ��� ������ ������������\n"
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "������ %08lX: ������� ������ ��� �� �������: %s\n"
-#: g10/import.c:788
+#: g10/import.c:789
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "������ %08lX: ��� ������ - ������������\n"
-#: g10/import.c:797
+#: g10/import.c:798
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "��� ������� ��������� ����������: %s\n"
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr "������� ��� `%s'\n"
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "�������� �������� ��� ����������� `%s': %s\n"
-#: g10/import.c:825
+#: g10/import.c:826
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "������ %08lX: �� ������� ������ \"%s\" ���� ��������\n"
-#: g10/import.c:849
+#: g10/import.c:850
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "������ %08lX: ��� ��������� �� �� ��������� ���\n"
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "������ %08lX: �������� ���������� ��� ������� �������� ��������: %s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "������ %08lX: �������� ��������� ��� ������� �������� ��������: %s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "������ %08lX: \"%s\" 1 ��� user ID\n"
-#: g10/import.c:914
+#: g10/import.c:915
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
-#: g10/import.c:917
+#: g10/import.c:918
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "������ %08lX: \"%s\" 1 ��� ��������\n"
-#: g10/import.c:920
+#: g10/import.c:921
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
-#: g10/import.c:923
+#: g10/import.c:924
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "������ %08lX: \"%s\" 1 ��� ���������\n"
-#: g10/import.c:926
+#: g10/import.c:927
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "������ %08lX: \"%s\" %d ��� ����������\n"
-#: g10/import.c:929
+#: g10/import.c:930
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
-#: g10/import.c:932
+#: g10/import.c:933
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
-#: g10/import.c:935
+#: g10/import.c:936
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
-#: g10/import.c:938
+#: g10/import.c:939
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
-#: g10/import.c:961
+#: g10/import.c:962
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "������ %08lX: \"%s\" ����������\n"
-#: g10/import.c:1124
+#: g10/import.c:1125
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "������ %08lX: ������� ������ �� ����� ��������. %d - ������������\n"
-#: g10/import.c:1135
+#: g10/import.c:1136
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "��� ������� �������������� ����������: %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "������ %08lX: ������� ������ ���������\n"
-#: g10/import.c:1193
+#: g10/import.c:1194
#, fuzzy, c-format
msgid "key %s: already in secret keyring\n"
msgstr "������ %08lX: ��� ��� ������� ����������\n"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, fuzzy, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "������ %08lX: �� ������� �� ������� ������: %s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"������ %08lX: ��� ������� ������ - �������� ��������� �������������� "
"���������\n"
-#: g10/import.c:1276
+#: g10/import.c:1277
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "������ %08lX: �� ������ ������������� ���������: %s - ��������\n"
-#: g10/import.c:1308
+#: g10/import.c:1309
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "������ %08lX: \"%s\" ������������� ��������� ���������\n"
-#: g10/import.c:1374
+#: g10/import.c:1375
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "������ %08lX: ��� ������� user ID ��� ��� ��������\n"
-#: g10/import.c:1389
+#: g10/import.c:1390
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"������ %08lX: �� ��������������� ���������� �������� �������� ��� user id \"%"
"s\"\n"
-#: g10/import.c:1391
+#: g10/import.c:1392
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "������ %08lX: �� ������ ����-�������� ��� user id \"%s\"\n"
-#: g10/import.c:1409
+#: g10/import.c:1410
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� ��������\n"
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "������ %08lX: �� ��������������� ���������� �������� ��������\n"
-#: g10/import.c:1422
+#: g10/import.c:1423
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "������ %08lX: �� ������ �������� �����������\n"
-#: g10/import.c:1437
+#: g10/import.c:1438
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
-#: g10/import.c:1459
+#: g10/import.c:1460
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "������ %08lX: ��� ������� ��������� ��� ��� �������� ��������\n"
-#: g10/import.c:1472
+#: g10/import.c:1473
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "������ %08lX: �� ������ �������� �����������\n"
-#: g10/import.c:1487
+#: g10/import.c:1488
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
-#: g10/import.c:1529
+#: g10/import.c:1530
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "������ %08lX: ������������ user ID '"
-#: g10/import.c:1550
+#: g10/import.c:1551
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "������ %08lX: ������������ ���������\n"
-#: g10/import.c:1577
+#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "������ %08lX: �� ��������� �������� (����� %02x) - ������������\n"
-#: g10/import.c:1587
+#: g10/import.c:1588
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr ""
"������ %08lX: �� ������������� ��������� �� ����� ������ - ������������\n"
-#: g10/import.c:1604
+#: g10/import.c:1605
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "������ %08lX: �� ������ ������������� ���������: %s - ������������\n"
-#: g10/import.c:1618
+#: g10/import.c:1619
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr ""
"������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
-#: g10/import.c:1626
+#: g10/import.c:1627
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "������ %08lX: �� ����������� ����� ��������� (0x%02x) - ������������\n"
-#: g10/import.c:1726
+#: g10/import.c:1727
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "������ %08lX: ����������� ����� user ID - ��������\n"
-#: g10/import.c:1788
+#: g10/import.c:1789
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"�������������: ������ %08lX ������ �� ���������: ���� �������� ��������� %"
"08lX\n"
-#: g10/import.c:1802
+#: g10/import.c:1803
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"�������������: ������ %08lX ������ �� ���������: �� ������ ��������� %08lX\n"
"��� ����� �����.\n"
-#: g10/import.c:1861
+#: g10/import.c:1862
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "������ %08lX: \"%s\" ������������� ��������� ����������\n"
-#: g10/import.c:1895
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "������ %08lX: ����� �������� �������� ����������\n"
-#: g10/import.c:2284
+#: g10/import.c:2285
#, fuzzy
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "�� ������� ������ ��� ��������� �� �� �������!\n"
-#: g10/import.c:2292
+#: g10/import.c:2293
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "������������: ������� ������ ��� �����\n"
-#: g10/import.c:2294
+#: g10/import.c:2295
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "������������: ������� ������ ��� �����\n"
@@ -3035,8 +3035,8 @@ msgstr ""
msgid "Really sign? (y/N) "
msgstr "������� �� ���������; "
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "� �������� �������: %s\n"
@@ -3567,7 +3567,7 @@ msgstr ""
"�������������: ���� ����� ��� ������ ����� PGP2. � �������� ���� photo ID\n"
" ������ �� ����� ������� �������� PGP �� �� ����������.\n"
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
msgid "Are you sure you still want to add it? (y/N) "
msgstr "������� ����� ������ �� �� ����������; (y/N) "
@@ -3610,12 +3610,32 @@ msgstr "������ ��� �����������.\n"
msgid "invalid"
msgstr "�� ������ ��������"
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "�� user ID \"%s\" ����������."
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "�� user ID \"%s\" ����������."
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "�� user ID \"%s\" ����������."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "�� user ID \"%s\" ���� ��� ���������\n"
+
+#: g10/keyedit.c:3252
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "�� user ID \"%s\" ���� ��� ���������\n"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3625,38 +3645,38 @@ msgstr ""
" ������������ �������� ������ �� ����� ������� �������� PGP\n"
" �� �� ����������.\n"
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3357
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"��� �������� �� ���������� ��� ����������� �������� �� ������ ����� PGP2.x.\n"
-#: g10/keyedit.c:3372
+#: g10/keyedit.c:3377
msgid "Enter the user ID of the designated revoker: "
msgstr "�������������� �� user ID ��� ����������� ��������: "
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3402
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3417
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
"�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
-#: g10/keyedit.c:3434
+#: g10/keyedit.c:3439
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr ""
"�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3458
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"�������������: ��� ������� ��� ������ ��� ���������� �������� ��� ������ �� "
"���������!\n"
-#: g10/keyedit.c:3459
+#: g10/keyedit.c:3464
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3664,168 +3684,168 @@ msgstr ""
"����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
"N): "
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3525
msgid "Please remove selections from the secret keys.\n"
msgstr "�������� ��������� ��� �������� ��� �� ������� �������.\n"
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3531
#, fuzzy
msgid "Please select at most one subkey.\n"
msgstr "�������� �������� �� ���� ��� ���������� ������.\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "������ ����������� ����� ��� ��� ���������� ������.\n"
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
msgid "Changing expiration time for the primary key.\n"
msgstr "������ ����������� ����� ��� ��� �������� ������.\n"
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3584
msgid "You can't change the expiration date of a v3 key\n"
msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3600
msgid "No corresponding signature in secret ring\n"
msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3673
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr ""
"�������������: �� ��������� ��������� %08lX ��� ���� ���' ������������� "
"������������\n"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
msgid "Please select exactly one user ID.\n"
msgstr "������ �� ��������� ������� ��� user ID.\n"
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "������������ � v3 ����-�������� ��� user id \"%s\"\n"
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "������� ������ ����� �� �� ���������������; (y/N) "
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4132
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "������� ������ ����� �� �� ���������������; (y/N) "
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4194
#, fuzzy
msgid "Enter the notation: "
msgstr "�������� ���������: "
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "��������� (y/N); "
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, c-format
msgid "No user ID with index %d\n"
msgstr "��� ������� user ID �� ������ %d\n"
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4465
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "��� ������� user ID �� ������ %d\n"
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "��� ������� user ID �� ������ %d\n"
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "user ID: \""
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " ����������� ��� %08lX ���� %s%s%s\n"
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr " (��-���������)"
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, c-format
msgid "This signature expired on %s.\n"
msgstr "���� � �������� ����� ���� %s.\n"
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "������� ������ �� ��������� ���� �� ������; "
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4644
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4671
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "����� ��������� ���� �� user ID:\n"
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
#, fuzzy
msgid " (non-revocable)"
msgstr " (��-���������)"
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " ���������� ��� %08lX ���� %s\n"
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr "��������� �� ����������� ����� ��� ���������:\n"
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
msgid "Really create the revocation certificates? (y/N) "
msgstr "������� �� ������������� �� ������������� ���������; (y/N)"
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr "������ ������� ������\n"
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "�� user ID \"%s\" ���� ��� ���������\n"
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4863
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"�������������: ��� �������� user ID ���� ���������� %d ������� ��� ������\n"
-#: g10/keyedit.c:4922
+#: g10/keyedit.c:4927
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "�� user ID \"%s\" ���� ��� ���������\n"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "�� user ID \"%s\" ���� ��� ���������\n"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, 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"
@@ -4452,7 +4472,7 @@ msgstr "disable"
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "�� ������� �������� ��������\n"
@@ -4487,106 +4507,106 @@ msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
msgid "searching for names from %s\n"
msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"����������� �� �� ������ ��� %08lX ���� %s\n"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
#, fuzzy
msgid "no keyserver action!\n"
msgstr "�� ������� �������� ��������\n"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
#, fuzzy
msgid "keyserver timed out\n"
msgstr "������ ���������� ��������"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
#, fuzzy
msgid "keyserver internal error\n"
msgstr "������ ���������� ��������"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "keyserver ���� �������: %s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "������ �������� %08lX ��� �� %s\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "������ �������� %08lX ��� �� %s\n"
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
@@ -4997,12 +5017,12 @@ msgstr "�������������� �� ����� ������\n"
msgid "cancelled by user\n"
msgstr "��������� ��� �� ������\n"
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
#, fuzzy
msgid "can't query passphrase in batch mode\n"
msgstr "�������� �������� ��� ����� ������ �� ��������� ������\n"
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "�������������� �� ����� ������: "
@@ -5026,7 +5046,7 @@ msgstr "%u-bit %s ������, ID %08lX, ���������� %s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "����������� �� ����� ������: "
@@ -6503,18 +6523,6 @@ msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
#~ msgstr "�������� ��������� ��� %s \"%s\": %s\n"
#, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "�� user ID \"%s\" ����������."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "�� user ID \"%s\" ����������."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "�� user ID \"%s\" ����������."
-
-#, fuzzy
#~ msgid "No user IDs are removable.\n"
#~ msgstr "�� user ID \"%s\" ���� ��� ���������\n"
diff --git a/po/eo.po b/po/eo.po
index fc6d20e01..8da95983d 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: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\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"
@@ -40,7 +40,7 @@ msgstr "skribas sekretan �losilon al '%s'\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -77,7 +77,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:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, c-format
@@ -304,77 +304,77 @@ msgstr ""
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr "kiraso: %s\n"
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr "nevalida kiraso�apo: "
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr "kiraso�apo: "
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr "nevalida �apo de klarteksta subskribo\n"
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr "ingitaj klartekstaj subskriboj\n"
-#: g10/armor.c:568
+#: g10/armor.c:620
#, fuzzy
msgid "unexpected armor: "
msgstr "neatendita kiraso:"
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr "nevalida strek-eskapita linio: "
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "nevalida signo %02x en bazo 64 ignorita\n"
-#: g10/armor.c:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr "tro frua dosierfino (nenia CRC)\n"
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr "tro frua dosierfino (en CRC)\n"
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr "misformita CRC\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC-eraro; %06lx - %06lx\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "tro frua dosierfino (en vosto)\n"
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr "eraro en vostolinio\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "nevalida kiraso: linio pli longa ol %d signojn\n"
-#: g10/armor.c:1167
+#: g10/armor.c:1219
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -466,7 +466,7 @@ msgstr "skribas publikan �losilon al '%s'\n"
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr "eraro dum legado de '%s': %s\n"
@@ -745,7 +745,7 @@ msgstr "Ripetu pasfrazon: "
msgid "PIN not correctly repeated; try again"
msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -755,13 +755,13 @@ msgstr "ne povas malfermi '%s'\n"
msgid "--output doesn't work for this command\n"
msgstr "--output ne funkcias por �i tiu komando\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "�losilo '%s' ne trovita: %s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %s\n"
@@ -870,23 +870,23 @@ msgstr "Tiu komando ne eblas en la re�imo %s.\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s-�ifrita por: %s\n"
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr "%s-�ifritaj datenoj\n"
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "�ifrita per nekonata metodo %d\n"
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"AVERTO: mesa�o estis �ifrita per malforta �losilo en la simetria �ifro.\n"
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
msgid "problem handling encrypted packet\n"
msgstr "problemo �e traktado de �ifrita paketo\n"
@@ -1014,7 +1014,7 @@ msgstr ""
msgid "WARNING: nothing exported\n"
msgstr "AVERTO: nenio estis eksportita\n"
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -1022,128 +1022,128 @@ msgstr ""
"@Komandoj:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[dosiero]|fari subskribon"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[dosiero]|fari klartekstan subskribon"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "fari apartan subskribon"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "�ifri datenojn"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr "�ifri nur kun simetria �ifro"
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "mal�ifri datenojn (implicita elekto)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "kontroli subskribon"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "listigi �losilojn"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "listigi �losilojn kaj subskribojn"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
#, fuzzy
msgid "list and check key signatures"
msgstr "kontroli �losilsubskribojn"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "listigi �losilojn kaj fingro�purojn"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "listigi sekretajn �losilojn"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "krei novan �losilparon"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "remove keys from the public keyring"
msgstr "forigi �losilojn de la publika �losilaro"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
msgid "remove keys from the secret keyring"
msgstr "forigi �losilojn de la sekreta �losilaro"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "subskribi �losilon"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "subskribi �losilon loke"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "subskribi a� redakti �losilon"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr "krei revokatestilon"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "eksporti �losilojn"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "eksporti �losilojn al �losilservilo"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "importi �losilojn de �losilservilo"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "search for keys on a key server"
msgstr "ser�i �losilojn �e �losilservilo"
-#: g10/gpg.c:411
+#: g10/gpg.c:412
msgid "update all keys from a keyserver"
msgstr "aktualigi �iujn �losilojn de �losilservilo"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "importi/kunfandi �losilojn"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr "aktualigi la fido-datenaron"
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1153,51 +1153,51 @@ msgstr ""
"Opcioj:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr "krei eligon en askia kiraso"
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|NOMO|�ifri por NOMO"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
msgid "use this user-id to sign or decrypt"
msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
-#: g10/gpg.c:456
+#: g10/gpg.c:457
msgid "|N|set compress level N (0 disables)"
msgstr "|N|difini densig-nivelon N (0=nenia)"
-#: g10/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr "uzi tekstan re�imon"
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "uzi dosieron por eligo"
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "detala eligo"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "fari neniajn �an�ojn"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr ""
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1205,7 +1205,7 @@ msgstr ""
"@\n"
"(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
-#: g10/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1225,15 +1225,15 @@ msgstr ""
" --list-keys [nomoj] montri �losilojn\n"
" --fingerprint [nomoj] montri fingro�purojn\n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
-#: g10/gpg.c:778
+#: g10/gpg.c:780
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
-#: g10/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1243,7 +1243,7 @@ msgstr ""
"subskribi, kontroli, �ifri a� mal�ifri\n"
"implicita operacio dependas de la enigataj datenoj\n"
-#: g10/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1251,584 +1251,584 @@ msgstr ""
"\n"
"Realigitaj metodoj:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr ""
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr ""
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr ""
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
#, fuzzy
msgid "Compression: "
msgstr "Komento: "
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "uzado: gpg [opcioj] "
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "malkongruaj komandoj\n"
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr ""
-#: g10/gpg.c:1259
+#: g10/gpg.c:1261
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
-#: g10/gpg.c:1277
+#: g10/gpg.c:1279
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
-#: g10/gpg.c:1286
+#: g10/gpg.c:1288
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
-#: g10/gpg.c:1289
+#: g10/gpg.c:1291
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
-#: g10/gpg.c:1295
+#: g10/gpg.c:1297
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
-#: g10/gpg.c:1298
+#: g10/gpg.c:1300
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
-#: g10/gpg.c:1301
+#: g10/gpg.c:1303
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
-#: g10/gpg.c:1442
+#: g10/gpg.c:1444
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "%s: nova opcio-dosiero kreita\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Mankas responda subskribo en sekreta �losilaro\n"
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "montri, en kiu �losilaro estas listigita �losilo"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Mankas responda subskribo en sekreta �losilaro\n"
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, fuzzy, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
-#: g10/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr "opcio-dosiero '%s': %s\n"
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr "legas opciojn el '%s'\n"
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTO: %s ne estas por normala uzado!\n"
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, c-format
msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr ""
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s ne estas valida signaro\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s ne estas valida signaro\n"
-#: g10/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "ne povis analizi URI de �losilservilo\n"
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "nevalida �losilaro"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, fuzzy, c-format
msgid "%s:%d: invalid import options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
#, fuzzy
msgid "invalid import options\n"
msgstr "nevalida kiraso"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, fuzzy, c-format
msgid "%s:%d: invalid export options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
#, fuzzy
msgid "invalid export options\n"
msgstr "nevalida �losilaro"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
#, fuzzy
msgid "invalid list options\n"
msgstr "nevalida kiraso"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ne estas valida signaro\n"
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ne estas valida signaro\n"
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
#, fuzzy
msgid "invalid verify options\n"
msgstr "nevalida �losilaro"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr ""
-#: g10/gpg.c:2764
+#: g10/gpg.c:2768
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTO: programo povas krei core-dosieron!\n"
-#: g10/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVERTO: %s nuligas %s\n"
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ne eblas kun %s!\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ne havas sencon kun %s!\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2865
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "skribas sekretan �losilon al '%s'\n"
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
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/gpg.c:2896
+#: g10/gpg.c:2900
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/gpg.c:2902
+#: g10/gpg.c:2906
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/gpg.c:2915
+#: g10/gpg.c:2919
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "�ifri mesa�on kun --pgp2 postulas la �ifron IDEA\n"
-#: g10/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr "elektita �ifrad-metodo ne validas\n"
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr "elektita kompendi-metodo ne validas\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "elektita �ifrad-metodo ne validas\n"
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
#, fuzzy
msgid "selected certification digest algorithm is invalid\n"
msgstr "elektita kompendi-metodo ne validas\n"
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed devas esti pli granda ol 0\n"
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed devas esti pli granda ol 1\n"
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
#, 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/gpg.c:3021
+#: g10/gpg.c:3025
#, 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/gpg.c:3023
+#: g10/gpg.c:3027
#, 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/gpg.c:3026
+#: g10/gpg.c:3030
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
-#: g10/gpg.c:3030
+#: g10/gpg.c:3034
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3041
#, fuzzy
msgid "invalid default preferences\n"
msgstr "nevalidaj preferoj\n"
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
#, fuzzy
msgid "invalid personal cipher preferences\n"
msgstr "nevalidaj preferoj\n"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
#, fuzzy
msgid "invalid personal digest preferences\n"
msgstr "nevalidaj preferoj\n"
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
#, fuzzy
msgid "invalid personal compress preferences\n"
msgstr "nevalidaj preferoj\n"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ne havas sencon kun %s!\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, fuzzy, c-format
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/gpg.c:3139
+#: g10/gpg.c:3143
#, fuzzy, c-format
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/gpg.c:3144
+#: g10/gpg.c:3148
#, fuzzy, c-format
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/gpg.c:3246
+#: g10/gpg.c:3250
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
-#: g10/gpg.c:3257
+#: g10/gpg.c:3261
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
-#: g10/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [dosiero]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [dosiero]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "mal�ifrado malsukcesis: %s\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [dosiero]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, 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/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--sign [dosiero]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, 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/gpg.c:3376
+#: g10/gpg.c:3380
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [dosiero]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [dosiero]"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [dosiero]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key uzantidentigilo"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key uzantidentigilo"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key uzantidentigilo [komandoj]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
-#: g10/gpg.c:3556
+#: g10/gpg.c:3560
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "get_dir_record: search_record malsukcesis: %s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "elkirasigo malsukcesis: %s\n"
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
-#: g10/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "nevalida kompendi-metodo '%s'\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[dosiero]"
-#: g10/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr "Ektajpu vian mesa�on ...\n"
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
msgid "the given certification policy URL is invalid\n"
msgstr "la donita gvidlinia URL por atestado ne validas\n"
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
msgid "the given signature policy URL is invalid\n"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
-#: g10/gpg.c:4193
+#: g10/gpg.c:4197
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@ -1853,7 +1853,7 @@ msgstr ""
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "Nevalida �losilo %08lX validigita per --always-trust\n"
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, fuzzy, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
@@ -2246,422 +2246,422 @@ msgstr "neuzebla sekreta �losilo"
msgid "remove as much as possible from key after import"
msgstr ""
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr "ignoras blokon de speco %d\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu �losiloj jam traktitaj\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr " Nombro traktita entute: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ignoritaj novaj �losiloj: %lu\n"
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sen uzantidentigilo: %lu\n"
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr " importitaj: %lu"
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr " ne�an�itaj: %lu\n"
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr " novaj uzantidentigiloj: %lu\n"
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr " novaj sub�losiloj: %lu\n"
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr " novaj subskriboj: %lu\n"
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr " novaj �losilrevokoj: %lu\n"
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr " sekretaj �losiloj legitaj: %lu\n"
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "sekretaj �losiloj importitaj: %lu\n"
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "sekretaj �losiloj ne�an�itaj: %lu\n"
-#: g10/import.c:321
+#: g10/import.c:322
#, fuzzy, c-format
msgid " not imported: %lu\n"
msgstr " importitaj: %lu"
-#: g10/import.c:323
+#: g10/import.c:324
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " novaj subskriboj: %lu\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " sekretaj �losiloj legitaj: %lu\n"
-#: g10/import.c:566
+#: g10/import.c:567
#, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr ""
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
#, fuzzy
msgid " algorithms on these user IDs:\n"
msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
-#: g10/import.c:619
+#: g10/import.c:620
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s-subskribo de: %s\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "�losilo %08lX: mankas uzantidentigilo\n"
-#: g10/import.c:749
+#: g10/import.c:750
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
-#: g10/import.c:764
+#: g10/import.c:765
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "�losilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
-#: g10/import.c:770
+#: g10/import.c:771
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
-#: g10/import.c:788
+#: g10/import.c:789
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "�losilo %08lX: nova �losilo - ignorita\n"
-#: g10/import.c:797
+#: g10/import.c:798
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "neniu skribebla �losilaro trovita: %s\n"
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr "skribas al '%s'\n"
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "eraro dum skribado de �losilaro '%s': %s\n"
-#: g10/import.c:825
+#: g10/import.c:826
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "�losilo %08lX: publika �losilo importita\n"
-#: g10/import.c:849
+#: g10/import.c:850
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "�losilo %08lX: diferencas de nia kopio\n"
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "�losilo %08lX: ne povas trovi originalan �losilblokon: %s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "�losilo %08lX: ne povas legi originalan �losilblokon: %s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
-#: g10/import.c:914
+#: g10/import.c:915
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
-#: g10/import.c:917
+#: g10/import.c:918
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "�losilo %08lX: 1 nova subskribo\n"
-#: g10/import.c:920
+#: g10/import.c:921
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "�losilo %08lX: %d novaj subskriboj\n"
-#: g10/import.c:923
+#: g10/import.c:924
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "�losilo %08lX: 1 nova sub�losilo\n"
-#: g10/import.c:926
+#: g10/import.c:927
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
-#: g10/import.c:929
+#: g10/import.c:930
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "�losilo %08lX: %d novaj subskriboj\n"
-#: g10/import.c:932
+#: g10/import.c:933
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "�losilo %08lX: %d novaj subskriboj\n"
-#: g10/import.c:935
+#: g10/import.c:936
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
-#: g10/import.c:938
+#: g10/import.c:939
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
-#: g10/import.c:961
+#: g10/import.c:962
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "�losilo %08lX: ne �an�ita\n"
-#: g10/import.c:1124
+#: g10/import.c:1125
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
-#: g10/import.c:1135
+#: g10/import.c:1136
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "skribas sekretan �losilon al '%s'\n"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "mankas implicita sekreta �losilaro: %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "�losilo %08lX: sekreta �losilo importita\n"
-#: g10/import.c:1193
+#: g10/import.c:1194
#, fuzzy, c-format
msgid "key %s: already in secret keyring\n"
msgstr "�losilo %08lX: jam en sekreta �losilaro\n"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, fuzzy, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "�losilo %08lX: sekreta �losilo ne trovita: %s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"�losilo %08lX: publika �losilo mankas - ne povas apliki revokatestilon\n"
-#: g10/import.c:1276
+#: g10/import.c:1277
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
-#: g10/import.c:1308
+#: g10/import.c:1309
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "�losilo %08lX: revokatestilo importita\n"
-#: g10/import.c:1374
+#: g10/import.c:1375
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
-#: g10/import.c:1389
+#: g10/import.c:1390
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
-#: g10/import.c:1391
+#: g10/import.c:1392
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "�losilo %08lX: nevalida mem-subskribo\n"
-#: g10/import.c:1409
+#: g10/import.c:1410
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
-#: g10/import.c:1422
+#: g10/import.c:1423
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
-#: g10/import.c:1437
+#: g10/import.c:1438
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
-#: g10/import.c:1459
+#: g10/import.c:1460
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
-#: g10/import.c:1472
+#: g10/import.c:1473
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "�losilo %08lX.%lu: Valida sub�losilrevoko\n"
-#: g10/import.c:1487
+#: g10/import.c:1488
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
-#: g10/import.c:1529
+#: g10/import.c:1530
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "�losilo %08lX: ignoris uzantidentigilon '"
-#: g10/import.c:1550
+#: g10/import.c:1551
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "�losilo %08lX: ignoris sub�losilon\n"
-#: g10/import.c:1577
+#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
-#: g10/import.c:1587
+#: g10/import.c:1588
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
-#: g10/import.c:1604
+#: g10/import.c:1605
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
-#: g10/import.c:1618
+#: g10/import.c:1619
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
-#: g10/import.c:1626
+#: g10/import.c:1627
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
-#: g10/import.c:1726
+#: g10/import.c:1727
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
-#: g10/import.c:1788
+#: g10/import.c:1789
#, fuzzy, c-format
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:1802
+#: g10/import.c:1803
#, 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:1861
+#: g10/import.c:1862
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "�losilo %08lX: revokatestilo aldonita\n"
-#: g10/import.c:1895
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
-#: g10/import.c:2284
+#: g10/import.c:2285
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr ""
-#: g10/import.c:2292
+#: g10/import.c:2293
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "ignorita: sekreta �losilo jam �eestas\n"
-#: g10/import.c:2294
+#: g10/import.c:2295
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "ignorita: sekreta �losilo jam �eestas\n"
@@ -3003,8 +3003,8 @@ msgstr ""
msgid "Really sign? (y/N) "
msgstr "�u vere subskribi? "
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "subskribado malsukcesis: %s\n"
@@ -3531,7 +3531,7 @@ 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
#, 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) "
@@ -3574,12 +3574,32 @@ msgstr "Nenio estis forvi�ita.\n"
msgid "invalid"
msgstr "nevalida"
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
+
+#: g10/keyedit.c:3252
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
#, fuzzy
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
@@ -3589,201 +3609,201 @@ 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:3352
+#: g10/keyedit.c:3357
#, 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:3372
+#: g10/keyedit.c:3377
#, fuzzy
msgid "Enter the user ID of the designated revoker: "
msgstr "Donu la �losilgrandon"
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3402
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3417
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
-#: g10/keyedit.c:3434
+#: g10/keyedit.c:3439
#, 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:3453
+#: g10/keyedit.c:3458
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
-#: g10/keyedit.c:3459
+#: g10/keyedit.c:3464
#, 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:3520
+#: g10/keyedit.c:3525
msgid "Please remove selections from the secret keys.\n"
msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3531
#, fuzzy
msgid "Please select at most one subkey.\n"
msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
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:3579
+#: g10/keyedit.c:3584
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:3595
+#: g10/keyedit.c:3600
msgid "No corresponding signature in secret ring\n"
msgstr "Mankas responda subskribo en sekreta �losilaro\n"
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3673
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
msgid "Please select exactly one user ID.\n"
msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "�losilo %08lX: nevalida mem-subskribo\n"
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
#, 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:4127
+#: g10/keyedit.c:4132
#, 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:4189
+#: g10/keyedit.c:4194
#, fuzzy
msgid "Enter the notation: "
msgstr "Subskribo-notacio: "
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "�u surskribi (j/N)? "
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, c-format
msgid "No user ID with index %d\n"
msgstr "Mankas uzantidentigilo kun indekso %d\n"
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4465
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Mankas uzantidentigilo kun indekso %d\n"
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Mankas uzantidentigilo kun indekso %d\n"
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "uzantidentigilo: \""
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " subskribita per %08lX je %s%s\n"
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr ""
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, fuzzy, c-format
msgid "This signature expired on %s.\n"
msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
#, 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:4639
+#: g10/keyedit.c:4644
#, fuzzy
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4671
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
#, fuzzy
msgid " (non-revocable)"
msgstr "subskribi �losilon nerevokeble"
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revokita de %08lX je %s\n"
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr "Vi revokos la sekvajn subskribojn:\n"
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
#, fuzzy
msgid "Really create the revocation certificates? (y/N) "
msgstr "�u vere krei la revokatestilojn? (j/N)"
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr "mankas sekreta �losilo\n"
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, fuzzy, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4863
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
-#: g10/keyedit.c:4922
+#: g10/keyedit.c:4927
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@ -4411,7 +4431,7 @@ msgstr "el"
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "nevalida �losilaro"
@@ -4446,106 +4466,106 @@ msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
msgid "searching for names from %s\n"
msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"subskribita per via �losilo %08lX je %s\n"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
#, fuzzy
msgid "no keyserver action!\n"
msgstr "nevalida �losilaro"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr "neniu �losilservilo konata (uzu la opcion --keyserver)\n"
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
#, fuzzy
msgid "keyserver timed out\n"
msgstr "�losilservila eraro"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
#, fuzzy
msgid "keyserver internal error\n"
msgstr "�losilservila eraro"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s: ne valida �losilidentigilo\n"
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
@@ -4955,12 +4975,12 @@ msgstr "Donu pasfrazon\n"
msgid "cancelled by user\n"
msgstr "nuligita de uzanto\n"
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
#, fuzzy
msgid "can't query passphrase in batch mode\n"
msgstr "ne povas kontroli pasvorton en neinteraga re�imo\n"
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "Donu pasfrazon: "
@@ -4984,7 +5004,7 @@ msgstr "%u-bita %s-�losilo, %08lX, kreita je %s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "Ripetu pasfrazon: "
@@ -6434,18 +6454,6 @@ msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
#~ msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
#, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
-
-#, fuzzy
#~ msgid "No user IDs are removable.\n"
#~ msgstr "Mankas uzantidentigilo por �losilo\n"
diff --git a/po/es.po b/po/es.po
index babbe6e89..68c5d0e09 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU gnupg 1.4.1\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\n"
"PO-Revision-Date: 2005-03-25 16:50+0100\n"
"Last-Translator: Jaime Su�rez <[email protected]>\n"
"Language-Team: Spanish <[email protected]>\n"
@@ -44,7 +44,7 @@ msgstr "escribiendo clave privada en `%s'\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -86,7 +86,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:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, c-format
@@ -314,75 +314,75 @@ msgstr ""
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "no se puede acceder a %s - �tarjeta OpenPGP inv�lida?\n"
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr "armadura: %s\n"
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr "cabecera de armadura inv�lida: "
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr "cabecera de armadura: "
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr "cabecera de firma clara inv�lida\n"
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr "firmas en texto claro anidadas\n"
-#: g10/armor.c:568
+#: g10/armor.c:620
msgid "unexpected armor: "
msgstr "armadura inesperada: "
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr "L�nea con guiones inv�lida: "
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "caracter inv�lido radix64 %02X omitido\n"
-#: g10/armor.c:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr "Fin de fichero prematuro (falta suma de comprobaci�n)\n"
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr "Fin de suma de comprobaci�n prematuro\n"
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr "Suma de comprobaci�n mal creada\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "Error en suma de comprobaci�n: %06lX - %06lX\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
msgid "premature eof (in trailer)\n"
msgstr "fin de fichero prematuro (en el cierre)\n"
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr "error en la l�nea de cierre\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr "no se han encontrados datos OpenPGP v�lidos\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, 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:1167
+#: g10/armor.c:1219
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -468,7 +468,7 @@ msgstr "URL de donde recuperar la clave p�blica: "
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Error: URL demasiado larga (el m�ximo son %d caracteres).\n"
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr "error leyendo `%s': %s\n"
@@ -726,7 +726,7 @@ msgstr "Repita este PIN: "
msgid "PIN not correctly repeated; try again"
msgstr "PIN repetido incorrectamente; int�ntelo de nuevo"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -736,13 +736,13 @@ msgstr "no se puede abrir `%s'\n"
msgid "--output doesn't work for this command\n"
msgstr "--output no funciona con esta orden\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "clave \"%s\" no encontrada: %s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %s\n"
@@ -855,23 +855,23 @@ msgstr "no puede usar %s en modo %s\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrado para: \"%s\"\n"
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr "datos cifrados %s\n"
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "cifrado con algoritmo desconocido %d\n"
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"ATENCI�N: mensaje cifrado con una clave d�bil en el cifrado sim�trico.\n"
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
msgid "problem handling encrypted packet\n"
msgstr "problema trabajando con un paquete cifrado\n"
@@ -1004,7 +1004,7 @@ msgstr "ATENCI�N: no se ha exportado nada\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/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -1012,127 +1012,127 @@ msgstr ""
"@�rdenes:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[file]|crea una firma"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[file]|crea una firma en texto claro"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "crea una firma separada"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "cifra datos"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr "cifra s�lo con un cifrado sim�trico"
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "descifra datos (predefinido)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "verifica una firma"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "lista claves"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "lista claves y firmas"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "list and check key signatures"
msgstr "lista y comprueba firmas de las claves"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "lista claves y huellas dactilares"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "lista claves secretas"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "genera un nuevo par de claves"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "remove keys from the public keyring"
msgstr "elimina claves del anillo p�blico"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
msgid "remove keys from the secret keyring"
msgstr "elimina claves del anillo privado"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "firma la clave"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "firma la clave localmente"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "firma o modifica una clave"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr "genera un certificado de revocaci�n"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "exporta claves"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "exporta claves a un servidor de claves"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "importa claves desde un servidor de claves"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "search for keys on a key server"
msgstr "busca claves en un servidor de claves"
-#: g10/gpg.c:411
+#: g10/gpg.c:412
msgid "update all keys from a keyserver"
msgstr "actualiza todas las claves desde un servidor de claves"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "importa/fusiona claves"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr "escribir estado de la tarjeta"
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr "cambiar datos en la tarjeta"
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr "cambiar el PIN de la tarjeta"
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr "actualiza la base de datos de confianza"
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr "|algo [ficheros]|imprime res�menes de mensaje"
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1142,47 +1142,47 @@ msgstr ""
"Opciones:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr "crea una salida ascii con armadura"
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|NOMBRE|cifra para NOMBRE"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
msgid "use this user-id to sign or decrypt"
msgstr "usa este usuario para firmar o descifrar"
-#: g10/gpg.c:456
+#: g10/gpg.c:457
msgid "|N|set compress level N (0 disables)"
msgstr "|N|nivel de compresi�n N (0 no comprime)"
-#: g10/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr "usa modo de texto can�nico"
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "usa como fichero de salida"
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "prolijo"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "no hace ning�n cambio"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr "preguntar antes de sobreescribir"
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr "usar estilo OpenPGP estricto"
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr "generar mensajes compatibles con PGP 2.x"
@@ -1190,7 +1190,7 @@ msgstr "generar mensajes compatibles con PGP 2.x"
# 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/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1198,7 +1198,7 @@ msgstr ""
"@\n"
"(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
-#: g10/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1218,15 +1218,15 @@ msgstr ""
" --list-keys [nombres] muestra las claves\n"
" --fingerprint [nombres] muestra las huellas dactilares\n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
-#: g10/gpg.c:778
+#: g10/gpg.c:780
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
-#: g10/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1236,7 +1236,7 @@ msgstr ""
"firma, comprueba, cifra o descifra\n"
"la operaci�n por defecto depende de los datos de entrada\n"
-#: g10/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1244,71 +1244,71 @@ msgstr ""
"\n"
"Algoritmos disponibles:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr "Clave p�blica: "
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr "Cifrado: "
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr "Resumen: "
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
msgid "Compression: "
msgstr "Compresi�n: "
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "uso: gpg [opciones] "
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "�rdenes incompatibles\n"
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, 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/gpg.c:1259
+#: g10/gpg.c:1261
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "AVISO: propiedad insegura del directorio personal `%s'\n"
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "AVISO: propiedad insegura del fichero de configuraci�n `%s'\n"
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "AVISO: propiedad insegura de la extensi�n `%s'\n"
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "AVISO: permisos inseguros del directorio personal `%s'\n"
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "AVISO: permisos inseguros del fichero de configuraci�n `%s'\n"
-#: g10/gpg.c:1277
+#: g10/gpg.c:1279
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "AVISO: permisos inseguros de la extensi�n `%s'\n"
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "AVISO: propiedad insegura del directorio contenedor de `%s'\n"
-#: g10/gpg.c:1286
+#: g10/gpg.c:1288
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1316,18 +1316,18 @@ msgstr ""
"AVISO: propiedad insegura del directorio contenedor del fichero de\n"
"configuraci�n `%s'\n"
-#: g10/gpg.c:1289
+#: g10/gpg.c:1291
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
"AVISO: propiedad insegura del directorio contenedor de la extensi�n `%s'\n"
-#: g10/gpg.c:1295
+#: g10/gpg.c:1297
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "AVISO: permisos inseguros del directorio contenedor de `%s'\n"
-#: g10/gpg.c:1298
+#: g10/gpg.c:1300
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1335,465 +1335,465 @@ msgstr ""
"AVISO: permisos inseguros del directorio contenedor del fichero de\n"
"configuraci�n `%s'\n"
-#: g10/gpg.c:1301
+#: g10/gpg.c:1303
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
"AVISO: permisos inseguros del directorio contenedor de la extensi�n `%s'\n"
-#: g10/gpg.c:1442
+#: g10/gpg.c:1444
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "art�culo de configuraci�n desconocido `%s'\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
#, fuzzy
msgid "show all notations during signature listings"
msgstr "No existe la firma correspondiente en el anillo secreto\n"
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "la URL del servidor de claves preferido no es v�lida\n"
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "muestra en qu� anillos est� una clave"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "No existe la firma correspondiente en el anillo secreto\n"
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n"
-#: g10/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr "fichero de opciones `%s': %s\n"
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr "leyendo opciones desde `%s'\n"
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: �%s no es para uso normal!\n"
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, 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/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "`%s' no es un juego de caracteres v�lido\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "`%s' no es un juego de caracteres v�lido\n"
-#: g10/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
msgid "could not parse keyserver URL\n"
msgstr "no se puede interpretar la URL del servidor de claves\n"
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
msgid "invalid keyserver options\n"
msgstr "opciones del servidor de claves inv�lidas\n"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
msgid "invalid import options\n"
msgstr "opciones de importaci�n inv�lidas\n"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
msgid "invalid export options\n"
msgstr "opciones de exportaci�n inv�lidas\n"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: lista de opciones inv�lida\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
msgid "invalid list options\n"
msgstr "lista de opciones inv�lida\n"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
#, fuzzy
msgid "show all notations during signature verification"
msgstr "`%s' no es un juego de caracteres v�lido\n"
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "la URL del servidor de claves preferido no es v�lida\n"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "`%s' no es un juego de caracteres v�lido\n"
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
msgid "invalid verify options\n"
msgstr "opciones de verificaci�n inv�lidas\n"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "imposible establecer camino de ejecutables %s\n"
-#: g10/gpg.c:2764
+#: g10/gpg.c:2768
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
msgid "WARNING: program may create a core file!\n"
msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
-#: g10/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s sustituye a %s\n"
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "�%s no permitido con %s!\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "�%s no tiene sentido con %s!\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2865
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "el agente gpg no esta disponible en esta sesi�n\n"
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "no se ejecutar� en memoria insegura por %s\n"
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
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/gpg.c:2896
+#: g10/gpg.c:2900
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/gpg.c:2902
+#: g10/gpg.c:2906
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/gpg.c:2915
+#: g10/gpg.c:2919
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/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
msgid "selected compression algorithm is invalid\n"
msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
msgid "selected certification digest algorithm is invalid\n"
msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed debe ser mayor que 0\n"
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed debe ser mayor que 1\n"
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth debe estar en el rango de 1 a 255\n"
-#: g10/gpg.c:3021
+#: g10/gpg.c:3025
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/gpg.c:3023
+#: g10/gpg.c:3027
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/gpg.c:3026
+#: g10/gpg.c:3030
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
-#: g10/gpg.c:3030
+#: g10/gpg.c:3034
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3041
msgid "invalid default preferences\n"
msgstr "preferencias por defecto inv�lidas\n"
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
msgid "invalid personal cipher preferences\n"
msgstr "preferencias personales de cifrado inv�lidas\n"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
msgid "invalid personal digest preferences\n"
msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
msgid "invalid personal compress preferences\n"
msgstr "preferencias personales de compresi�n inv�lidas\n"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s a�n no funciona con %s\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, 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/gpg.c:3139
+#: g10/gpg.c:3143
#, 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/gpg.c:3144
+#: g10/gpg.c:3148
#, 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/gpg.c:3246
+#: g10/gpg.c:3250
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
-#: g10/gpg.c:3257
+#: g10/gpg.c:3261
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/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [nombre_fichero]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [nombre_fichero]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "el cifrado sim�trico de `%s' fall�: %s\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [nombre_fichero]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [nombre_fichero]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "no puede usar --symetric --encrypt con --s2k-mode 0\n"
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "no puede usar --symetric --encrypt en modo %s\n"
-#: g10/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--sign [nombre_fichero]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nombre_fichero]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [nombre_fichero]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "no puede usar --symetric --sign --encrypt con --s2k-mode 0\n"
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "no puede usar --symmetric --sign --encrypt en modo %s\n"
-#: g10/gpg.c:3376
+#: g10/gpg.c:3380
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nombre_fichero]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [nombre_fichero]"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [nombre_fichero]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key id-usuario"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key id-usuario"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-usuario [�rdenes]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
-#: g10/gpg.c:3556
+#: g10/gpg.c:3560
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "env�o al servidor de claves fallido: %s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "recepci�n del servidor de claves fallida: %s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, c-format
msgid "key export failed: %s\n"
msgstr "exportaci�n de clave fallida: %s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "b�squeda del servidor de claves fallida: %s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "renovaci�n al servidor de claves fallida: %s\n"
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "eliminaci�n de armadura fallida: %s\n"
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creaci�n de armadura fallida: %s\n"
-#: g10/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[nombre_fichero]"
@@ -1801,19 +1801,19 @@ 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/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr "Adelante, teclee su mensaje...\n"
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
msgid "the given certification policy URL is invalid\n"
msgstr "URL de pol�tica de certificado inv�lida\n"
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
msgid "the given signature policy URL is invalid\n"
msgstr "URL de pol�tica inv�lida\n"
-#: g10/gpg.c:4193
+#: g10/gpg.c:4197
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la URL del servidor de claves preferido no es v�lida\n"
@@ -1836,7 +1836,7 @@ msgstr ""
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "Clave %s inv�lida hecha v�lida mediante --allow-non-selfsigned-uid\n"
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "no hay subclave secreta para la subclave p�blica %s - ignorada\n"
@@ -2247,426 +2247,426 @@ msgstr "clave secreta inutilizable"
msgid "remove as much as possible from key after import"
msgstr ""
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr "omitiendo bloque de tipo %d\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu claves procesadas hasta ahora\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Cantidad total procesada: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " omitidas nuevas claves: %lu\n"
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sin identificador: %lu\n"
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr " importadas: %lu"
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr " sin cambios: %lu\n"
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nuevos identificativos: %lu\n"
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nuevas subclaves: %lu\n"
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr " nuevas firmas: %lu\n"
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nuevas revocaciones de claves: %lu\n"
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr " claves secretas le�das: %lu\n"
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " claves secretas importadas: %lu\n"
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "claves secretas sin cambios: %lu\n"
-#: g10/import.c:321
+#: g10/import.c:322
#, c-format
msgid " not imported: %lu\n"
msgstr " no importadas: %lu\n"
-#: g10/import.c:323
+#: g10/import.c:324
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr "firmas creadas hasta ahora: %lu\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " claves secretas le�das: %lu\n"
-#: g10/import.c:566
+#: g10/import.c:567
#, fuzzy, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr "AVISO: la clave %s contiene preferencias para no disponible\n"
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
#, fuzzy
msgid " algorithms on these user IDs:\n"
msgstr "algoritmos en estos IDs de usuarios:\n"
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": algoritmo de cifrado preferido %s\n"
-#: g10/import.c:619
+#: g10/import.c:620
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": algoritmo de resumen preferido %s\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": algoritmo de compresi�n preferido %s\n"
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "se recomienda encarecidamente que actualice sus preferencias y\n"
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"re-dustribuya esta clave para evitar potenciales problemas de\n"
"diferencias en los algoritmos.\n"
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"puede actualizar sus preferencias con: gpg --edit-key %s updpref save\n"
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, c-format
msgid "key %s: no user ID\n"
msgstr "clave %s: sin identificador de usuario\n"
-#: g10/import.c:749
+#: g10/import.c:750
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "clave %s: reparada la subclave PKS corrompida\n"
-#: g10/import.c:764
+#: g10/import.c:765
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "clave %s: aceptado ID de usuario sin autofirma \"%s\"\n"
-#: g10/import.c:770
+#: g10/import.c:771
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "clave %s: sin identificadores de usuario v�lidos\n"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr "esto puede ser debido a la ausencia de autofirma\n"
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "clave %s: clave p�blica no encontrada: %s\n"
-#: g10/import.c:788
+#: g10/import.c:789
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "clave %s: clave nueva - omitida\n"
-#: g10/import.c:797
+#: g10/import.c:798
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "anillo de claves no escribible encontrado: %s\n"
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr "escribiendo en `%s'\n"
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "error escribiendo anillo `%s': %s\n"
-#: g10/import.c:825
+#: g10/import.c:826
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "clave %s: clave p�blica \"%s\" importada\n"
-#: g10/import.c:849
+#: g10/import.c:850
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "clave %s: no coincide con nuestra copia\n"
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "clave %s: no puede localizarse el bloque de claves original: %s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "clave %s: no puede leerse el bloque de claves original: %s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "clave %s: \"%s\" 1 ID de usuario nuevo\n"
-#: g10/import.c:914
+#: g10/import.c:915
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
-#: g10/import.c:917
+#: g10/import.c:918
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "clave %s: \"%s\" 1 firma nueva\n"
-#: g10/import.c:920
+#: g10/import.c:921
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "clave %s: \"%s\" %d firmas nuevas\n"
-#: g10/import.c:923
+#: g10/import.c:924
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "clave %s: \"%s\" 1 subclave nueva\n"
-#: g10/import.c:926
+#: g10/import.c:927
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "clave %s: \"%s\" %d subclaves nuevas\n"
-#: g10/import.c:929
+#: g10/import.c:930
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "clave %s: \"%s\" %d firmas nuevas\n"
-#: g10/import.c:932
+#: g10/import.c:933
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "clave %s: \"%s\" %d firmas nuevas\n"
-#: g10/import.c:935
+#: g10/import.c:936
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
-#: g10/import.c:938
+#: g10/import.c:939
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
-#: g10/import.c:961
+#: g10/import.c:962
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "clave %s: \"%s\" sin cambios\n"
-#: g10/import.c:1124
+#: g10/import.c:1125
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "clave %s: clave secreta con cifrado inv�lido %d - omitida\n"
-#: g10/import.c:1135
+#: g10/import.c:1136
msgid "importing secret keys not allowed\n"
msgstr "no se permite importar claves secretas\n"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "no hay anillo secreto de claves por defecto: %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, c-format
msgid "key %s: secret key imported\n"
msgstr "clave %s: clave secreta importada\n"
-#: g10/import.c:1193
+#: g10/import.c:1194
#, c-format
msgid "key %s: already in secret keyring\n"
msgstr "clave %s: ya estaba en el anillo secreto\n"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "clave %s: clave secreta no encontrada: %s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"clave %s: falta la clave p�blica - imposible emplear el\n"
"certificado de revocaci�n\n"
-#: g10/import.c:1276
+#: g10/import.c:1277
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "clave %s: certificado de revocaci�n inv�lido: %s - rechazado\n"
-#: g10/import.c:1308
+#: g10/import.c:1309
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "clave %s: \"%s\" certificado de revocaci�n importado\n"
-#: g10/import.c:1374
+#: g10/import.c:1375
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "clave %s: no hay identificador de usuario para la firma\n"
-#: g10/import.c:1389
+#: g10/import.c:1390
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "clave %s: algoritmo de clave p�blica no disponible para ID \"%s\"\n"
-#: g10/import.c:1391
+#: g10/import.c:1392
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "clave %s: autofirma inv�lida para el id \"%s\"\n"
-#: g10/import.c:1409
+#: g10/import.c:1410
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "clave %s: no hay subclave que unir a la clave\n"
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "clave %s: algoritmo de clave p�blica no disponible\n"
-#: g10/import.c:1422
+#: g10/import.c:1423
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "clave %s: uni�n de subclave inv�lida\n"
-#: g10/import.c:1437
+#: g10/import.c:1438
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "clave %s: borrado enlace de subclaves m�ltiples\n"
-#: g10/import.c:1459
+#: g10/import.c:1460
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "clave %s: no hay subclave para la revocaci�n de clave\n"
-#: g10/import.c:1472
+#: g10/import.c:1473
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "clave %s: revocaci�n de subclave inv�lida\n"
-#: g10/import.c:1487
+#: g10/import.c:1488
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "clave %s: borrada revocaci�n de subclave m�ltiple\n"
-#: g10/import.c:1529
+#: g10/import.c:1530
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "clave %s: omitido ID de usuario \"%s\"\n"
-#: g10/import.c:1550
+#: g10/import.c:1551
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "clave %s: subclave omitida\n"
-#: g10/import.c:1577
+#: g10/import.c:1578
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "clave %s: firma no exportable (clase 0x%02x) - omitida\n"
-#: g10/import.c:1587
+#: g10/import.c:1588
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "clave %s: certificado de revocaci�n en lugar equivocado - omitido\n"
-#: g10/import.c:1604
+#: g10/import.c:1605
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "clave %s: certificado de revocaci�n no valido: %s - omitido\n"
-#: g10/import.c:1618
+#: g10/import.c:1619
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "clave %s: firma de subclave en lugar equivocado - omitida\n"
-#: g10/import.c:1626
+#: g10/import.c:1627
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "clave %s: firma de clase (0x%02x) inesperada - omitida\n"
-#: g10/import.c:1726
+#: g10/import.c:1727
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "clave %s: detectado usuario duplicado - fusionada\n"
-#: g10/import.c:1788
+#: g10/import.c:1789
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"AVISO: la clave %s puede estar revocada: recuperando clave de revocaci�n %s\n"
-#: g10/import.c:1802
+#: g10/import.c:1803
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"AVISO: la clave %s puede estar revocada: falta clave de revocaci�n %s.\n"
-#: g10/import.c:1861
+#: g10/import.c:1862
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "clave %s: \"%s\" certificado de revocaci�n a�adido\n"
-#: g10/import.c:1895
+#: g10/import.c:1896
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "clave %s: firma directa de clave a�adida\n"
-#: g10/import.c:2284
+#: g10/import.c:2285
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "NOTA: un S/N de la clave no coincide con la de la tarjeta\n"
-#: g10/import.c:2292
+#: g10/import.c:2293
msgid "NOTE: primary key is online and stored on card\n"
msgstr "NOTA: clave primaria en l�nea y almacenada en la tarjeta\n"
-#: g10/import.c:2294
+#: g10/import.c:2295
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "NOTA: clave secundaria en l�nea y almacenada en la tarjeta\n"
@@ -2967,8 +2967,8 @@ msgstr "He comprobado esta clave meticulosamente.\n"
msgid "Really sign? (y/N) "
msgstr "�Firmar de verdad? (s/N) "
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "firma fallida: %s\n"
@@ -3465,7 +3465,7 @@ 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
msgid "Are you sure you still want to add it? (y/N) "
msgstr "�Est� seguro de querer a�adirla? (s/N) "
@@ -3508,12 +3508,32 @@ msgstr "No se borr� nada\n"
msgid "invalid"
msgstr "Armadura no v�lida"
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "ID de usuario \"%s\" revocado."
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "ID de usuario \"%s\" revocado."
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "ID de usuario \"%s\" revocado."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
+
+#: g10/keyedit.c:3252
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3522,191 +3542,191 @@ 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:3352
+#: g10/keyedit.c:3357
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:3372
+#: g10/keyedit.c:3377
msgid "Enter the user ID of the designated revoker: "
msgstr "Introduzca el ID de usuario del revocador designado: "
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3402
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:3412
+#: g10/keyedit.c:3417
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:3434
+#: g10/keyedit.c:3439
msgid "this key has already been designated as a revoker\n"
msgstr "esta clave ya ha sido designada como revocadora\n"
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3458
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:3459
+#: g10/keyedit.c:3464
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:3520
+#: g10/keyedit.c:3525
msgid "Please remove selections from the secret keys.\n"
msgstr "Por favor, quite las selecciones de las claves secretas.\n"
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3531
msgid "Please select at most one subkey.\n"
msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
msgid "Changing expiration time for a subkey.\n"
msgstr "Cambiando fecha de caducidad de subclave.\n"
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
msgid "Changing expiration time for the primary key.\n"
msgstr "Cambiando caducidad de clave primaria.\n"
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3584
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:3595
+#: g10/keyedit.c:3600
msgid "No corresponding signature in secret ring\n"
msgstr "No existe la firma correspondiente en el anillo secreto\n"
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3673
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "AVISO: la subclave de firmado %s no tiene certificado cruzado\n"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
msgid "Please select exactly one user ID.\n"
msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr "Introduzca la URL de su servidor de claves preferido: "
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
msgid "Are you sure you want to replace it? (y/N) "
msgstr "�Seguro que quiere reemplazarlo? (s/N) "
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4132
msgid "Are you sure you want to delete it? (y/N) "
msgstr "�Seguro que quiere borrarlo? (s/N) "
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4194
#, fuzzy
msgid "Enter the notation: "
msgstr "Notaci�n de firma: "
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "�Sobreescribir? (s/N) "
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, 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:4460
+#: g10/keyedit.c:4465
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "No hay ning�n identificador de usuario con el �ndice %d\n"
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, c-format
msgid "No subkey with index %d\n"
msgstr "No existe una subclave con �ndice %d\n"
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID de usuario: \"%s\"\n"
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "firmada con su clave %s el %s%s%s\n"
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr " (no exportable)"
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Esta firma caduc� el %s.\n"
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "�De verdad quiere revocarla? (s/N) "
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4644
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:4666
+#: g10/keyedit.c:4671
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Ha firmado estos IDs de usuario con la clave %s:\n"
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
msgid " (non-revocable)"
msgstr " (no revocable)"
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "revocada por la clave %s el %s\n"
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr "Va a revocar las siguientes firmas:\n"
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
msgid "Really create the revocation certificates? (y/N) "
msgstr "�Crear los certificados de revocaci�n realmente? (s/N) "
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr "no hay clave secreta\n"
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4863
#, 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:4922
+#: g10/keyedit.c:4927
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "La clave %s ya ha sido revocada.\n"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "La subclave %s ya ha sido revocada.\n"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, 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 %s (uid %d)\n"
@@ -4320,7 +4340,7 @@ msgstr "deshabilitado"
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Introduzca n�mero(s), O)tro, o F)in >"
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "protocolo del servidor de claves inv�lido (us %d!=handler %d)\n"
@@ -4354,105 +4374,105 @@ msgstr "buscando \"%s\" de %s servidor %s\n"
msgid "searching for names from %s\n"
msgstr "buscando \"%s\" de %s\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "enviando clave %s a %s servidor %s\n"
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, c-format
msgid "sending key %s to %s\n"
msgstr "enviando clave %s a %s\n"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "buscando \"%s\" de %s servidor %s\n"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "buscando \"%s\" de %s\n"
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
msgid "no keyserver action!\n"
msgstr "�no se solicita ninguna acci�n al servidor de claves!\n"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
"AVISO: el manejo de claves procede de una versi�n diferente de GnuPG (%s)\n"
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr "el servidor de claves no envi� VERSION\n"
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr "no hay servidores de claves conocidos (use opci�n --keyserver)\n"
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
"no se pueden realizar llamadas a un servidor externo de claves tal y\n"
"como est� compilado el programa\n"
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr "no hay un manejador para ese esquema de servidor de claves `%s'\n"
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
"la acci�n `%s' no es posible con este esquema de servidor de claves `%s'\n"
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, fuzzy, c-format
msgid "%s does not support handler version %d\n"
msgstr "gpgkeys_%s no permite usar la versi�n %d del manejador\n"
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
msgid "keyserver timed out\n"
msgstr "agotado el tiempo de espera para el servidor de claves\n"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
msgid "keyserver internal error\n"
msgstr "error interno del servidor de claves\n"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "error de comunicaci�n con el servidor de claves: %s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" no es un identificador de clave v�lido: omitido\n"
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "renovando 1 clave de %s\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "renovando %d claves desde %s\n"
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
@@ -4856,11 +4876,11 @@ msgstr "Introduzca frase contrase�a\n"
msgid "cancelled by user\n"
msgstr "cancelado por el usuario\n"
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
msgid "can't query passphrase in batch mode\n"
msgstr "imposible pedir frase contrase�a en modo de proceso por lotes\n"
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "Introduzca frase contrase�a: "
@@ -4883,7 +4903,7 @@ msgstr "clave %2$s de %1$u bits, ID %3$s, creada el %4$s"
msgid " (subkey on main key ID %s)"
msgstr " (subclave en clave principal ID %s)"
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "Repita frase contrase�a: "
@@ -6356,18 +6376,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
#~ msgstr "no se puede ejecutar el programa `%s': %s\n"
#, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "ID de usuario \"%s\" revocado."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "ID de usuario \"%s\" revocado."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "ID de usuario \"%s\" revocado."
-
-#, fuzzy
#~ msgid "No user IDs are removable.\n"
#~ msgstr "No hay clave secreta para tal usuario\n"
diff --git a/po/et.po b/po/et.po
index 84827eb8e..7203dd918 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: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\n"
"PO-Revision-Date: 2004-06-17 11:04+0300\n"
"Last-Translator: Toomas Soome <[email protected]>\n"
"Language-Team: Estonian <[email protected]>\n"
@@ -40,7 +40,7 @@ msgstr "kirjutan salajase v�tme faili `%s'\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -76,7 +76,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:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, c-format
@@ -305,77 +305,77 @@ msgstr ""
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "ei leia OpenPGP andmeid.\n"
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr "pakend: %s\n"
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr "vigane pakendi p�is: "
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr "pakendi p�is: "
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr "vigane avateksti allkirja p�is\n"
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr "avateksti allkirjad �ksteise sees\n"
-#: g10/armor.c:568
+#: g10/armor.c:620
#, fuzzy
msgid "unexpected armor: "
msgstr "ootamatu pakend:"
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr "vigane kriipsudega m�rgitud rida: "
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "vigane radix64 s�mbol %02x vahele j�etud\n"
-#: g10/armor.c:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr "enneaegne failil�pp (puudub CRC)\n"
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr "enneaegne failil�pp (poolik CRC)\n"
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr "vigane CRC\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC viga; %06lx - %06lx\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "enneaegne failil�pp (l�petaval real)\n"
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr "viga l�petaval real\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr "ei leia OpenPGP andmeid.\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, 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:1167
+#: g10/armor.c:1219
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -466,7 +466,7 @@ msgstr "vastavat avalikku v�tit pole: %s\n"
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr "viga `%s' lugemisel: %s\n"
@@ -742,7 +742,7 @@ msgstr "Korrake parooli: "
msgid "PIN not correctly repeated; try again"
msgstr "parooli ei korratud �ieti; proovige uuesti"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -752,13 +752,13 @@ msgstr "`%s' ei �nnestu avada\n"
msgid "--output doesn't work for this command\n"
msgstr "v�ti --output ei t��ta selle k�suga\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "v�tit '%s' ei leitud: %s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %s\n"
@@ -871,22 +871,22 @@ msgstr "%s ei ole moodis %s lubatud.\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s kr�ptitud kasutajale: \"%s\"\n"
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr "%s kr�pteeritud andmed\n"
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr "HOIATUS: teade on kr�ptitud s�mmeetrilise �ifri n�rga v�tmega.\n"
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
msgid "problem handling encrypted packet\n"
msgstr "probleem kr�ptitud paketi k�sitlemisel\n"
@@ -1021,7 +1021,7 @@ msgstr "HOIATUS: salajases v�tmes %08lX puudub lihtne SK kontrollsumma\n"
msgid "WARNING: nothing exported\n"
msgstr "HOIATUS: midagi ei eksporditud\n"
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -1029,128 +1029,128 @@ msgstr ""
"@K�sud:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[fail]|loo allkiri"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[fail]|loo avateksti allkiri"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "loo eraldiseisev allkiri"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "kr�pteeri andmed"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "dekr�pteeri andmed (vaikimisi)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "kontrolli allkirja"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "n�ita v�tmeid"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "n�ita v�tmeid ja allkirju"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
#, fuzzy
msgid "list and check key signatures"
msgstr "kontrolli v�tmete allkirju"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "n�ita v�tmeid ja s�rmej�lgi"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "n�ita salajasi v�tmeid"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "genereeri uus v�tmepaar"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "remove keys from the public keyring"
msgstr "eemalda v�tmed avalike v�tmete hoidlast"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
msgid "remove keys from the secret keyring"
msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "allkirjasta v�ti"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "allkirjasta v�ti lokaalselt"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "allkirjasta v�i toimeta v�tit"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr "genereeri t�histamise sertifikaat"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "ekspordi v�tmed"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "ekspordi v�tmed v�tmeserverisse"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "impordi v�tmed v�tmeserverist"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "search for keys on a key server"
msgstr "otsi v�tmeid v�tmeserverist"
-#: g10/gpg.c:411
+#: g10/gpg.c:412
msgid "update all keys from a keyserver"
msgstr "uuenda v�tmeid v�tmeserverist"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "impordi/mesti v�tmed"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr "uuenda usalduse andmebaasi"
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr "|algo [failid]|tr�ki teatel�hendid"
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1160,51 +1160,51 @@ msgstr ""
"V�tmed:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr "loo ascii pakendis v�ljund"
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|NIMI|kr�pti NIMEle"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
msgid "use this user-id to sign or decrypt"
msgstr "kasuta seda kasutaja IDd"
-#: g10/gpg.c:456
+#: g10/gpg.c:457
msgid "|N|set compress level N (0 disables)"
msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
-#: g10/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr "kasuta kanoonilist tekstimoodi"
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "kasuta v�ljundfailina"
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "ole jutukas"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "�ra tee mingeid muutusi"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr "k�si enne �lekirjutamist"
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1212,7 +1212,7 @@ msgstr ""
"@\n"
"(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
-#: g10/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1232,15 +1232,15 @@ msgstr ""
" --list-keys [nimed] n�ita v�tmeid\n"
" --fingerprint [nimed] n�ita s�rmej�lgi\n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
-#: g10/gpg.c:778
+#: g10/gpg.c:780
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
-#: g10/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1250,7 +1250,7 @@ msgstr ""
"allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
"vaikimisi operatsioon s�ltub sisendandmetest\n"
-#: g10/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1258,576 +1258,576 @@ msgstr ""
"\n"
"Toetatud algoritmid:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr "Avalik v�ti: "
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr "�iffer: "
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr "R�si: "
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
msgid "Compression: "
msgstr "Pakkimine: "
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "kasuta: gpg [v�tmed] "
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "vastuolulised k�sud\n"
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, fuzzy, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
-#: g10/gpg.c:1259
+#: g10/gpg.c:1261
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
-#: g10/gpg.c:1277
+#: g10/gpg.c:1279
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
-#: g10/gpg.c:1286
+#: g10/gpg.c:1288
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
-#: g10/gpg.c:1289
+#: g10/gpg.c:1291
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
-#: g10/gpg.c:1295
+#: g10/gpg.c:1297
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
-#: g10/gpg.c:1298
+#: g10/gpg.c:1300
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
-#: g10/gpg.c:1301
+#: g10/gpg.c:1303
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
-#: g10/gpg.c:1442
+#: g10/gpg.c:1444
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "tundmatu seade \"%s\"\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "antud allkirja poliisi URL on vigane\n"
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "M�RKUS: ignoreerin vana vaikimisi v�tmete faili `%s'\n"
-#: g10/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr "v�tmete fail `%s': %s\n"
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr "loen v�tmeid failist `%s'\n"
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, 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/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s ei ole lubatud kooditabel\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s ei ole lubatud kooditabel\n"
-#: g10/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "ei saa parsida v�tmeserveri URI\n"
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "vigased ekspordi v�tmed\n"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: vigased impordi v�tmed\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
msgid "invalid import options\n"
msgstr "vigased impordi v�tmed\n"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
msgid "invalid export options\n"
msgstr "vigased ekspordi v�tmed\n"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: vigased impordi v�tmed\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
#, fuzzy
msgid "invalid list options\n"
msgstr "vigased impordi v�tmed\n"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ei ole lubatud kooditabel\n"
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "antud allkirja poliisi URL on vigane\n"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ei ole lubatud kooditabel\n"
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
#, fuzzy
msgid "invalid verify options\n"
msgstr "vigased ekspordi v�tmed\n"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
-#: g10/gpg.c:2764
+#: g10/gpg.c:2768
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
msgid "WARNING: program may create a core file!\n"
msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
-#: g10/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "HOIATUS: %s m��rab �le %s\n"
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ja %s ei ole koos lubatud!\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ja %s ei oma koos m�tet!\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2865
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
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/gpg.c:2896
+#: g10/gpg.c:2900
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/gpg.c:2902
+#: g10/gpg.c:2906
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/gpg.c:2915
+#: g10/gpg.c:2919
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "teate kr�pteerimine --pgp2 moodis n�uab IDEA �iffrit\n"
-#: g10/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr "valitud �ifri algoritm ei ole lubatud\n"
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr "valitud l�hendi algoritm ei ole lubatud\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "valitud �ifri algoritm ei ole lubatud\n"
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
msgid "selected certification digest algorithm is invalid\n"
msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed peab olema suurem, kui 0\n"
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed peab olema suurem, kui 1\n"
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
#, 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/gpg.c:3021
+#: g10/gpg.c:3025
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/gpg.c:3023
+#: g10/gpg.c:3027
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/gpg.c:3026
+#: g10/gpg.c:3030
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
-#: g10/gpg.c:3030
+#: g10/gpg.c:3034
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3041
msgid "invalid default preferences\n"
msgstr "vigased vaikimisi eelistused\n"
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
msgid "invalid personal cipher preferences\n"
msgstr "vigased isikliku �ifri eelistused\n"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
msgid "invalid personal digest preferences\n"
msgstr "vigased isikliku l�hendi eelistused\n"
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
msgid "invalid personal compress preferences\n"
msgstr "vigased isikliku pakkimise eelistused\n"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ei t��ta veel koos %s-ga\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, 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/gpg.c:3139
+#: g10/gpg.c:3143
#, 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/gpg.c:3144
+#: g10/gpg.c:3148
#, 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/gpg.c:3246
+#: g10/gpg.c:3250
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
-#: g10/gpg.c:3257
+#: g10/gpg.c:3261
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/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [failinimi]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [failinimi]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [failinimi]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "%s ei ole moodis %s lubatud.\n"
-#: g10/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--sign [failinimi]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "%s ei ole moodis %s lubatud.\n"
-#: g10/gpg.c:3376
+#: g10/gpg.c:3380
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [failinimi]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [failinimi]"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [failinimi]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key kasutaja-id"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key kasutaja-id"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key kasutaja-id [k�sud]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [kasutaja-id] [v�tmehoidla]"
-#: g10/gpg.c:3556
+#: g10/gpg.c:3560
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, c-format
msgid "key export failed: %s\n"
msgstr "v�tme eksport eba�nnestus: %s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "lahtipakendamine eba�nnestus: %s\n"
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "pakendamine eba�nnestus: %s\n"
-#: g10/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "vigane r�sialgoritm `%s'\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[failinimi]"
-#: g10/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr "Kirjutage n��d oma teade ...\n"
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
msgid "the given certification policy URL is invalid\n"
msgstr "antud sertifikaadi poliisi URL on vigane\n"
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
msgid "the given signature policy URL is invalid\n"
msgstr "antud allkirja poliisi URL on vigane\n"
-#: g10/gpg.c:4193
+#: g10/gpg.c:4197
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "antud allkirja poliisi URL on vigane\n"
@@ -1854,7 +1854,7 @@ msgstr ""
"Vigane v�ti %08lX muudeti kehtivaks v�tme --allow-non-selfsigned-uid "
"kasutamisega\n"
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, fuzzy, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "avalikul alamv�tmel %08lX puudub salajane alamv�ti - ignoreerin\n"
@@ -2246,426 +2246,426 @@ msgstr "mittekasutatav salajane v�ti"
msgid "remove as much as possible from key after import"
msgstr ""
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr "j�tan bloki t��biga %d vahele\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu v�tit on seni t��deldud\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr "T��deldud kokku: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " vahele j�etud uusi v�tmeid: %lu\n"
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " puudub kasutaja ID: %lu\n"
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr " imporditud: %lu"
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr " muutmata: %lu\n"
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr " uusi kasutajaid: %lu\n"
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr " uusi alamv�tmeid: %lu\n"
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr " uusi allkirju: %lu\n"
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr " uusi t�histamisi: %lu\n"
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr " loetud salajasi v�tmeid: %lu\n"
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " salajasi v�tmeid imporditud: %lu\n"
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " muutmata salajasi v�tmeid: %lu\n"
-#: g10/import.c:321
+#: g10/import.c:322
#, c-format
msgid " not imported: %lu\n"
msgstr " pole imporditud: %lu\n"
-#: g10/import.c:323
+#: g10/import.c:324
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " uusi allkirju: %lu\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " loetud salajasi v�tmeid: %lu\n"
-#: g10/import.c:566
+#: g10/import.c:567
#, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr ""
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
#, fuzzy
msgid " algorithms on these user IDs:\n"
msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
-#: g10/import.c:619
+#: g10/import.c:620
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "v�ti %08lX: kasutaja ID puudub\n"
-#: g10/import.c:749
+#: g10/import.c:750
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "v�ti %08lX: HKP alamv�tme rike parandatud\n"
-#: g10/import.c:764
+#: g10/import.c:765
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr ""
"v�ti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
-#: g10/import.c:770
+#: g10/import.c:771
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "v�ti %08lX: puudub kehtiv kasutaja ID\n"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr "see v�ib olla p�hjustatud puuduvast iseenda allkirjast\n"
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "v�ti %08lX: avalikku v�tit ei leitud: %s\n"
-#: g10/import.c:788
+#: g10/import.c:789
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
-#: g10/import.c:797
+#: g10/import.c:798
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr "kirjutan faili `%s'\n"
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
-#: g10/import.c:825
+#: g10/import.c:826
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "v�ti %08lX: avalik v�ti \"%s\" on imporditud\n"
-#: g10/import.c:849
+#: g10/import.c:850
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "v�ti %08lX: ei sobi meie koopiaga\n"
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "v�ti %08lX: ei leia algset v�tmeblokki: %s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "v�ti %08lX: ei �nnestu lugeda algset v�tmeblokki: %s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "v�ti %08lX: \"%s\" 1 uus kasutaja ID\n"
-#: g10/import.c:914
+#: g10/import.c:915
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
-#: g10/import.c:917
+#: g10/import.c:918
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "v�ti %08lX: \"%s\" 1 uus allkiri\n"
-#: g10/import.c:920
+#: g10/import.c:921
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
-#: g10/import.c:923
+#: g10/import.c:924
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "v�ti %08lX: \"%s\" 1 uus alamv�ti\n"
-#: g10/import.c:926
+#: g10/import.c:927
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "v�ti %08lX: \"%s\" %d uut alamv�tit\n"
-#: g10/import.c:929
+#: g10/import.c:930
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
-#: g10/import.c:932
+#: g10/import.c:933
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
-#: g10/import.c:935
+#: g10/import.c:936
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
-#: g10/import.c:938
+#: g10/import.c:939
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
-#: g10/import.c:961
+#: g10/import.c:962
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "v�ti %08lX: \"%s\" ei muudetud\n"
-#: g10/import.c:1124
+#: g10/import.c:1125
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "v�ti %08lX: salajane v�ti vigase �ifriga %d - j�tsin vahele\n"
-#: g10/import.c:1135
+#: g10/import.c:1136
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "puudub salajaste v�tmete vaikimisi v�tmehoidla: %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "v�ti %08lX: salajane v�ti on imporditud\n"
-#: g10/import.c:1193
+#: g10/import.c:1194
#, fuzzy, c-format
msgid "key %s: already in secret keyring\n"
msgstr "v�ti %08lX: on juba salajaste v�tmete hoidlas\n"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, fuzzy, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "v�ti %08lX: salajast v�tit ei leitud: %s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"v�ti %08lX: avalik v�ti puudub - t�histamise sertifikaati ei saa rakendada\n"
-#: g10/import.c:1276
+#: g10/import.c:1277
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - l�kkasin tagasi\n"
-#: g10/import.c:1308
+#: g10/import.c:1309
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat imporditud\n"
-#: g10/import.c:1374
+#: g10/import.c:1375
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "v�ti %08lX: allkirjal puudub kasutaja ID\n"
-#: g10/import.c:1389
+#: g10/import.c:1390
#, fuzzy, c-format
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:1391
+#: g10/import.c:1392
#, fuzzy, c-format
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:1409
+#: g10/import.c:1410
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "v�ti %08lX: v�tmeseosel puudub alamv�ti\n"
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
-#: g10/import.c:1422
+#: g10/import.c:1423
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "v�ti %08lX: vigane alamv�tme seos\n"
-#: g10/import.c:1437
+#: g10/import.c:1438
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "v�ti %08lX: vigane mitme alamv�tme seos\n"
-#: g10/import.c:1459
+#: g10/import.c:1460
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "v�ti %08lX: v�tme t�histamiseks puudub alamv�ti\n"
-#: g10/import.c:1472
+#: g10/import.c:1473
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "v�ti %08lX: vigane alamv�tme t�histamine\n"
-#: g10/import.c:1487
+#: g10/import.c:1488
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "v�ti %08lX: eemaldasin mitme alamv�tme t�histamise\n"
-#: g10/import.c:1529
+#: g10/import.c:1530
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "v�ti %08lX: j�tsin vahele kasutaja ID '"
-#: g10/import.c:1550
+#: g10/import.c:1551
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
-#: g10/import.c:1577
+#: g10/import.c:1578
#, fuzzy, c-format
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:1587
+#: g10/import.c:1588
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "v�ti %08lX: t�histamise sertifikaat on vales kohas - j�tan vahele\n"
-#: g10/import.c:1604
+#: g10/import.c:1605
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - j�tan vahele\n"
-#: g10/import.c:1618
+#: g10/import.c:1619
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "v�ti %08lX: alamv�tme allkiri on vales kohas - j�tan vahele\n"
-#: g10/import.c:1626
+#: g10/import.c:1627
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "v�ti %08lX: ootamatu allkirja klass (0x%02x) - j�tan vahele\n"
-#: g10/import.c:1726
+#: g10/import.c:1727
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "v�ti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
-#: g10/import.c:1788
+#: g10/import.c:1789
#, fuzzy, c-format
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:1802
+#: g10/import.c:1803
#, 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:1861
+#: g10/import.c:1862
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat lisatud\n"
-#: g10/import.c:1895
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
-#: g10/import.c:2284
+#: g10/import.c:2285
#, fuzzy
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "avalik v�ti ei sobi salajase v�tmega!\n"
-#: g10/import.c:2292
+#: g10/import.c:2293
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
-#: g10/import.c:2294
+#: g10/import.c:2295
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
@@ -2990,8 +2990,8 @@ msgstr ""
msgid "Really sign? (y/N) "
msgstr "Allkirjastan t�esti? "
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "allkirjastamine eba�nnestus: %s\n"
@@ -3520,7 +3520,7 @@ 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Olete kindel, et soovite seda ikka lisada? (j/E) "
@@ -3563,12 +3563,32 @@ msgstr "Midagi ei kustutatud.\n"
msgid "invalid"
msgstr "vigane pakend"
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "Kasutaja ID \"%s\" on t�histatud."
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "Kasutaja ID \"%s\" on t�histatud."
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "Kasutaja ID \"%s\" on t�histatud."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
+
+#: g10/keyedit.c:3252
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3577,197 +3597,197 @@ 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:3352
+#: g10/keyedit.c:3357
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:3372
+#: g10/keyedit.c:3377
msgid "Enter the user ID of the designated revoker: "
msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3402
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:3412
+#: g10/keyedit.c:3417
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:3434
+#: g10/keyedit.c:3439
#, 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:3453
+#: g10/keyedit.c:3458
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:3459
+#: g10/keyedit.c:3464
#, fuzzy
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:3520
+#: g10/keyedit.c:3525
msgid "Please remove selections from the secret keys.\n"
msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3531
#, fuzzy
msgid "Please select at most one subkey.\n"
msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
msgid "Changing expiration time for the primary key.\n"
msgstr "Muudan primaarse v�tme aegumise aega.\n"
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3584
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:3595
+#: g10/keyedit.c:3600
msgid "No corresponding signature in secret ring\n"
msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3673
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "HOIATUS: allkirjastamise alamv�ti %08lX ei ole rist-sertifitseeritud\n"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
msgid "Please select exactly one user ID.\n"
msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, 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:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4132
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4194
#, fuzzy
msgid "Enter the notation: "
msgstr "Allkirja noteerimine: "
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Kirjutan �le (j/E)? "
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, c-format
msgid "No user ID with index %d\n"
msgstr "Kasutaja ID numbriga %d puudub\n"
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4465
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Kasutaja ID numbriga %d puudub\n"
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Kasutaja ID numbriga %d puudub\n"
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "kasutaja ID: \""
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " allkirjastanud %08lX %s%s%s\n"
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr " (mitte-eksporditav)"
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, c-format
msgid "This signature expired on %s.\n"
msgstr "See allkiri aegub %s.\n"
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
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:4639
+#: g10/keyedit.c:4644
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4671
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
#, fuzzy
msgid " (non-revocable)"
msgstr " (mitte-eksporditav)"
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " t�histanud %08lX %s\n"
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr "Te asute t�histama j�rgmisi allkirju:\n"
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
msgid "Really create the revocation certificates? (y/N) "
msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr "salajast v�tit pole\n"
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4863
#, 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:4922
+#: g10/keyedit.c:4927
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, 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"
@@ -4385,7 +4405,7 @@ msgstr "disable"
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "vigased ekspordi v�tmed\n"
@@ -4420,106 +4440,106 @@ msgstr "otsin \"%s\" HKP serverist %s\n"
msgid "searching for names from %s\n"
msgstr "otsin \"%s\" HKP serverist %s\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "otsin \"%s\" HKP serverist %s\n"
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"allkirjastatud teie v�tmega %08lX %s\n"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "otsin \"%s\" HKP serverist %s\n"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "otsin \"%s\" HKP serverist %s\n"
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
#, fuzzy
msgid "no keyserver action!\n"
msgstr "vigased ekspordi v�tmed\n"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
#, fuzzy
msgid "keyserver timed out\n"
msgstr "v�tmeserveri viga"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
#, fuzzy
msgid "keyserver internal error\n"
msgstr "v�tmeserveri viga"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
@@ -4926,12 +4946,12 @@ msgstr "Sisestage parool\n"
msgid "cancelled by user\n"
msgstr "katkestatud kasutaja poolt\n"
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
#, fuzzy
msgid "can't query passphrase in batch mode\n"
msgstr "pakettmoodis ei saa parooli k�sida\n"
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "Sisestage parool: "
@@ -4955,7 +4975,7 @@ msgstr "%u-bitine %s v�ti, ID %08lX, loodud %s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "Korrake parooli: "
@@ -6403,18 +6423,6 @@ msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
#~ msgstr "ei �nnestu k�ivitada %s \"%s\": %s\n"
#, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "Kasutaja ID \"%s\" on t�histatud."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "Kasutaja ID \"%s\" on t�histatud."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "Kasutaja ID \"%s\" on t�histatud."
-
-#, fuzzy
#~ msgid "No user IDs are removable.\n"
#~ msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
diff --git a/po/fi.po b/po/fi.po
index a1aafd8a6..561e4a6be 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: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\n"
"PO-Revision-Date: 2004-06-16 22:40+0300\n"
"Last-Translator: Tommi Vainikainen <[email protected]>\n"
"Language-Team: Finnish <[email protected]>\n"
@@ -56,7 +56,7 @@ msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -93,7 +93,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:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, c-format
@@ -324,77 +324,77 @@ msgstr ""
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr "ascii-koodaus: %s\n"
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr "epäkelpo ascii-koodausotsake: "
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr "ascii-koodausotsake: "
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr "epäkelpo selkotekstisen allekirjoituksen otsikko\n"
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr "sisäkkäisiä tekstimuotoisia allekirjoituksia\n"
-#: g10/armor.c:568
+#: g10/armor.c:620
#, fuzzy
msgid "unexpected armor: "
msgstr "odottamaton ascii-koodaus:"
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr "epäkelpo viiva rivin lopussa: "
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
-#: g10/armor.c:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr "ennenaikainen tiedoston loppu (ei CRC:tä)\n"
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr "ennenaikainen tiedoston loppu (CRC:ssä)\n"
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr "väärinmuotoiltu CRC\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC-virhe; %06lx - %06lx\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "Ennenaikainen tiedoston loppu (Trailerissa)\n"
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr "virhe trailer-rivissä\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, 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:1167
+#: g10/armor.c:1219
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -487,7 +487,7 @@ msgstr "ei vastaavaa julkista avainta: %s\n"
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -763,7 +763,7 @@ msgstr "Toista salasana: "
msgid "PIN not correctly repeated; try again"
msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -773,13 +773,13 @@ msgstr "tiedostoa \"%s\" ei voi avata\n"
msgid "--output doesn't work for this command\n"
msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "avainta \"%s\" ei löydy: %s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %s\n"
@@ -889,24 +889,24 @@ msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s salattu vastaanottajalle: \"%s\"\n"
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr "%s salattua dataa\n"
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "salattu tuntemattomalla algoritmilla %d\n"
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"VAROITUS: viesti salattiin symmetrisessä salaimessa \n"
"esiintyvällä heikolla avaimella.\n"
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
msgid "problem handling encrypted packet\n"
msgstr "ongelma käsiteltäessä salattua pakettia\n"
@@ -1040,7 +1040,7 @@ msgstr ""
msgid "WARNING: nothing exported\n"
msgstr "VAROITUS: mitään ei viety\n"
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -1048,128 +1048,128 @@ msgstr ""
"@Komennot:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[tiedosto]|tee allekirjoitus"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "tee erillinen allekirjoitus"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "salaa tiedot"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr "salaa vain symmetrisellä salaimella"
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "avaa tiedot (oletus)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "tarkista allekirjoitus"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "näytä avaimet"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "näytä avaimet allekirjoituksineen"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
#, fuzzy
msgid "list and check key signatures"
msgstr "tarkista avainten allekirjoitukset"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "näytä avaimet sormenjälkineen"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "näytä salaiset avaimet"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "luo uusi avainpari"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "remove keys from the public keyring"
msgstr "poista avaimet julkisten avainten renkaasta"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
msgid "remove keys from the secret keyring"
msgstr "poista avaimet salaisten avainten renkaasta"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "allekirjoita avain"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "allekirjoita avain paikallisesti"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "allekirjoita tai muokkaa avainta"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr "luo mitätöintivarmenne"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "vie avaimia"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "vie avaimia palvelimelle"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "nouda avaimia avainpalvelimelta"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "search for keys on a key server"
msgstr "etsi avaimia avainpalvelimelta"
-#: g10/gpg.c:411
+#: g10/gpg.c:412
msgid "update all keys from a keyserver"
msgstr "päivitä kaikki avaimet avainpalvelimelta"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "nouda/liitä avaimia"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr "päivitä luottamustietokanta"
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1179,51 +1179,51 @@ msgstr ""
"Valitsimet:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr "tuota ascii-koodattu tuloste"
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|NIMI|salaa vastaanottajalle NIMI"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
msgid "use this user-id to sign or decrypt"
msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
-#: g10/gpg.c:456
+#: g10/gpg.c:457
msgid "|N|set compress level N (0 disables)"
msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
-#: g10/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr "käytä tekstimuotoa"
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "käytä tulostustiedostona"
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "monisanainen"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "älä tee muutoksia"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr "kysy ennen ylikirjoittamista"
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1232,7 +1232,7 @@ msgstr ""
"(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
"sivuilta)\n"
-#: g10/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1251,16 +1251,16 @@ msgstr ""
" --list-keys [nimet] näytä avaimet\n"
" --fingerprint [nimet] näytä sormenjäljet\n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <[email protected]>.\n"
-#: g10/gpg.c:778
+#: g10/gpg.c:780
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
-#: g10/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1270,7 +1270,7 @@ msgstr ""
"allekirjoita, tarkista, salaa tai avaa\n"
"oletustoiminto riippuu syötteestä\n"
-#: g10/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1278,577 +1278,577 @@ msgstr ""
"\n"
"Tuetut algoritmit:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr "JulkAvain: "
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr "Salaus: "
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr "Tiiviste: "
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
msgid "Compression: "
msgstr "Pakkaus: "
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "käyttö: gpg [valitsimet] "
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "ristiriitainen komento\n"
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, fuzzy, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "=-merkkiä ei löytynyt ryhmämäärityksessä \"%s\"\n"
-#: g10/gpg.c:1259
+#: g10/gpg.c:1261
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
-#: g10/gpg.c:1277
+#: g10/gpg.c:1279
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
-#: g10/gpg.c:1286
+#: g10/gpg.c:1288
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
-#: g10/gpg.c:1289
+#: g10/gpg.c:1291
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
-#: g10/gpg.c:1295
+#: g10/gpg.c:1297
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
-#: g10/gpg.c:1298
+#: g10/gpg.c:1300
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
-#: g10/gpg.c:1301
+#: g10/gpg.c:1303
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
-#: g10/gpg.c:1442
+#: g10/gpg.c:1444
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "tuntematon asetus \"%s\"\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
-#: g10/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr "asetustiedosto \"%s\": %s\n"
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr "luetaan asetukset tiedostosta \"%s\"\n"
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, 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/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s ei kelpaa merkistöksi\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s ei kelpaa merkistöksi\n"
-#: g10/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "virheelliset vientivalitsimet\n"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: virheelliset tuontivalitsimet\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
msgid "invalid import options\n"
msgstr "virheelliset tuontivalitsimet\n"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
msgid "invalid export options\n"
msgstr "virheelliset vientivalitsimet\n"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: virheelliset tuontivalitsimet\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
#, fuzzy
msgid "invalid list options\n"
msgstr "virheelliset tuontivalitsimet\n"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ei kelpaa merkistöksi\n"
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ei kelpaa merkistöksi\n"
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
#, fuzzy
msgid "invalid verify options\n"
msgstr "virheelliset vientivalitsimet\n"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
-#: g10/gpg.c:2764
+#: g10/gpg.c:2768
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
msgid "WARNING: program may create a core file!\n"
msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
-#: g10/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROITUS: %s korvaa %s:n\n"
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ja %s yhdessä on järjetöntä!\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2865
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "erillisen allekirjoituksen voi luoda vain --pgp2-tilassa\n"
-#: g10/gpg.c:2896
+#: g10/gpg.c:2900
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/gpg.c:2902
+#: g10/gpg.c:2906
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/gpg.c:2915
+#: g10/gpg.c:2919
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
-#: g10/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr "valittu salausalgoritmi ei kelpaa\n"
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr "valittu tiivistealgoritmi ei kelpaa\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "valittu salausalgoritmi ei kelpaa\n"
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
msgid "selected certification digest algorithm is invalid\n"
msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed täytyy olla suurempi kuin 0\n"
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
#, 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/gpg.c:3021
+#: g10/gpg.c:3025
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/gpg.c:3023
+#: g10/gpg.c:3027
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/gpg.c:3026
+#: g10/gpg.c:3030
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/gpg.c:3030
+#: g10/gpg.c:3034
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3041
msgid "invalid default preferences\n"
msgstr "virheelliset oletusarvoiset valinnat\n"
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
msgid "invalid personal cipher preferences\n"
msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
msgid "invalid personal digest preferences\n"
msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
msgid "invalid personal compress preferences\n"
msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ja %s eivät vielä toimi yhdessä\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, 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/gpg.c:3139
+#: g10/gpg.c:3143
#, 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/gpg.c:3144
+#: g10/gpg.c:3148
#, 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/gpg.c:3246
+#: g10/gpg.c:3250
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
-#: g10/gpg.c:3257
+#: g10/gpg.c:3261
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/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [tiedostonimi]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [tiedostonimi]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "avaus epäonnistui: %s\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [tiedostonimi]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [tiedostonimi]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, 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/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--allekirjoita [tiedostonimi]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [tiedostonimi]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [tiedostonimi]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, 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/gpg.c:3376
+#: g10/gpg.c:3380
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [tiedostonimi]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [tiedostonimi]"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [tiedostonimi]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key käyttäjätunnus"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key käyttäjätunnus"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key käyttäjätunnus [komennot]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [käyttäjätunnus] [avainrengas]"
-#: g10/gpg.c:3556
+#: g10/gpg.c:3560
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, c-format
msgid "key export failed: %s\n"
msgstr "avaimen vienti epäonnistui: %s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "ascii-koodauksen purku epäonnistui: %s\n"
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
-#: g10/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[tiedostonimi]"
-#: g10/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr "Kirjoita viestisi...\n"
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
msgid "the given certification policy URL is invalid\n"
msgstr "annettu varmennekäytännön URL on virheellinen\n"
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
msgid "the given signature policy URL is invalid\n"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
-#: g10/gpg.c:4193
+#: g10/gpg.c:4197
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@ -1874,7 +1874,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Epäkelpo avain %08lX hyväksytty valitsimella --allow-non-selfsigned-uid\n"
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, fuzzy, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "ei salaista aliavainta julkiselle aliavaimelle %08lX - ohitetaan\n"
@@ -2277,429 +2277,429 @@ msgstr "salaista avainta ei voi käyttää"
msgid "remove as much as possible from key after import"
msgstr ""
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr "ohitetaan tyypin %d lohko\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "tähän mennessä käsitelty %lu avainta\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Kaikkiaan käsitelty: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ohitetaan uudet avaimet: %lu\n"
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " ilman käyttäjätunnuksia: %lu\n"
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr " tuotu: %lu"
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr " muuttamatonta: %lu\n"
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr " uusia käyttäjätunnuksia: %lu\n"
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr " uusia aliavaimia: %lu\n"
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr " uusia allekirjoituksia: %lu\n"
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr " uusia avainten mitätöintejä: %lu\n"
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr " luettuja salaisia avaimia: %lu\n"
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " tuotuja salaisia avaimia: %lu\n"
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " muuttamattomia salaisia avaimia: %lu\n"
-#: g10/import.c:321
+#: g10/import.c:322
#, c-format
msgid " not imported: %lu\n"
msgstr " ei tuotu: %lu\n"
-#: g10/import.c:323
+#: g10/import.c:324
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " uusia allekirjoituksia: %lu\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " luettuja salaisia avaimia: %lu\n"
-#: g10/import.c:566
+#: g10/import.c:567
#, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr ""
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
#, fuzzy
msgid " algorithms on these user IDs:\n"
msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/import.c:619
+#: g10/import.c:620
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "avain %08lX: ei käyttäjätunnusta\n"
-#: g10/import.c:749
+#: g10/import.c:750
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "avain %08lX: HKP-aliavainvirhe korjattu\n"
-#: g10/import.c:764
+#: g10/import.c:765
#, fuzzy, c-format
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"
-#: g10/import.c:770
+#: g10/import.c:771
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "avain %08lX: ei voimassaolevia käyttäjätunnuksia\n"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr "tämän voi aiheuttaa puuttuva oma-allekirjoitus\n"
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "avain %08lX: julkista avainta ei löydetty: %s\n"
-#: g10/import.c:788
+#: g10/import.c:789
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "avain %08lX: uusi avain - ohitetaan\n"
-#: g10/import.c:797
+#: g10/import.c:798
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr "kirjoitetaan kohteeseen \"%s\"\n"
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
-#: g10/import.c:825
+#: g10/import.c:826
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "avain %08lX: julkinen avain \"%s\" tuotu\n"
-#: g10/import.c:849
+#: g10/import.c:850
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "avain %08lX: ei vastaa omaa kopiotamme\n"
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "avain %08lX: alkuperäistä avainlohkoa ei löydy: %s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "avain %08lX. alkuperäisen avainlohko lukeminen ei onnistu: %s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "avain %08lX: \"%s\" 1 uusi käyttäjätunnus\n"
-#: g10/import.c:914
+#: g10/import.c:915
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
-#: g10/import.c:917
+#: g10/import.c:918
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "avain %08lX: \"%s\" 1 uusi allekirjoitus\n"
-#: g10/import.c:920
+#: g10/import.c:921
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
-#: g10/import.c:923
+#: g10/import.c:924
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "avain %08lX: \"%s\" 1 uusi aliavain\n"
-#: g10/import.c:926
+#: g10/import.c:927
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "avain %08lX: \"%s\" %d uutta aliavainta\n"
-#: g10/import.c:929
+#: g10/import.c:930
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
-#: g10/import.c:932
+#: g10/import.c:933
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
-#: g10/import.c:935
+#: g10/import.c:936
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
-#: g10/import.c:938
+#: g10/import.c:939
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
-#: g10/import.c:961
+#: g10/import.c:962
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "avain %08lX: \"%s\" ei muutoksia\n"
-#: g10/import.c:1124
+#: g10/import.c:1125
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "avain %08lX: avaimella on epäkelpo salain %d - ohitetaan\n"
-#: g10/import.c:1135
+#: g10/import.c:1136
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "salaiselle avainrenkaalle ei ole asetettu oletusarvoa: %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "avain %08lX: salainen avain tuotu\n"
-#: g10/import.c:1193
+#: g10/import.c:1194
#, fuzzy, c-format
msgid "key %s: already in secret keyring\n"
msgstr "avain %08lX: avain on jo avainrenkaassa\n"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, fuzzy, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "avain %08lX: salaista avainta ei löydy: %s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"avain %08lX: ei julkista avainta - mitätöintivarmennetta ei voida käyttää\n"
-#: g10/import.c:1276
+#: g10/import.c:1277
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "avain %08lX: pätemätön mitätöintivarmenne: %s - hylätty\n"
-#: g10/import.c:1308
+#: g10/import.c:1309
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "avain %08lX: mitätöintivarmenne \"%s\" tuotu\n"
-#: g10/import.c:1374
+#: g10/import.c:1375
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "avain %08lX: allekirjoitukselle ei ole käyttäjätunnusta\n"
-#: g10/import.c:1389
+#: g10/import.c:1390
#, fuzzy, c-format
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:1391
+#: g10/import.c:1392
#, fuzzy, c-format
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:1409
+#: g10/import.c:1410
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n"
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
-#: g10/import.c:1422
+#: g10/import.c:1423
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "avain %08lX: pätemätön aliavainriippuvuus\n"
-#: g10/import.c:1437
+#: g10/import.c:1438
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n"
-#: g10/import.c:1459
+#: g10/import.c:1460
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "avain %08lX: ei aliavainta avainten mitätöintiä varten\n"
-#: g10/import.c:1472
+#: g10/import.c:1473
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "avain %08lX: epäkelpo aliavaimen mitätöinti\n"
-#: g10/import.c:1487
+#: g10/import.c:1488
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "avain %08lX: useiden aliavainten mitätöinti poistettu\n"
-#: g10/import.c:1529
+#: g10/import.c:1530
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "avain %08lX: käyttäjätunnus ohitettu '"
-#: g10/import.c:1550
+#: g10/import.c:1551
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "avain %08lX: aliavain ohitettu\n"
-#: g10/import.c:1577
+#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr ""
"avain %08lX: allekirjoitusta ei voida viedä (luokka %02x) - ohitetaan\n"
-#: g10/import.c:1587
+#: g10/import.c:1588
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "avain %08lX: mitätöintivarmenne väärässä paikassa - ohitetaan\n"
-#: g10/import.c:1604
+#: g10/import.c:1605
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "avain %08lX: epäkelpo mitätöintivarmenne: %s - ohitetaan\n"
-#: g10/import.c:1618
+#: g10/import.c:1619
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n"
-#: g10/import.c:1626
+#: g10/import.c:1627
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "avain %08lX: odottamaton allekirjoitusluokka (0x%02X) - ohitetaan\n"
-#: g10/import.c:1726
+#: g10/import.c:1727
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "avain %08lX: käyttäjätunnuksen kaksoiskappale havaittu - liitetty\n"
-#: g10/import.c:1788
+#: g10/import.c:1789
#, fuzzy, c-format
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:1802
+#: g10/import.c:1803
#, 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:1861
+#: g10/import.c:1862
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n"
-#: g10/import.c:1895
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
-#: g10/import.c:2284
+#: g10/import.c:2285
#, fuzzy
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "julkinen avain ei täsmää salaiseen avaimeen!\n"
-#: g10/import.c:2292
+#: g10/import.c:2293
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "ohitetaan: salainen avain on jo paikalla\n"
-#: g10/import.c:2294
+#: g10/import.c:2295
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "ohitetaan: salainen avain on jo paikalla\n"
@@ -3027,8 +3027,8 @@ msgstr ""
msgid "Really sign? (y/N) "
msgstr "Varmastiko allekirjoita? "
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "allekirjoitus epäonnistui: %s\n"
@@ -3557,7 +3557,7 @@ 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
@@ -3600,12 +3600,32 @@ msgstr "Mitään ei poistettu.\n"
msgid "invalid"
msgstr "virheellinen ascii-koodaus"
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "Käyttäjätunnus \"%s\" on mitätöity."
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "Käyttäjätunnus \"%s\" on mitätöity."
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "Käyttäjätunnus \"%s\" on mitätöity."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
+
+#: g10/keyedit.c:3252
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3615,199 +3635,199 @@ msgstr ""
"voi\n"
" saada jotkin PGP:n versiot hylkäämään avaimen.\n"
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3357
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:3372
+#: g10/keyedit.c:3377
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:3397
+#: g10/keyedit.c:3402
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:3412
+#: g10/keyedit.c:3417
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:3434
+#: g10/keyedit.c:3439
#, 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:3453
+#: g10/keyedit.c:3458
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:3459
+#: g10/keyedit.c:3464
#, fuzzy
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:3520
+#: g10/keyedit.c:3525
msgid "Please remove selections from the secret keys.\n"
msgstr "Poista salaisten avainten valinnat, kiitos.\n"
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3531
#, fuzzy
msgid "Please select at most one subkey.\n"
msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
msgid "Changing expiration time for the primary key.\n"
msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3584
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:3595
+#: g10/keyedit.c:3600
msgid "No corresponding signature in secret ring\n"
msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3673
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
msgid "Please select exactly one user ID.\n"
msgstr "Valitse tasan yksi käyttäjätunnus!\n"
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, 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:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Haluatko varmasti käyttää sitä (k/E)? "
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4132
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Haluatko varmasti käyttää sitä (k/E)? "
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4194
#, fuzzy
msgid "Enter the notation: "
msgstr "Allekirjoitusnotaatio: "
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Ylikirjoita (k/E)? "
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, c-format
msgid "No user ID with index %d\n"
msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4465
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "käyttäjätunnus: \""
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " %08lX allekirjoitti tämän %s%s%s\n"
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr " (vientiin kelpaamaton)"
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Tämä allekirjoitus vanheni %s.\n"
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4644
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4671
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
#, fuzzy
msgid " (non-revocable)"
msgstr " (vientiin kelpaamaton)"
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " %08lX mitätöi tämän %s\n"
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
msgid "Really create the revocation certificates? (y/N) "
msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr "salainen avain ei ole saatavilla\n"
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, 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:4858
+#: g10/keyedit.c:4863
#, 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:4922
+#: g10/keyedit.c:4927
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@ -4434,7 +4454,7 @@ msgstr "disable"
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "virheelliset vientivalitsimet\n"
@@ -4469,106 +4489,106 @@ msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
msgid "searching for names from %s\n"
msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"allekirjoitettu avaimellasi %08lX %s\n"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
#, fuzzy
msgid "no keyserver action!\n"
msgstr "virheelliset vientivalitsimet\n"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
#, fuzzy
msgid "keyserver timed out\n"
msgstr "avainpalvelinvirhe"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
#, fuzzy
msgid "keyserver internal error\n"
msgstr "avainpalvelinvirhe"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "pyydetään avainta %08lX kohteesta %s\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "pyydetään avainta %08lX kohteesta %s\n"
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
@@ -4982,12 +5002,12 @@ msgstr "Syötä salasana\n"
msgid "cancelled by user\n"
msgstr "käyttäjän peruma\n"
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
#, fuzzy
msgid "can't query passphrase in batch mode\n"
msgstr "salasanan kysyminen ei onnistu eräajossa\n"
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "Syötä salasana: "
@@ -5010,7 +5030,7 @@ msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "Toista salasana: "
@@ -6483,18 +6503,6 @@ msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n"
#~ msgstr "komentoa %s \"%s\" ei voi suorittaa: %s\n"
#, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "Käyttäjätunnus \"%s\" on mitätöity."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "Käyttäjätunnus \"%s\" on mitätöity."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "Käyttäjätunnus \"%s\" on mitätöity."
-
-#, fuzzy
#~ msgid "No user IDs are removable.\n"
#~ msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
diff --git a/po/fr.po b/po/fr.po
index 2b50b72bd..735e709e0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.2rc2\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\n"
"PO-Revision-Date: 2005-06-28 00:24+0200\n"
"Last-Translator: Ga�l Qu�ri <[email protected]>\n"
"Language-Team: French <[email protected]>\n"
@@ -45,7 +45,7 @@ msgstr "�criture de la cl� secr�te dans `%s'\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -83,7 +83,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:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, c-format
@@ -317,75 +317,75 @@ msgstr ""
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "impossible d'acc�der � %s - carte OpenPGP invalide ?\n"
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr "armure: %s\n"
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr "en-t�te d'armure invalide: "
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr "en-t�te d'armure: "
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr "en-t�te de signature claire invalide\n"
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr "signatures en texte clair imbriqu�es\n"
-#: g10/armor.c:568
+#: g10/armor.c:620
msgid "unexpected armor: "
msgstr "armure inattendue: "
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr "ligne �chapp�e par `-' invalide: "
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "caract�re %02X invalide en radix64 ignor�\n"
-#: g10/armor.c:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr "fin de fichier pr�matur�e (pas de CRC)\n"
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr "fin de fichier pr�matur�e (dans le CRC)\n"
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr "CRC d�form�\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "Erreur de CRC; %06lX - %06lX\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
msgid "premature eof (in trailer)\n"
msgstr "fin de fichier pr�matur�e (dans la remorque)\n"
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr "erreur dans la ligne de remorque\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr "aucune donn�e OpenPGP valide n'a �t� trouv�e.\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, 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:1167
+#: g10/armor.c:1219
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -471,7 +471,7 @@ msgstr "URL pour r�cup�rer la cl� publique: %s"
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Erreur: URL trop long (la limite est %d caract�res).\n"
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr "erreur pendant la lecture de `%s': %s\n"
@@ -734,7 +734,7 @@ msgstr "R�p�tez ce code PIN: "
msgid "PIN not correctly repeated; try again"
msgstr "le code PIN n'a pas �t� correctement r�p�t� ; recommencez"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -744,13 +744,13 @@ msgstr "impossible d'ouvrir `%s'\n"
msgid "--output doesn't work for this command\n"
msgstr "--output n'est pas compatible avec cette commande\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "cl� � %s � introuvable: %s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %s\n"
@@ -867,24 +867,24 @@ msgstr "vous ne pouvez pas utiliser %s en mode %s.\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s chiffr� pour: \"%s\"\n"
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr "donn�es chiffr�es avec %s\n"
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "chiffr� avec l'algorithme inconnu %d\n"
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"ATTENTION: Le message a �t� chiffr� avec une cl� faible pendant le\n"
"chiffrement sym�trique.\n"
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
msgid "problem handling encrypted packet\n"
msgstr "probl�me de gestion des paquets chiffr�s\n"
@@ -1019,7 +1019,7 @@ msgstr ""
msgid "WARNING: nothing exported\n"
msgstr "ATTENTION: rien n'a �t� export�\n"
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -1027,127 +1027,127 @@ msgstr ""
"@Commandes:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[fichier]|faire une signature"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[fichier]|faire une signature en texte clair"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "faire une signature d�tach�e"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "chiffrer les donn�es"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr "chiffrement sym�trique seulement"
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "d�chiffrer les donn�es (d�faut)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "v�rifier une signature"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "lister les cl�s"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "lister les cl�s et les signatures"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "list and check key signatures"
msgstr "lister et v�rifier les signatures des cl�s"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "lister les cl�s et les empreintes"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "lister les cl�s secr�tes"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "g�n�rer une nouvelle paire de cl�s"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "remove keys from the public keyring"
msgstr "enlever les cl�s du porte-cl�s public"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
msgid "remove keys from the secret keyring"
msgstr "enlever les cl�s du porte-cl�s secret"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "signer une cl�"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "signer une cl� localement"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "signer ou �diter une cl�"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr "g�n�rer un certificat de r�vocation"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "exporter les cl�s"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "exporter les cl�s vers un serveur de cl�s"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "importer les cl�s d'un serveur de cl�s"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "search for keys on a key server"
msgstr "chercher les cl�s avec un serveur de cl�s"
-#: g10/gpg.c:411
+#: g10/gpg.c:412
msgid "update all keys from a keyserver"
msgstr "mettre � jour les cl�s depuis un serveur"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "importer/fusionner les cl�s"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr "afficher l'�tat de la carte"
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr "changer les donn�es d'une carte"
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr "changer le code PIN d'une carte"
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr "mettre la base de confiance � jour"
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1157,51 +1157,51 @@ msgstr ""
"Options:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr "cr�er une sortie ascii avec armure"
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|NOM|chiffrer pour NOM"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
msgid "use this user-id to sign or decrypt"
msgstr "utiliser ce nom pour signer ou d�chiffrer"
-#: g10/gpg.c:456
+#: g10/gpg.c:457
msgid "|N|set compress level N (0 disables)"
msgstr "|N|niveau de compression N (0 d�sactive)"
-#: g10/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr "utiliser le mode texte canonique"
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "utiliser comme fichier de sortie"
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "bavard"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "ne rien changer"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr "demander avant d'�craser un fichier"
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr "utiliser strictement le comportement OpenPGP"
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr "g�n�rer des messages compatibles avec PGP 2.x"
-#: g10/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1209,7 +1209,7 @@ msgstr ""
"@\n"
"(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
-#: g10/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1229,17 +1229,17 @@ msgstr ""
" --list-keys [utilisateur] montrer les cl�s\n"
" --fingerprint [utilisateur] montrer les empreintes\n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
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/gpg.c:778
+#: g10/gpg.c:780
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
-#: g10/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1249,7 +1249,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/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1257,85 +1257,85 @@ msgstr ""
"\n"
"Algorithmes support�s:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr "Cl� publique: "
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr "Chiffrement: "
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr "Hachage: "
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
msgid "Compression: "
msgstr "Compression: "
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "utilisation: gpg [options] "
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "commandes en conflit\n"
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "aucun signe = trouv� dans la d�finition du groupe `%s'\n"
-#: g10/gpg.c:1259
+#: g10/gpg.c:1261
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr ""
"AVERTISSEMENT: le propri�taire du r�pertoire personnel `%s' est\n"
"peu s�r\n"
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr ""
"AVERTISSEMENT: le propri�taire du fichier de configuration `%s'\n"
"est peu s�r\n"
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr ""
"AVERTISSEMENT: le propri�taire de l'extension `%s' est peu\n"
"s�r\n"
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr ""
"AVERTISSEMENT: les permissions du r�pertoire personnel `%s'\n"
"sont peu s�res\n"
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr ""
"AVERTISSEMENT: les permissions du fichier de configuration\n"
"`%s' sont peu s�res\n"
-#: g10/gpg.c:1277
+#: g10/gpg.c:1279
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr ""
"AVERTISSEMENT: les permissions de l'extension `%s' sont\n"
"peu s�res\n"
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, c-format
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 le r�pertoire personnel `%s'\n"
-#: g10/gpg.c:1286
+#: g10/gpg.c:1288
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1343,21 +1343,21 @@ msgstr ""
"AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
"s�r pour le fichier de configuration `%s'\n"
-#: g10/gpg.c:1289
+#: g10/gpg.c:1291
#, c-format
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 l'extension `%s'\n"
-#: g10/gpg.c:1295
+#: g10/gpg.c:1297
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
"r�pertoire personnel `%s' sont peu s�res\n"
-#: g10/gpg.c:1298
+#: g10/gpg.c:1300
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1365,503 +1365,503 @@ msgstr ""
"AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
"fichier de configuration `%s' sont peu s�res\n"
-#: g10/gpg.c:1301
+#: g10/gpg.c:1303
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
"AVERTISSEMENT: les permissions du r�pertoire contenant\n"
"l'extension `%s' sont peu s�res\n"
-#: g10/gpg.c:1442
+#: g10/gpg.c:1444
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "�l�ment de configuration `%s' inconnu\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
#, fuzzy
msgid "show the keyring name in key listings"
msgstr ""
"passer de la liste des cl�s secr�tes � celle des cl�s priv�es\n"
"et inversement"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, 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/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTE: pas de fichier d'options par d�faut `%s'\n"
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr "fichier d'options `%s': %s\n"
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr "lire les options de `%s'\n"
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, 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/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "`%s' n'est pas un jeu de caract�res valide\n"
-#: g10/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
msgid "could not parse keyserver URL\n"
msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: les options du serveur de cl�s sont invalides\n"
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
msgid "invalid keyserver options\n"
msgstr "les options du serveur de cl�s sont invalides\n"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: options d'import invalides\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
msgid "invalid import options\n"
msgstr "options d'import invalides\n"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: options d'export invalides\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
msgid "invalid export options\n"
msgstr "options d'export invalides\n"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: options de liste invalides\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
msgid "invalid list options\n"
msgstr "options de liste invalides\n"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
#, fuzzy
msgid "show all notations during signature verification"
msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: options de v�rification invalides\n"
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
msgid "invalid verify options\n"
msgstr "options de v�rification invalides\n"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "impossible de mettre le chemin d'ex�cution � %s\n"
-#: g10/gpg.c:2764
+#: g10/gpg.c:2768
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: options de v�rification invalides\n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
msgid "WARNING: program may create a core file!\n"
msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
-#: g10/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ATTENTION: %s remplace %s\n"
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n'est pas permis avec %s !\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n'a aucun sens avec %s !\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2865
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "NOTE: %s n'est pas disponible dans cette version\n"
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "pas d'ex�cution ave une m�moire non s�curis�e � cause de %s\n"
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
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/gpg.c:2896
+#: g10/gpg.c:2900
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/gpg.c:2902
+#: g10/gpg.c:2906
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/gpg.c:2915
+#: g10/gpg.c:2919
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/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr "la fonction de hachage s�lectionn�e est invalide\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
msgid "selected compression algorithm is invalid\n"
msgstr "l'algorithme de compression s�lectionn� est invalide\n"
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
msgid "selected certification digest algorithm is invalid\n"
msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
msgid "completes-needed must be greater than 0\n"
msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
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/gpg.c:3021
+#: g10/gpg.c:3025
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/gpg.c:3023
+#: g10/gpg.c:3027
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/gpg.c:3026
+#: g10/gpg.c:3030
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTE: le mode S2K simple (0) est fortement d�conseill�\n"
-#: g10/gpg.c:3030
+#: g10/gpg.c:3034
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "mode S2K invalide; ce doit �tre 0, 1 ou 3\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3041
msgid "invalid default preferences\n"
msgstr "pr�f�rences par d�faut invalides\n"
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
msgid "invalid personal cipher preferences\n"
msgstr "pr�f�rences de chiffrement personnelles invalides\n"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
msgid "invalid personal digest preferences\n"
msgstr "pr�f�rences de hachage personnelles invalides\n"
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
msgid "invalid personal compress preferences\n"
msgstr "pr�f�rences de compression personnelles invalides\n"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ne marche pas encore avec %s\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, 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/gpg.c:3139
+#: g10/gpg.c:3143
#, 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/gpg.c:3144
+#: g10/gpg.c:3148
#, 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/gpg.c:3246
+#: g10/gpg.c:3250
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "impossible d'initialiser la base de confiance: %s\n"
-#: g10/gpg.c:3257
+#: g10/gpg.c:3261
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"AVERTISSEMENT: des destinataires (-r) ont �t� donn�s alors que le\n"
"chiffrement ne se fait pas par cl� publique\n"
-#: g10/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [nom du fichier]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [nom du fichier]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "le chiffrement sym�trique de `%s' a �chou�: %s\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [nom du fichier]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [nom du fichier]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "vous ne pouvez pas utiliser --symmetric --encrypt avec --s2k-mode 0\n"
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "vous ne pouvez pas utiliser --symmetric --encrypt en mode %s.\n"
-#: g10/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--sign [nom du fichier]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nom du fichier]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [nom du fichier]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
"Vous ne pouvez pas utiliser --symmetric --sign --encrypt avec\n"
"--s2k-mode 0\n"
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
"vous ne pouvez pas utiliser --symmetric --sign --encrypt\n"
"en mode %s.\n"
-#: g10/gpg.c:3376
+#: g10/gpg.c:3380
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nom du fichier]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [nom du fichier]"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [nom du fichier]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key utilisateur"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key utilisateur"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key utilisateur [commandes]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
-#: g10/gpg.c:3556
+#: g10/gpg.c:3560
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "la r�ception depuis le serveur de cl�s a �chou�: %s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, c-format
msgid "key export failed: %s\n"
msgstr "l'export de la cl� a �chou�: %s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "la recherche au sein du serveur de cl�s a �chou�: %s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "le rafra�chissement par le serveur de cl�s a �chou�: %s\n"
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "la suppression d'une armure a �chou�: %s\n"
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "la construction d'une armure a �chou�: %s \n"
-#: g10/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algorithme de hachage `%s' invalide\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[nom du fichier]"
-#: g10/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr "Vous pouvez taper votre message...\n"
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
msgid "the given certification policy URL is invalid\n"
msgstr "l'URL de politique de certification donn�e est invalide\n"
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
msgid "the given signature policy URL is invalid\n"
msgstr "l'URL de politique de signature donn�e est invalide\n"
-#: g10/gpg.c:4193
+#: g10/gpg.c:4197
msgid "the given preferred keyserver URL is invalid\n"
msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
@@ -1886,7 +1886,7 @@ msgstr ""
"La cl� invalide %s a �t� rendue valide par\n"
"--allow-non-selfsigned-uid\n"
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "pas de sous-cl� secr�te pour la cl� publique %s - ignor�e\n"
@@ -2297,433 +2297,433 @@ msgstr "nettoyer les parties inutilisables de la cl�"
msgid "remove as much as possible from key after import"
msgstr ""
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr "un bloc de type %d a �t� ignor�\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu cl�s trait�es jusqu'ici\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr " Quantit� totale trait�e: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " nouvelles cl�s ignor�es: %lu\n"
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sans nom d'utilisateur: %lu\n"
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr " import�e: %lu"
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr " inchang�e: %lu\n"
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nouveaux noms d'utilisateurs: %lu\n"
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nouvelles sous-cl�s: %lu\n"
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr " nouvelles signatures: %lu\n"
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nouvelles r�vocations de cl�s: %lu\n"
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr " cl�s secr�tes lues: %lu\n"
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " cl�s secr�tes import�es: %lu\n"
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " cl�s secr�tes inchang�es: %lu\n"
-#: g10/import.c:321
+#: g10/import.c:322
#, c-format
msgid " not imported: %lu\n"
msgstr " non import�e: %lu\n"
-#: g10/import.c:323
+#: g10/import.c:324
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " signatures nettoy�es: %lu\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " noms d'utilisateur nettoy�s: %lu\n"
-#: g10/import.c:566
+#: g10/import.c:567
#, fuzzy, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr "AVERTISSEMENT: la cl� %s contient des pr�ferences pour des\n"
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
#, fuzzy
msgid " algorithms on these user IDs:\n"
msgstr "algorithmes indisponibles sur ces noms d'utilisateurs:\n"
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " � %s �: pr�f�rence pour l'algorithme de chiffrement %s\n"
-#: g10/import.c:619
+#: g10/import.c:620
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " � %s �: pr�f�rence pour l'algorithme de hachage %s\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " � %s �: pr�f�rence pour l'algorithme de compression %s\n"
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "il est fortement sugg�r� de mettre � jour vos pr�f�rences et\n"
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"redistribuer cette cl� pour �viter les probl�mes potentiels qui seraient\n"
"caus�s par des algorithmes non appropri�s\n"
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"vous pouvez mettre � jour vos pr�f�rences avec: \n"
"gpg --edit-key %s updpref save\n"
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, c-format
msgid "key %s: no user ID\n"
msgstr "cl� %s: pas de nom d'utilisateur\n"
-#: g10/import.c:749
+#: g10/import.c:750
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "cl� %s: corruption de sous-cl� PKS r�par�e\n"
-#: g10/import.c:764
+#: g10/import.c:765
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "cl� %s: nom d'utilisateur non auto-sign� accept� � %s �\n"
-#: g10/import.c:770
+#: g10/import.c:771
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "cl� %s: pas de nom d'utilisateur valide\n"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr "cela peut provenir d'une auto-signature manquante\n"
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "cl� %s: cl� publique non trouv�e: %s\n"
-#: g10/import.c:788
+#: g10/import.c:789
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "cl� %s: nouvelle cl� - ignor�e\n"
-#: g10/import.c:797
+#: g10/import.c:798
#, c-format
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:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr "�criture de `%s'\n"
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
-#: g10/import.c:825
+#: g10/import.c:826
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "cl� %s: cl� publique � %s � import�e\n"
-#: g10/import.c:849
+#: g10/import.c:850
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "cl� %s: ne ressemble pas � notre copie\n"
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "cl� %s: impossible de trouver le bloc de cl�s original: %s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "cl� %s: impossible de lire le bloc de cl�s original: %s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "cl� %s: � %s � un nouvel utilisateur\n"
-#: g10/import.c:914
+#: g10/import.c:915
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "cl� %s: � %s � %d nouveaux utilisateurs\n"
-#: g10/import.c:917
+#: g10/import.c:918
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "cl� %s: � %s � une nouvelle signature\n"
-#: g10/import.c:920
+#: g10/import.c:921
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "cl� %s: � %s � %d nouvelles signatures\n"
-#: g10/import.c:923
+#: g10/import.c:924
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "cl� %s: � %s � une nouvelle sous-cl�\n"
-#: g10/import.c:926
+#: g10/import.c:927
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "cl� %s: � %s � %d nouvelles sous-cl�s\n"
-#: g10/import.c:929
+#: g10/import.c:930
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "cl� %s: � %s � %d signature nettoy�e\n"
-#: g10/import.c:932
+#: g10/import.c:933
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "cl� %s: � %s � %d signatures nettoy�es\n"
-#: g10/import.c:935
+#: g10/import.c:936
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "cl� %s: � %s � %d nom d'utilisateur nettoy�\n"
-#: g10/import.c:938
+#: g10/import.c:939
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "cl� %s: � %s � %d noms d'utilisateur nettoy�s\n"
-#: g10/import.c:961
+#: g10/import.c:962
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "cl� %s: � %s � n'a pas chang�\n"
-#: g10/import.c:1124
+#: g10/import.c:1125
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr ""
"cl� %s: cl� secr�te avec le chiffrement invalide %d - non prise\n"
"en compte\n"
-#: g10/import.c:1135
+#: g10/import.c:1136
msgid "importing secret keys not allowed\n"
msgstr "il est interdit d'importer les cl� secr�tes\n"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "pas de porte-cl�s par d�faut: %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, c-format
msgid "key %s: secret key imported\n"
msgstr "cl� %s: cl� secr�te import�e\n"
-#: g10/import.c:1193
+#: g10/import.c:1194
#, c-format
msgid "key %s: already in secret keyring\n"
msgstr "cl� %s: d�j� dans le porte-cl�s secret\n"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "cl� %s: cl� secr�te non trouv�e: %s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"cl� %s: pas de cl� publique - le certificat de r�vocation ne peut\n"
"�tre appliqu�\n"
-#: g10/import.c:1276
+#: g10/import.c:1277
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "cl� %s: certificat de r�vocation invalide: %s - rejet�\n"
-#: g10/import.c:1308
+#: g10/import.c:1309
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "cl� %s: � %s � certificat de r�vocation import�\n"
-#: g10/import.c:1374
+#: g10/import.c:1375
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "cl� %s: pas de nom d'utilisateur pour la signature\n"
-#: g10/import.c:1389
+#: g10/import.c:1390
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"cl� %s: algorithme de cl� publique non support� avec le nom\n"
"d'utilisateur � %s �\n"
-#: g10/import.c:1391
+#: g10/import.c:1392
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "cl� %s: auto-signature du nom d'utilisateur � %s � invalide\n"
-#: g10/import.c:1409
+#: g10/import.c:1410
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "cl� %s: pas de sous-cl� pour relier la cl�\n"
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "cl� %s: algorithme de cl� publique non support�\n"
-#: g10/import.c:1422
+#: g10/import.c:1423
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "cl� %s: liaison avec la sous-cl� invalide\n"
-#: g10/import.c:1437
+#: g10/import.c:1438
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "cl� %s: supression de liaisons multiples avec des sous-cl�s\n"
-#: g10/import.c:1459
+#: g10/import.c:1460
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "cl� %s: pas de sous-cl� pour r�voquer la cl�\n"
-#: g10/import.c:1472
+#: g10/import.c:1473
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "cl� %s: r�vocation de sous-cl� invalide\n"
-#: g10/import.c:1487
+#: g10/import.c:1488
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "cl� %s: suppression de la r�vocation de sous-cl�s multiples\n"
-#: g10/import.c:1529
+#: g10/import.c:1530
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "cl� %s: nom d'utilisateur � %s � non pris en compte\n"
-#: g10/import.c:1550
+#: g10/import.c:1551
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "cl� %s: sous-cl� non prise en compte\n"
-#: g10/import.c:1577
+#: g10/import.c:1578
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "cl� %s: signature non exportable (classe 0x%02X) - ignor�e\n"
-#: g10/import.c:1587
+#: g10/import.c:1588
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "cl� %s: certificat de r�vocation au mauvais endroit - ignor�e\n"
-#: g10/import.c:1604
+#: g10/import.c:1605
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "cl� %s: certificat de r�vocation invalide: %s - ignor�e\n"
-#: g10/import.c:1618
+#: g10/import.c:1619
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "cl� %s: signature de sous-cl� au mauvais endroit - ignor�e\n"
-#: g10/import.c:1626
+#: g10/import.c:1627
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "cl� %s: classe de signature non attendue (0x%02X) - ignor�e\n"
-#: g10/import.c:1726
+#: g10/import.c:1727
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "cl� %s: nom d'utilisateur en double d�tect� - fusion accomplie\n"
-#: g10/import.c:1788
+#: g10/import.c:1789
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"AVERTISSEMENT: la cl� %s est peut-�tre r�voqu�e: recherche de\n"
"la cl� de r�vocation %s\n"
-#: g10/import.c:1802
+#: g10/import.c:1803
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"AVERTISSEMENT: la cl� %s est peut-�tre r�voqu�e: la cl� de\n"
"r�vocation %s est absente.\n"
-#: g10/import.c:1861
+#: g10/import.c:1862
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "cl� %s: certificat de r�vocation � %s � ajout�\n"
-#: g10/import.c:1895
+#: g10/import.c:1896
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "cl� %s: ajout de la signature de cl� directe\n"
-#: g10/import.c:2284
+#: g10/import.c:2285
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "NOTE: le num�ro de s�rie d'une cl� n'est pas celui de la carte\n"
-#: g10/import.c:2292
+#: g10/import.c:2293
msgid "NOTE: primary key is online and stored on card\n"
msgstr "NOTE: la cl� primaire est en ligne et stock�e sur la carte\n"
-#: g10/import.c:2294
+#: g10/import.c:2295
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "NOTE: la cl� secondaire est en ligne et stock�e sur la carte\n"
@@ -3031,8 +3031,8 @@ msgstr "J'ai v�rifi� cette cl� avec grand soin.\n"
msgid "Really sign? (y/N) "
msgstr "Signer r�ellement ? (o/N) "
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "la signature a �chou�: %s\n"
@@ -3550,7 +3550,7 @@ msgstr ""
"d'identit� peut emp�cher certaines versions de PGP d'accepter\n"
"cette cl�\n"
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Etes-vous s�r de vouloir l'ajouter ? (y/N) "
@@ -3593,12 +3593,32 @@ msgstr "Rien n'a �t� supprim�.\n"
msgid "invalid"
msgstr "invalide"
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "cl� %s: � %s � %d signature nettoy�e\n"
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "cl� %s: � %s � %d signatures nettoy�es\n"
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
+
+#: g10/keyedit.c:3252
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3608,202 +3628,202 @@ msgstr ""
"d�sign� peut emp�cher certaines versions de PGP d'accepter\n"
"cette cl�.\n"
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3357
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:3372
+#: g10/keyedit.c:3377
msgid "Enter the user ID of the designated revoker: "
msgstr "Entrez le nom d'utilisateur du r�vocateur d�sign�: "
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3402
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:3412
+#: g10/keyedit.c:3417
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:3434
+#: g10/keyedit.c:3439
msgid "this key has already been designated as a revoker\n"
msgstr "cette cl� � d�j� �t� d�sign�e comme un r�vocateur\n"
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3458
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:3459
+#: g10/keyedit.c:3464
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:3520
+#: g10/keyedit.c:3525
msgid "Please remove selections from the secret keys.\n"
msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3531
msgid "Please select at most one subkey.\n"
msgstr "Vous devez s�lectionner au plus une sous-cl�.\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
msgid "Changing expiration time for a subkey.\n"
msgstr "Changer la date d'expiration d'une sous-cl�.\n"
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
msgid "Changing expiration time for the primary key.\n"
msgstr "Changer la date d'expiration de la cl� principale.\n"
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3584
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:3595
+#: g10/keyedit.c:3600
msgid "No corresponding signature in secret ring\n"
msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3673
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr ""
"AVERTISSEMENT: la sous-cl� de signature %s n'a pas de certificat\n"
"crois�\n"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
msgid "Please select exactly one user ID.\n"
msgstr "Vous devez s�lectionner exactement un utilisateur.\n"
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, 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:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr "Entrez l'URL de votre serveur de cl�s favori: "
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Etes-vous s�r de vouloir le remplacer ? (o/N) "
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4132
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Etes-vous s�r de vouloir le supprimer ? (o/N) "
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4194
#, fuzzy
msgid "Enter the notation: "
msgstr "Notation de signature: "
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "R��crire par-dessus ? (o/N) "
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, c-format
msgid "No user ID with index %d\n"
msgstr "Pas d'utilisateur avec l'index %d\n"
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4465
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Pas de nom d'utilisateur avec le hachage %s\n"
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, c-format
msgid "No subkey with index %d\n"
msgstr "Pas de sous-cl� avec l'index %d\n"
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "nom d'utilisateur: � %s �\n"
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "sign� par votre cl� %s � %s%s%s\n"
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr " (non-exportable)"
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Cette signature a expir� le %s.\n"
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
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:4639
+#: g10/keyedit.c:4644
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:4666
+#: g10/keyedit.c:4671
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Vous avez sign� ces noms d'utilisateurs sur la cl� %s:\n"
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
msgid " (non-revocable)"
msgstr " (non-r�vocable)"
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "r�voqu� par votre cl� %s � %s\n"
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
msgid "Really create the revocation certificates? (y/N) "
msgstr "Cr�er r�ellement les certificats de r�vocation ? (o/N) "
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr "pas de cl� secr�te\n"
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, 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:4858
+#: g10/keyedit.c:4863
#, 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:4922
+#: g10/keyedit.c:4927
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "La cl� %s est d�j� r�voqu�.\n"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "La sous-cl� %s est d�j� r�voqu�e.\n"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@ -4429,7 +4449,7 @@ msgstr "d�sactiv�"
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Entrez le(s) nombre(s), S)uivant, ou Q)uitter > "
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "protocole serveur de cl�s invalide (nous %d!=gestionnaire %d)\n"
@@ -4463,111 +4483,111 @@ msgstr "recherche de � %s � du serveur %s %s\n"
msgid "searching for names from %s\n"
msgstr "recherche de � %s � de %s\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "envoi de la cl� %s au serveur %s %s\n"
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, c-format
msgid "sending key %s to %s\n"
msgstr "envoi de la cl� %s � %s\n"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "recherche de � %s � du serveur %s %s\n"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "recherche de � %s � de %s\n"
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
msgid "no keyserver action!\n"
msgstr "pas d'action pour le serveur de cl�s !\n"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
"AVERTISSEMENT: le gestionnaire de serveurs de cl�s provient d'une\n"
"version diff�rente de GnuPG (%s)\n"
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr "le serveurs de cl�s n'a pas envoy� son num�ro de VERSION\n"
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr "pas de serveur de cl�s connu (utilisez l'option --keyserver)\n"
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
"les appels externes � un serveur de cl� ne sont pas support�s dans\n"
"cette compilation\n"
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr "pas de gestionnaire pour le type de serveurs de cl�s `%s'\n"
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
"l'action `%s' n'est pas support�e avec le type de serveurs\n"
"de cl�s `%s'\n"
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, c-format
msgid "%s does not support handler version %d\n"
msgstr "%s ne supporte pas le gestionnaire de version %d\n"
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
msgid "keyserver timed out\n"
msgstr "le d�lai d'attente du serveur de cl�s a expir�\n"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
msgid "keyserver internal error\n"
msgstr "erreur interne du serveur de cl�s\n"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "erreur de communication avec le serveur de cl�s: %s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "� %s � n'est pas une ID de cl�: ignor�\n"
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr ""
"AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
"via %s: %s\n"
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "rafra�chissement d'une cl� depuis %s\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "rafra�chissement de %d cl�s depuis %s\n"
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr ""
"AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
"via %s: %s\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr ""
@@ -4988,11 +5008,11 @@ msgstr "Entrez la phrase de passe\n"
msgid "cancelled by user\n"
msgstr "annul� par l'utilisateur\n"
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
msgid "can't query passphrase in batch mode\n"
msgstr "impossible de demander la phrase de passe en mode automatique\n"
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "Entrez la phrase de passe: "
@@ -5015,7 +5035,7 @@ msgstr "cl� de %u bits %s, ID %s, cr��e le %s"
msgid " (subkey on main key ID %s)"
msgstr " (sous-cl� de la cl� principale ID %s)"
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "R�p�tez la phrase de passe: "
diff --git a/po/gl.po b/po/gl.po
index e0267e17b..5e19f1b8e 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: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\n"
"PO-Revision-Date: 2003-12-04 11:39+0100\n"
"Last-Translator: Jacobo Tarrio <[email protected]>\n"
"Language-Team: Galician <[email protected]>\n"
@@ -40,7 +40,7 @@ msgstr "gravando a chave secreta en `%s'\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -76,7 +76,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:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, c-format
@@ -308,77 +308,77 @@ msgstr ""
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "non se atoparon datos OpenPGP v�lidos.\n"
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr "armadura: %s\n"
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr "cabeceira de armadura non v�lida: "
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr "cabeceira de armadura: "
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr "cabeceira de sinatura en claro non v�lida\n"
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr "sinaturas en texto claro ani�adas\n"
-#: g10/armor.c:568
+#: g10/armor.c:620
#, fuzzy
msgid "unexpected armor: "
msgstr "armadura inesperada:"
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr "li�a escapada cunha barra non v�lida: "
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "car�cter radix64 non v�lido %02x omitido\n"
-#: g10/armor.c:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr "fin de ficheiro prematura (non hai CRC)\n"
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr "fin de ficheiro prematura (no CRC)\n"
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr "CRC mal formado\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "Erro de CRC; %06lx - %06lx\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "fin de ficheiro prematura (nas li�as adicionais)\n"
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr "error nunha li�a adicional\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr "non se atoparon datos OpenPGP v�lidos.\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, 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:1167
+#: g10/armor.c:1219
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -470,7 +470,7 @@ msgstr "non hai unha chave p�blica correspondente: %s\n"
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr "erro lendo `%s': %s\n"
@@ -749,7 +749,7 @@ msgstr "Repita o contrasinal: "
msgid "PIN not correctly repeated; try again"
msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -759,13 +759,13 @@ msgstr "non se puido abrir `%s'\n"
msgid "--output doesn't work for this command\n"
msgstr "--output non traballa con este comando\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "non se atopou a chave `%s': %s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %s\n"
@@ -881,22 +881,22 @@ msgstr "non se pode empregar %s no modo %s\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrado para: \"%s\"\n"
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr "datos cifrados con %s\n"
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "cifrado cun algoritmo desco�ecido %d\n"
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr "AVISO: cifrouse a mensaxe cunha chave feble no cifrado sim�trico.\n"
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
msgid "problem handling encrypted packet\n"
msgstr "problema ao manexa-lo paquete cifrado\n"
@@ -1030,7 +1030,7 @@ msgstr ""
msgid "WARNING: nothing exported\n"
msgstr "AVISO: non se exportou nada\n"
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -1038,128 +1038,128 @@ msgstr ""
"@Comandos:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[ficheiro]|facer unha sinatura"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[ficheiro]|facer unha sinatura en texto claro"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "facer unha sinatura separada"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "cifrar datos"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr "cifrar s� con cifrado sim�trico"
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "descifrar datos (por defecto)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "verificar unha sinatura"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "ve-la lista de chaves"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "ve-la lista de chaves e sinaturas"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
#, fuzzy
msgid "list and check key signatures"
msgstr "verifica-las sinaturas das chaves"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "ve-la lista de chaves e pegadas dactilares"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "ve-la lista de chaves secretas"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "xerar un novo par de chaves"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "remove keys from the public keyring"
msgstr "borrar chaves do chaveiro p�blico"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
msgid "remove keys from the secret keyring"
msgstr "borrar chaves do chaveiro secreto"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "asinar unha chave"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "asinar unha chave localmente"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "asinar ou editar unha chave"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr "xerar un certificado de revocaci�n"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "exportar chaves"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "exportar chaves a un servidor de chaves"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "importar chaves dun servidor de chaves"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "search for keys on a key server"
msgstr "buscar chaves nun servidor de chaves"
-#: g10/gpg.c:411
+#: g10/gpg.c:412
msgid "update all keys from a keyserver"
msgstr "actualizar t�dalas chaves dun servidor de chaves"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "importar/mesturar chaves"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr "actualiza-la base de datos de confianza"
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1169,51 +1169,51 @@ msgstr ""
"Opci�ns:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr "crear sa�da con armadura en ascii"
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|NOME|cifrar para NOME"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
msgid "use this user-id to sign or decrypt"
msgstr "empregar este id de usuario para asinar ou descifrar"
-#: g10/gpg.c:456
+#: g10/gpg.c:457
msgid "|N|set compress level N (0 disables)"
msgstr "|N|axusta-lo nivel de compresi�n a N (0 desactiva)"
-#: g10/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr "usar modo de texto can�nico"
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "usar coma ficheiro de sa�da"
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "lareto"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "non facer ning�n cambio"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr "avisar antes de sobrescribir"
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1221,7 +1221,7 @@ msgstr ""
"@\n"
"(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
-#: g10/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1241,17 +1241,17 @@ msgstr ""
" --list-keys [nomes] amosa-las chaves\n"
" --fingerprint [nomes] amosa-las pegadas dactilares\n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
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/gpg.c:778
+#: g10/gpg.c:780
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
-#: g10/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1261,7 +1261,7 @@ msgstr ""
"asinar, verificar, cifrar ou descifrar\n"
"a operaci�n por defecto depende dos datos de entrada\n"
-#: g10/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1269,580 +1269,580 @@ msgstr ""
"\n"
"Algoritmos soportados:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr "P�blica: "
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr "Cifra: "
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr "Hash: "
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
msgid "Compression: "
msgstr "Compresi�n: "
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "uso: gpg [opci�ns] "
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "comandos conflictivos\n"
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, fuzzy, 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/gpg.c:1259
+#: g10/gpg.c:1261
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
-#: g10/gpg.c:1277
+#: g10/gpg.c:1279
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
-#: g10/gpg.c:1286
+#: g10/gpg.c:1288
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
-#: g10/gpg.c:1289
+#: g10/gpg.c:1291
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
-#: g10/gpg.c:1295
+#: g10/gpg.c:1297
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
-#: g10/gpg.c:1298
+#: g10/gpg.c:1300
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
-#: g10/gpg.c:1301
+#: g10/gpg.c:1303
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
-#: g10/gpg.c:1442
+#: g10/gpg.c:1444
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "amosar en que chaveiro est� unha chave listada"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, 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/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: non existe o ficheiro de opci�ns por defecto `%s'\n"
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr "ficheiro de opci�ns `%s': %s\n"
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr "lendo as opci�ns de `%s'\n"
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: �%s non � para uso normal!\n"
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, 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/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s non � un xogo de caracteres v�lido\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s non � un xogo de caracteres v�lido\n"
-#: g10/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "non se puido analisa-lo URI do servidor de chaves\n"
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
msgid "invalid import options\n"
msgstr "opci�ns de importaci�n non v�lidas\n"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
msgid "invalid export options\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
#, fuzzy
msgid "invalid list options\n"
msgstr "opci�ns de importaci�n non v�lidas\n"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s non � un xogo de caracteres v�lido\n"
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s non � un xogo de caracteres v�lido\n"
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
#, fuzzy
msgid "invalid verify options\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "non se puido estabrecer exec-path a %s\n"
-#: g10/gpg.c:2764
+#: g10/gpg.c:2768
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
-#: g10/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s fai que se ignore %s\n"
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "�%s non se admite con %s!\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2865
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "gravando a chave secreta en `%s'\n"
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
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/gpg.c:2896
+#: g10/gpg.c:2900
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/gpg.c:2902
+#: g10/gpg.c:2906
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/gpg.c:2915
+#: g10/gpg.c:2919
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/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
msgid "selected certification digest algorithm is invalid\n"
msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed debe ser superior a 0\n"
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed debe ser superior a 1\n"
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
#, 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/gpg.c:3021
+#: g10/gpg.c:3025
#, 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/gpg.c:3023
+#: g10/gpg.c:3027
#, 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/gpg.c:3026
+#: g10/gpg.c:3030
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
-#: g10/gpg.c:3030
+#: g10/gpg.c:3034
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/gpg.c:3037
+#: g10/gpg.c:3041
msgid "invalid default preferences\n"
msgstr "preferencias por defecto non v�lidas\n"
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
msgid "invalid personal cipher preferences\n"
msgstr "preferencias de cifrado personais non v�lidas\n"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
msgid "invalid personal digest preferences\n"
msgstr "preferencias de resumo personais non v�lidas\n"
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
msgid "invalid personal compress preferences\n"
msgstr "preferencias de compresi�n personais non v�lidas\n"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "�%s a�nda non traballa con %s!\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, 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/gpg.c:3139
+#: g10/gpg.c:3143
#, 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/gpg.c:3144
+#: g10/gpg.c:3148
#, 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/gpg.c:3246
+#: g10/gpg.c:3250
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
-#: g10/gpg.c:3257
+#: g10/gpg.c:3261
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/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [ficheiro]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [ficheiro]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "o descifrado fallou: %s\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [ficheiro]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [ficheiro]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, 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/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--sign [ficheiro]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [ficheiro]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [ficheiro]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, 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/gpg.c:3376
+#: g10/gpg.c:3380
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [ficheiro]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [ficheiro]"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [ficheiro]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key id-de-usuario"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key id-de-usuario"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-de-usuario [comandos]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]"
-#: g10/gpg.c:3556
+#: g10/gpg.c:3560
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "o env�o ao servidor de chaves fallou: %s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "a recepci�n do servidor de chaves fallou: %s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, c-format
msgid "key export failed: %s\n"
msgstr "a exportaci�n da chave fallou: %s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "a busca no servidor de chaves fallou fallou: %s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "non se puido quita-la armadura: %s\n"
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "non se puido po�e-la armadura: %s\n"
-#: g10/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de hash non v�lido `%s'\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[ficheiro]"
-#: g10/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr "Escriba a s�a mensaxe ...\n"
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
msgid "the given certification policy URL is invalid\n"
msgstr "o URL de normativa de certificaci�n dado non � v�lido\n"
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
msgid "the given signature policy URL is invalid\n"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
-#: g10/gpg.c:4193
+#: g10/gpg.c:4197
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
@@ -1868,7 +1868,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Chave %08lX non v�lida convertida en v�lida por --allow-non-selfsigned-uid\n"
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, fuzzy, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr ""
@@ -2262,437 +2262,437 @@ msgstr "chave secreta non utilizable"
msgid "remove as much as possible from key after import"
msgstr ""
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr "pasando por alto un bloque de tipo %d\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu chaves procesadas hasta polo momento\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr "N�mero total procesado: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " skipped new keys: %lu\n"
msgstr "novas chaves omitidas: %lu\n"
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sin IDs de usuario: %lu\n"
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr " importadas: %lu"
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr " sin cambios: %lu\n"
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr " novos IDs de usuario: %lu\n"
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr " novas sub-chaves: %lu\n"
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr " novas sinaturas: %lu\n"
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr " novas revocaci�ns de chaves: %lu\n"
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr "chaves secretas lidas: %lu\n"
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "chaves secretas importadas: %lu\n"
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "chaves secretas sin cambios: %lu\n"
-#: g10/import.c:321
+#: g10/import.c:322
#, c-format
msgid " not imported: %lu\n"
msgstr " non importadas: %lu\n"
-#: g10/import.c:323
+#: g10/import.c:324
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " novas sinaturas: %lu\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr "chaves secretas lidas: %lu\n"
-#: g10/import.c:566
+#: g10/import.c:567
#, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr ""
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
#, fuzzy
msgid " algorithms on these user IDs:\n"
msgstr "Asinou estes IDs de usuario: \n"
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
-#: g10/import.c:619
+#: g10/import.c:620
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "Sinatura %s, algoritmo de resumo %s\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "chave %08lX: non hai ID de usuario\n"
-#: g10/import.c:749
+#: g10/import.c:750
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "chave %08lX: arranxouse a corrupci�n da sub-chave HKP\n"
-#: g10/import.c:764
+#: g10/import.c:765
#, fuzzy, c-format
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:770
+#: g10/import.c:771
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "chave %08lX: non hai IDs de usuario v�lidos\n"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr "isto pode ser causado por unha auto-sinatura que falta\n"
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "chave %08lX: chave p�blica non atopada: %s\n"
-#: g10/import.c:788
+#: g10/import.c:789
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "chave %08lX: nova chave - omitida\n"
-#: g10/import.c:797
+#: g10/import.c:798
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr "escribindo a `%s'\n"
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "erro escribindo no chaveiro `%s': %s\n"
-#: g10/import.c:825
+#: g10/import.c:826
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
-#: g10/import.c:849
+#: g10/import.c:850
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "chave %08lX: non coincide coa nosa copia\n"
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr ""
"chave %08lX: non foi posible localiza-lo bloque de chaves original:\n"
"%s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr ""
"chave %08lX: non foi posible le-lo bloque de chaves original:\n"
"%s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "chave %08lX: \"%s\" 1 novo ID de usuario\n"
-#: g10/import.c:914
+#: g10/import.c:915
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
-#: g10/import.c:917
+#: g10/import.c:918
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "chave %08lX: \"%s\" 1 nova sinatura\n"
-#: g10/import.c:920
+#: g10/import.c:921
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
-#: g10/import.c:923
+#: g10/import.c:924
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "chave %08lX: \"%s\" 1 nova sub-chave\n"
-#: g10/import.c:926
+#: g10/import.c:927
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "chave %08lX: \"%s\" %d novas sub-chaves\n"
-#: g10/import.c:929
+#: g10/import.c:930
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
-#: g10/import.c:932
+#: g10/import.c:933
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
-#: g10/import.c:935
+#: g10/import.c:936
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
-#: g10/import.c:938
+#: g10/import.c:939
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
-#: g10/import.c:961
+#: g10/import.c:962
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "chave %08lX: \"%s\" sen cambios\n"
-#: g10/import.c:1124
+#: g10/import.c:1125
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "chave %08lX: chave secreta cunha cifra %d non v�lida - omitida\n"
-#: g10/import.c:1135
+#: g10/import.c:1136
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "gravando a chave secreta en `%s'\n"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "non hai un chaveiro privado por defecto: %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "chave %08lX: chave secreta importada\n"
-#: g10/import.c:1193
+#: g10/import.c:1194
#, fuzzy, c-format
msgid "key %s: already in secret keyring\n"
msgstr "chave %08lX: xa estaba no chaveiro secreto\n"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, fuzzy, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "chave %08lX: chave secreta non atopada: %s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"chave %08lX: non hai chave p�blica - non se pode aplica-lo\n"
"certificado de revocaci�n\n"
-#: g10/import.c:1276
+#: g10/import.c:1277
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr ""
"chave %08lX: certificado de revocaci�n incorrecto:\n"
"%s - rechazado\n"
-#: g10/import.c:1308
+#: g10/import.c:1309
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "chave %08lX: \"%s\" certificado de revocaci�n importado\n"
-#: g10/import.c:1374
+#: g10/import.c:1375
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "chave %08lX: non hai ID de usuario para a sinatura\n"
-#: g10/import.c:1389
+#: g10/import.c:1390
#, fuzzy, c-format
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:1391
+#: g10/import.c:1392
#, fuzzy, c-format
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"
-#: g10/import.c:1409
+#: g10/import.c:1410
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "chave %08lX: non hai sub-chave para a ligaz�n da chave\n"
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "chave %08lX: algoritmo de chave p�blica non soportado\n"
-#: g10/import.c:1422
+#: g10/import.c:1423
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "chave %08lX: ligaz�n de sub-chave incorrecta\n"
-#: g10/import.c:1437
+#: g10/import.c:1438
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "chave %08lX: eliminouse unha ligaz�n de sub-chave m�ltiple\n"
-#: g10/import.c:1459
+#: g10/import.c:1460
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "chave %08lX: non hai unha sub-chave para a revocaci�n da chave\n"
-#: g10/import.c:1472
+#: g10/import.c:1473
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "chave %08lX: revocaci�n de sub-chave non v�lida\n"
-#: g10/import.c:1487
+#: g10/import.c:1488
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "chave %08lX: eliminouse a revocaci�n de sub-chaves m�ltiples\n"
-#: g10/import.c:1529
+#: g10/import.c:1530
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "chave %08lX: omitido o ID de usuario '"
-#: g10/import.c:1550
+#: g10/import.c:1551
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "chave %08lX: omitida a sub-chave\n"
-#: g10/import.c:1577
+#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "chave %08lX: sinatura non exportable (clase %02x) - omitida\n"
-#: g10/import.c:1587
+#: g10/import.c:1588
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "chave %08lX: certificado de revocaci�n no lugar err�neo - omitido\n"
-#: g10/import.c:1604
+#: g10/import.c:1605
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "chave %08lX: certificado de revocaci�n incorrecto: %s - omitido\n"
-#: g10/import.c:1618
+#: g10/import.c:1619
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
-#: g10/import.c:1626
+#: g10/import.c:1627
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "chave %08lX: clase de sinatura non esperada (0x%02X) - omitida\n"
-#: g10/import.c:1726
+#: g10/import.c:1727
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "chave %08lX: ID de usuario duplicado detectado - mesturado\n"
-#: g10/import.c:1788
+#: g10/import.c:1789
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"AVISO: a chave %08lX pode estar revocada: obtendo a chave de revocaci�n %"
"08lX\n"
-#: g10/import.c:1802
+#: g10/import.c:1803
#, 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:1861
+#: g10/import.c:1862
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chave %08lX: \"%s\" certificado de revocaci�n engadido\n"
-#: g10/import.c:1895
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
-#: g10/import.c:2284
+#: g10/import.c:2285
#, fuzzy
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "�a chave p�blica con coincide coa chave secreta!\n"
-#: g10/import.c:2292
+#: g10/import.c:2293
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "om�tese: a chave secreta xa est� presente\n"
-#: g10/import.c:2294
+#: g10/import.c:2295
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "om�tese: a chave secreta xa est� presente\n"
@@ -3015,8 +3015,8 @@ msgstr ""
msgid "Really sign? (y/N) "
msgstr "�Asinar de verdade? "
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "fallou a sinatura: %s\n"
@@ -3553,7 +3553,7 @@ 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
msgid "Are you sure you still want to add it? (y/N) "
msgstr "�Est� seguro de que quere engadila? (s/N) "
@@ -3598,12 +3598,32 @@ msgstr "Non se borrou nada.\n"
msgid "invalid"
msgstr "armadura non v�lida"
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "O ID de usuario \"%s\" est� revocado."
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "O ID de usuario \"%s\" est� revocado."
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "O ID de usuario \"%s\" est� revocado."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "o ID de usuario \"%s\" xa est� revocado\n"
+
+#: g10/keyedit.c:3252
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "o ID de usuario \"%s\" xa est� revocado\n"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3613,204 +3633,204 @@ msgstr ""
"designado\n"
" pode facer que algunhas versi�ns de PGP rexeiten esta chave.\n"
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3357
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:3372
+#: g10/keyedit.c:3377
msgid "Enter the user ID of the designated revoker: "
msgstr "Introduza o ID de usuario do revocador designado: "
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3402
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:3412
+#: g10/keyedit.c:3417
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:3434
+#: g10/keyedit.c:3439
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3458
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:3459
+#: g10/keyedit.c:3464
#, fuzzy
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:3520
+#: g10/keyedit.c:3525
msgid "Please remove selections from the secret keys.\n"
msgstr "Por favor, quite as selecci�ns das chaves secretas.\n"
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3531
#, fuzzy
msgid "Please select at most one subkey.\n"
msgstr "Por favor, seleccione como m�ximo unha chave secundaria.\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
msgid "Changing expiration time for the primary key.\n"
msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3584
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:3595
+#: g10/keyedit.c:3600
msgid "No corresponding signature in secret ring\n"
msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3673
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr ""
"AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
"se pode desfacer!\n"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
msgid "Please select exactly one user ID.\n"
msgstr "Escolla exactamente un ID de usuario.\n"
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, 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:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "�Est� seguro de que quere empregala (s/N)? "
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4132
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "�Est� seguro de que quere empregala (s/N)? "
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4194
#, fuzzy
msgid "Enter the notation: "
msgstr "Notaci�n de sinaturas: "
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "�Sobrescribir? (s/N) "
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, c-format
msgid "No user ID with index %d\n"
msgstr "Non hai ID de usuario con �ndice %d\n"
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4465
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Non hai ID de usuario con �ndice %d\n"
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Non hai ID de usuario con �ndice %d\n"
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID de usuario: \""
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " asinada por %08lX no %s%s%s\n"
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr " (non exportable)"
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Esta sinatura caducou o %s.\n"
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "�Est� seguro de que quere revocala? (s/N) "
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4644
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:4666
+#: g10/keyedit.c:4671
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Asinou estes IDs de usuario: \n"
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
#, fuzzy
msgid " (non-revocable)"
msgstr " (non exportable)"
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revocada por %08lX no %s\n"
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr "Est� a punto de revocar estas sinaturas:\n"
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
msgid "Really create the revocation certificates? (y/N) "
msgstr "�Realmente desexa crea-los certificados de revocaci�n? (s/N) "
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr "non hai chave secreta\n"
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "o ID de usuario \"%s\" xa est� revocado\n"
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4863
#, 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:4922
+#: g10/keyedit.c:4927
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "o ID de usuario \"%s\" xa est� revocado\n"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "o ID de usuario \"%s\" xa est� revocado\n"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@ -4435,7 +4455,7 @@ msgstr "disable"
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
@@ -4470,107 +4490,107 @@ msgstr "buscando \"%s\" no servidor HKP %s\n"
msgid "searching for names from %s\n"
msgstr "buscando \"%s\" no servidor HKP %s\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "buscando \"%s\" no servidor HKP %s\n"
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"asinado coa s�a chave %08lX no %s\n"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "buscando \"%s\" no servidor HKP %s\n"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "buscando \"%s\" no servidor HKP %s\n"
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
#, fuzzy
msgid "no keyserver action!\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
"non hai un servidor de chaves co�ecido (empregue a opci�n --keyserver)\n"
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
#, fuzzy
msgid "keyserver timed out\n"
msgstr "erro do servidor de chaves"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
#, fuzzy
msgid "keyserver internal error\n"
msgstr "erro do servidor de chaves"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "a recepci�n do servidor de chaves fallou: %s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s: non � un ID de chave v�lido\n"
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "solicitando a chave %08lX de %s\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "solicitando a chave %08lX de %s\n"
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
@@ -4979,12 +4999,12 @@ msgstr "Introduza o contrasinal\n"
msgid "cancelled by user\n"
msgstr "cancelado polo usuario\n"
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
#, fuzzy
msgid "can't query passphrase in batch mode\n"
msgstr "non se pode consulta-lo contrasinal en modo de proceso por lotes\n"
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "Introduza o contrasinal: "
@@ -5008,7 +5028,7 @@ msgstr "%u-bits, chave %s, ID %08lX, creada %s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "Repita o contrasinal: "
@@ -6482,18 +6502,6 @@ msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
#~ msgstr "non se puido executar %s \"%s\": %s\n"
#, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "O ID de usuario \"%s\" est� revocado."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "O ID de usuario \"%s\" est� revocado."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "O ID de usuario \"%s\" est� revocado."
-
-#, fuzzy
#~ msgid "No user IDs are removable.\n"
#~ msgstr "Non hai un ID de usuario para a chave\n"
diff --git a/po/hu.po b/po/hu.po
index 265c22120..8eb21289e 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: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\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"
@@ -40,7 +40,7 @@ msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -77,7 +77,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:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, c-format
@@ -307,77 +307,77 @@ msgstr ""
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr "P�nc�l: %s\n"
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr "�rv�nytelen p�nc�lfejl�c: "
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr "P�nc�lfejl�c: "
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr "�rv�nytelen al��r�sfejl�c!\n"
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr "Egym�sba �gyazott olvashat�sz�veg-al��r�sok!\n"
-#: g10/armor.c:568
+#: g10/armor.c:620
#, fuzzy
msgid "unexpected armor: "
msgstr "V�ratlan p�nc�l:"
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr "�rv�nytelen k�t�jeles sor: "
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "Kihagytam a %02x k�d� �rv�nytelen radix64 karaktert.\n"
-#: g10/armor.c:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr "Korai �llom�nyv�g (nincs CRC).\n"
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr "Korai �llom�nyv�g (a CRC-ben).\n"
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr "Hib�s form�j� CRC.\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC hiba; %06lx - %06lx\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "Korai �llom�nyv�g (a lez�r�sban).\n"
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr "Hiba a z�r� sorban!\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, 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:1167
+#: g10/armor.c:1219
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -468,7 +468,7 @@ msgstr "Nincs hozz� tartoz� nyilv�nos kulcs: %s\n"
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@ -744,7 +744,7 @@ msgstr "Ism�telje meg a jelsz�t: "
msgid "PIN not correctly repeated; try again"
msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -754,13 +754,13 @@ msgstr "Nem tudom megnyitni %s-t!\n"
msgid "--output doesn't work for this command\n"
msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %s\n"
@@ -870,23 +870,23 @@ msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s titkos�tva \"%s\" sz�m�ra\n"
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr "%s titkos�tott adat.\n"
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"FIGYELEM: Az �zenet szimmetrikus titkos�t�s�t gyenge kulccsal v�gezt�k.\n"
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
msgid "problem handling encrypted packet\n"
msgstr "Probl�ma a titkos�tott csomag kezel�sekor!\n"
@@ -1019,7 +1019,7 @@ msgstr "FIGYELEM: %08lX titkos kulcsnak nincs egyszer� SK ellen�rz��sszege.\n"
msgid "WARNING: nothing exported\n"
msgstr "FIGYELEM: Semmit sem export�ltam.\n"
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -1027,128 +1027,128 @@ msgstr ""
"@Parancsok:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[f�jl]|al��r�s k�sz�t�se"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "k�l�n�ll� al��r�s k�sz�t�se"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "adat titkos�t�sa"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "adat visszafejt�se (alap�rtelmez�s)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "al��r�s ellen�rz�se"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "kulcsok list�z�sa"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "kulcsok �s al��r�sok list�z�sa"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
#, fuzzy
msgid "list and check key signatures"
msgstr "kulcsal��r�sok ellen�rz�se"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "kulcsok �s ujjlenyomatok list�z�sa"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "titkos kulcsok list�z�sa"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "�j kulcsp�r l�trehoz�sa"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "remove keys from the public keyring"
msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
msgid "remove keys from the secret keyring"
msgstr "kulcsok elt�vol�t�sa a titkoskulcs-karik�r�l"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "kulcs al��r�sa"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "kulcs al��r�sa helyileg"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "kulcs al��r�sa vagy szerkeszt�se"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr "visszavon�si igazol�s k�sz�t�se"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "kulcsok export�l�sa"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "kulcsok export�l�sa kulcsszerverre"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "kulcsok import�l�sa kulcsszerverr�l"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "search for keys on a key server"
msgstr "kulcsok keres�se kulcsszerveren"
-#: g10/gpg.c:411
+#: g10/gpg.c:412
msgid "update all keys from a keyserver"
msgstr "minden kulcs friss�t�se kulcsszerverr�l"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "kulcsok import�l�sa/�sszef�z�se"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr "bizalmi adatb�zis friss�t�se"
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1158,51 +1158,51 @@ msgstr ""
"Opci�k:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|N�V|titkos�t�s N�V r�sz�re"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
msgid "use this user-id to sign or decrypt"
msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
-#: g10/gpg.c:456
+#: g10/gpg.c:457
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/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr "kanonikus sz�veges m�d haszn�lata"
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "kimeneti �llom�ny megad�sa"
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "b�besz�d� m�d"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "ne csin�ljon semmi v�ltoztat�st"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr "fel�l�r�s el�tt r�k�rdez�s"
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1210,7 +1210,7 @@ msgstr ""
"@\n"
"(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
-#: g10/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1230,15 +1230,15 @@ msgstr ""
" --list-keys [nevek] kulcsok ki�rat�sa\n"
" --fingerprint [nevek] ujjlenyomatok ki�rat�sa\n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
msgid "Please report bugs to <[email protected]>.\n"
msgstr "A hib�kat (angolul) a <[email protected]> c�mre �rja meg!\n"
-#: g10/gpg.c:778
+#: g10/gpg.c:780
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
-#: g10/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1248,7 +1248,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/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1256,577 +1256,577 @@ msgstr ""
"\n"
"T�mogatott algoritmusok:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr "Nyilv�nos kulcs� (pubkey): "
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr "Rejtjelez� (cipher): "
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr "Kivonatol� (hash): "
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
msgid "Compression: "
msgstr "T�m�r�t� (compression): "
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "Haszn�lat: gpg [opci�k] "
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "Egym�snak ellentmond� parancsok!\n"
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, fuzzy, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "Nem tal�ltam = jelet a \"%s\" csoportdefin�ci�ban!\n"
-#: g10/gpg.c:1259
+#: g10/gpg.c:1261
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
-#: g10/gpg.c:1277
+#: g10/gpg.c:1279
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
-#: g10/gpg.c:1286
+#: g10/gpg.c:1288
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
-#: g10/gpg.c:1289
+#: g10/gpg.c:1291
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
-#: g10/gpg.c:1295
+#: g10/gpg.c:1297
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
-#: g10/gpg.c:1298
+#: g10/gpg.c:1300
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
-#: g10/gpg.c:1301
+#: g10/gpg.c:1303
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
-#: g10/gpg.c:1442
+#: g10/gpg.c:1444
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mutatja a kilist�zott kulcs kulcskarik�j�t is"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, 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/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "MEGJEGYZ�S: Nincs alap�rtelmezett opci�s f�jl (%s).\n"
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr "\"%s\" opci�s f�jl: %s\n"
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "MEGJEGYZ�S: %s nem norm�l haszn�latra van!\n"
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, 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/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
-#: g10/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "�rv�nytelen export opci�k!\n"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: �rv�nytelen import opci�k!\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
msgid "invalid import options\n"
msgstr "�rv�nytelen import opci�k!\n"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
msgid "invalid export options\n"
msgstr "�rv�nytelen export opci�k!\n"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: �rv�nytelen import opci�k!\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
#, fuzzy
msgid "invalid list options\n"
msgstr "�rv�nytelen import opci�k!\n"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
#, fuzzy
msgid "invalid verify options\n"
msgstr "�rv�nytelen export opci�k!\n"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, 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/gpg.c:2764
+#: g10/gpg.c:2768
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
msgid "WARNING: program may create a core file!\n"
msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
-#: g10/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s �rtelmetlen %s mellett!\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2865
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
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/gpg.c:2896
+#: g10/gpg.c:2900
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/gpg.c:2902
+#: g10/gpg.c:2906
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/gpg.c:2915
+#: g10/gpg.c:2919
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/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
msgid "selected certification digest algorithm is invalid\n"
msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
#, 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/gpg.c:3021
+#: g10/gpg.c:3025
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/gpg.c:3023
+#: g10/gpg.c:3027
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/gpg.c:3026
+#: g10/gpg.c:3030
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "MEGJEGYZ�S: Egyszer� S2K m�d (0) er�sen ellenjavallt!\n"
-#: g10/gpg.c:3030
+#: g10/gpg.c:3034
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "�rv�nytelen S2K m�d; 0, 1 vagy 3 lehet.\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3041
msgid "invalid default preferences\n"
msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
msgid "invalid personal cipher preferences\n"
msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
msgid "invalid personal digest preferences\n"
msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
msgid "invalid personal compress preferences\n"
msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s �s %s egyel�re nem haszn�lhat� egy�tt!\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, 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/gpg.c:3139
+#: g10/gpg.c:3143
#, 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/gpg.c:3144
+#: g10/gpg.c:3148
#, 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/gpg.c:3246
+#: g10/gpg.c:3250
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
-#: g10/gpg.c:3257
+#: g10/gpg.c:3261
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/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [f�jln�v]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [f�jln�v]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "Visszafejt�s sikertelen: %s.\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [f�jln�v]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [f�jln�v]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, 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/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--sign [f�jln�v]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [f�jln�v]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [f�jln�v]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, 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/gpg.c:3376
+#: g10/gpg.c:3380
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [f�jln�v]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [f�jln�v]"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [f�jln�v]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key felh-azonos�t�"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key felh-azonos�t�"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key felh-azonos�t� [parancsok]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [felh-azonos�t�] [kulcskarika]"
-#: g10/gpg.c:3556
+#: g10/gpg.c:3560
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, c-format
msgid "key export failed: %s\n"
msgstr "Kulcsexport�l�s sikertelen: %s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "P�nc�loz�s nem siker�lt: %s\n"
-#: g10/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[f�jln�v]"
-#: g10/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr "Kezdheti g�pelni az �zenetet...\n"
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
msgid "the given certification policy URL is invalid\n"
msgstr "A megadott igazol�si elj�r�sm�d URL-je �rv�nytelen!\n"
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
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/gpg.c:4193
+#: g10/gpg.c:4197
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
@@ -1853,7 +1853,7 @@ msgstr ""
"%08lX �rv�nytelen kulcsot �rv�nyes�tett�k az\n"
"--allow-non-selfsigned-uid opci�val.\n"
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, fuzzy, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr ""
@@ -2254,429 +2254,429 @@ msgstr "haszn�lhatatlan titkos kulcs"
msgid "remove as much as possible from key after import"
msgstr ""
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr "%d t�pus� blokkot kihagyom.\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "Eddig %lu kulcsot dolgoztam fel.\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr " �sszesen feldolgoztam: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " �j kulcsok kihagyva: %lu\n"
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " felh. azonos�t� n�lk�l: %lu\n"
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr " import�lva: %lu"
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr " v�ltozatlan: %lu\n"
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr " �j felh. azonos�t�k: %lu\n"
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr " �j alkulcsok: %lu\n"
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr " �j al��r�sok: %lu\n"
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr " �j kulcsvisszavon�sok: %lu\n"
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr " olvasott titkos kulcsok: %lu\n"
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " import�lt titkos kulcsok: %lu\n"
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "v�ltozatlan titkos kulcsok: %lu\n"
-#: g10/import.c:321
+#: g10/import.c:322
#, c-format
msgid " not imported: %lu\n"
msgstr " nem import�lt: %lu\n"
-#: g10/import.c:323
+#: g10/import.c:324
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " �j al��r�sok: %lu\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " olvasott titkos kulcsok: %lu\n"
-#: g10/import.c:566
+#: g10/import.c:567
#, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr ""
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
#, fuzzy
msgid " algorithms on these user IDs:\n"
msgstr "�n al��rta a k�vetkez� felhaszn�l�azonos�t�kat:\n"
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
-#: g10/import.c:619
+#: g10/import.c:620
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
-#: g10/import.c:749
+#: g10/import.c:750
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "%08lX kulcs: HKP alkulcss�r�l�s kijav�tva.\n"
-#: g10/import.c:764
+#: g10/import.c:765
#, fuzzy, c-format
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:770
+#: g10/import.c:771
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "%08lX kulcs: Nincs �rv�nyes felhaszn�l�i azonos�t�.\n"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr "Ezt okozhatja egy hi�nyz� �nal��r�s.\n"
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "%08lX kulcs: Nyilv�nos kulcs nem tal�lhat�: %s\n"
-#: g10/import.c:788
+#: g10/import.c:789
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "%08lX kulcs: �j kulcs - kihagytam.\n"
-#: g10/import.c:797
+#: g10/import.c:798
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "Nem �rhat� kulcskarik�t tal�ltam: %s\n"
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr "�rok a \"%s\" �llom�nyba.\n"
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
-#: g10/import.c:825
+#: g10/import.c:826
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "%08lX kulcs: \"%s\" nyilv�nos kulcs import�lva.\n"
-#: g10/import.c:849
+#: g10/import.c:850
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "%08lX kulcs: Nem egyezik a mi m�solatunkkal!\n"
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "%08lX kulcs: Nem tal�lom az eredeti kulcsblokkot: %s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "%08lX kulcs: Nem tudom beolvasni az eredeti kulcsblokkot: %s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "%08lX kulcs: \"%s\" 1 �j felhaszn�l�i azonos�t�.\n"
-#: g10/import.c:914
+#: g10/import.c:915
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
-#: g10/import.c:917
+#: g10/import.c:918
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "%08lX kulcs: \"%s\" 1 �j al��r�s.\n"
-#: g10/import.c:920
+#: g10/import.c:921
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
-#: g10/import.c:923
+#: g10/import.c:924
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "%08lX kulcs: \"%s\" 1 �j alkulcs.\n"
-#: g10/import.c:926
+#: g10/import.c:927
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "%08lX kulcs: \"%s\" %d �j alkulcs.\n"
-#: g10/import.c:929
+#: g10/import.c:930
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
-#: g10/import.c:932
+#: g10/import.c:933
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
-#: g10/import.c:935
+#: g10/import.c:936
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
-#: g10/import.c:938
+#: g10/import.c:939
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
-#: g10/import.c:961
+#: g10/import.c:962
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "%08lX kulcs: \"%s\" nem v�ltozott.\n"
-#: g10/import.c:1124
+#: g10/import.c:1125
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr ""
"%08lX kulcs: Titkos kulcs �rv�nytelen (%d) rejtjelez�vel - kihagytam.\n"
-#: g10/import.c:1135
+#: g10/import.c:1136
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "Nincs alap�rtelmezett titkoskulcs-karika: %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "%08lX kulcs: Titkos kulcs import�lva.\n"
-#: g10/import.c:1193
+#: g10/import.c:1194
#, fuzzy, c-format
msgid "key %s: already in secret keyring\n"
msgstr "%08lX kulcs: M�r szerepel a titkoskulcs-karik�n.\n"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, fuzzy, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "%08lX kulcs: Titkos kulcs nem tal�lhat�: %s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "%08lX kulcs: Nincs nyilv�nos kulcs - nem tudok visszavonni.\n"
-#: g10/import.c:1276
+#: g10/import.c:1277
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "%08lX kulcs: �rv�nytelen visszavon� igazol�s: %s - visszautas�tva.\n"
-#: g10/import.c:1308
+#: g10/import.c:1309
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st import�ltam.\n"
-#: g10/import.c:1374
+#: g10/import.c:1375
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t� ehhez az al��r�shoz!\n"
-#: g10/import.c:1389
+#: g10/import.c:1390
#, fuzzy, c-format
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:1391
+#: g10/import.c:1392
#, fuzzy, c-format
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:1409
+#: g10/import.c:1410
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "%08lX kulcs: Nincs alkulcs a kulcsk�t�shez!\n"
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� algoritmus!\n"
-#: g10/import.c:1422
+#: g10/import.c:1423
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "%08lX kulcs: �rv�nytelen alkulcsk�t�s!\n"
-#: g10/import.c:1437
+#: g10/import.c:1438
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsk�t�st.\n"
-#: g10/import.c:1459
+#: g10/import.c:1460
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavon�shoz.\n"
-#: g10/import.c:1472
+#: g10/import.c:1473
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "%08lX kulcs: �rv�nytelen alkulcsvisszavon�s.\n"
-#: g10/import.c:1487
+#: g10/import.c:1488
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsvisszavon�st.\n"
-#: g10/import.c:1529
+#: g10/import.c:1530
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "%08lX kulcs: Kihagytam a felh. azonos�t�t: '"
-#: g10/import.c:1550
+#: g10/import.c:1551
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "%08lX kulcs: Alkulcsot kihagytam.\n"
-#: g10/import.c:1577
+#: g10/import.c:1578
#, fuzzy, c-format
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:1587
+#: g10/import.c:1588
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "%08lX kulcs: Visszavon� igazol�s rossz helyen - kihagytam.\n"
-#: g10/import.c:1604
+#: g10/import.c:1605
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "%08lX kulcs: �rv�nytelen visszavon� igazol�s: %s - kihagytam.\n"
-#: g10/import.c:1618
+#: g10/import.c:1619
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "%08lX kulcs: Alkulcsal��r�s rossz helyen - kihagytam.\n"
-#: g10/import.c:1626
+#: g10/import.c:1627
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "%08lX kulcs: V�ratlan al��r�soszt�ly (0x%02X) - kihagytam.\n"
-#: g10/import.c:1726
+#: g10/import.c:1727
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "%08lX kulcs: Dupl�zott felh. azonos�t�t tal�ltam - �sszef�ztem.\n"
-#: g10/import.c:1788
+#: g10/import.c:1789
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
"leh�vom a %08lX visszavon� kulcsot.\n"
-#: g10/import.c:1802
+#: g10/import.c:1803
#, 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:1861
+#: g10/import.c:1862
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st hozz�adtam.\n"
-#: g10/import.c:1895
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
-#: g10/import.c:2284
+#: g10/import.c:2285
#, fuzzy
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "A nyilv�nos kulcs nem passzol a titkos kulcshoz!\n"
-#: g10/import.c:2292
+#: g10/import.c:2293
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
-#: g10/import.c:2294
+#: g10/import.c:2295
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
@@ -3000,8 +3000,8 @@ msgstr ""
msgid "Really sign? (y/N) "
msgstr "Val�ban al��rja? "
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "Al��r�s sikertelen: %s\n"
@@ -3531,7 +3531,7 @@ msgstr ""
"okozhatja,\n"
" hogy a PGP egyes verzi�i visszautas�tj�k ezt a kulcsot.\n"
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Tov�bbra is hozz� akarja adni? (i/N) "
@@ -3574,12 +3574,32 @@ msgstr "Nem t�r�ltem semmit.\n"
msgid "invalid"
msgstr "�rv�nytelen p�nc�l"
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
+
+#: g10/keyedit.c:3252
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3589,199 +3609,199 @@ msgstr ""
" azt okozhatja, hogy egyes PGP verzi�k visszautas�tj�k ezt a "
"kulcsot!\n"
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3357
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:3372
+#: g10/keyedit.c:3377
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:3397
+#: g10/keyedit.c:3402
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:3412
+#: g10/keyedit.c:3417
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:3434
+#: g10/keyedit.c:3439
#, 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:3453
+#: g10/keyedit.c:3458
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:3459
+#: g10/keyedit.c:3464
#, fuzzy
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:3520
+#: g10/keyedit.c:3525
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:3526
+#: g10/keyedit.c:3531
#, fuzzy
msgid "Please select at most one subkey.\n"
msgstr "Maximum egy m�sodlagos kulcsot jel�lj�n ki, k�rem!\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "M�sodlagos kulcs lej�rati idej�nek v�ltoztat�sa.\n"
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
msgid "Changing expiration time for the primary key.\n"
msgstr "Els�dleges kulcs lej�rati idej�nek v�ltoztat�sa.\n"
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3584
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:3595
+#: g10/keyedit.c:3600
msgid "No corresponding signature in secret ring\n"
msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3673
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "FIGYELEM: %08lX al��r� alkulcs nem kereszthiteles�tett.\n"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
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:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, 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:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4132
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4194
#, fuzzy
msgid "Enter the notation: "
msgstr "Al��r�s-jel�l�s: "
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Fel�l�rjam (i/N)? "
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4465
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "Felhaszn�l�azonos�t�: \""
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " al��rva %08lX �ltal %s%s%s id�pontban.\n"
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr " (nem export�lhat�)"
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Biztos benne, hogy m�gis visszavonja? (i/N) "
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4644
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:4666
+#: g10/keyedit.c:4671
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "�n al��rta a k�vetkez� felhaszn�l�azonos�t�kat:\n"
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
#, fuzzy
msgid " (non-revocable)"
msgstr " (nem export�lhat�)"
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " visszavonva %08lX �ltal %s id�pontban.\n"
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr "A k�vetkez� al��r�sokat fogja visszavonni:\n"
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
msgid "Really create the revocation certificates? (y/N) "
msgstr "Val�ban l�trehozzam a visszavon� igazol�st? (i/N) "
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr "Nincs titkos kulcs.\n"
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, 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:4858
+#: g10/keyedit.c:4863
#, 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:4922
+#: g10/keyedit.c:4927
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, 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"
@@ -4405,7 +4425,7 @@ msgstr "disable"
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "�rv�nytelen export opci�k!\n"
@@ -4440,108 +4460,108 @@ msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
msgid "searching for names from %s\n"
msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"Al��rva az �n %08lX kulcs�val %s id�pontban.\n"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
#, fuzzy
msgid "no keyserver action!\n"
msgstr "�rv�nytelen export opci�k!\n"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
#, fuzzy
msgid "keyserver timed out\n"
msgstr "kulcsszerverhiba"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
#, fuzzy
msgid "keyserver internal error\n"
msgstr "kulcsszerverhiba"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr ""
"FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr ""
"FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr ""
@@ -4956,12 +4976,12 @@ msgstr "�rja be a jelsz�t!\n"
msgid "cancelled by user\n"
msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
#, fuzzy
msgid "can't query passphrase in batch mode\n"
msgstr "Nem tudok jelsz�t bek�rni k�tegelt m�dban!\n"
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "�rja be a jelsz�t: "
@@ -4986,7 +5006,7 @@ msgstr "%u bites %s kulcs, azonos�t�: %08lX, l�trehozva: %s."
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "Ism�telje meg a jelsz�t: "
@@ -6447,18 +6467,6 @@ msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
#~ msgstr "Nem tudom v�grehajtani a k�vetkez� \"%s\"-t: \"%s\": %s.\n"
#, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
-
-#, fuzzy
#~ msgid "No user IDs are removable.\n"
#~ msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
diff --git a/po/id.po b/po/id.po
index fca76fbf8..c6af09d39 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: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\n"
"PO-Revision-Date: 2004-06-17 16:32+0700\n"
"Last-Translator: Tedi Heriyanto <[email protected]>\n"
"Language-Team: Indonesian <[email protected]>\n"
@@ -42,7 +42,7 @@ msgstr "menulis kunci rahasia ke `%s'\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -78,7 +78,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:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, c-format
@@ -308,77 +308,77 @@ msgstr ""
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "tidak ditemukan data OpenPGP yang valid.\n"
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr "armor: %s\n"
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr "header armor tidak valid: "
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr "header armor: "
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr "header clearsig tidak valid\n"
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr "signature teks bersarang\n"
-#: g10/armor.c:568
+#: g10/armor.c:620
#, fuzzy
msgid "unexpected armor: "
msgstr "armor tidak terduga:"
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr "dash escaped line tidak valid: "
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "karakter radix64 tidak valid %02x dilewati\n"
-#: g10/armor.c:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr "eof prematur (tanpa CRC)\n"
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr "eof prematur (dalam CRC)\n"
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr "CRC tidak tepat\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "kesalahan CRC; %06lx - %06lx\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "eof prematur (dalam Trailer)\n"
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr "kesalahan dalam garis trailer\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr "tidak ditemukan data OpenPGP yang valid.\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "armor tidak valid: baris melebihi %d karakter\n"
-#: g10/armor.c:1167
+#: g10/armor.c:1219
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -470,7 +470,7 @@ msgstr "tidak ada kunci publik yang sesuai: %s\n"
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr "kesalahan membaca `%s': %s\n"
@@ -746,7 +746,7 @@ msgstr "Ulangi passphrase: "
msgid "PIN not correctly repeated; try again"
msgstr "passphrase tidak diulang dengan benar; coba lagi"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -756,13 +756,13 @@ msgstr "tidak dapat membuka `%s'\n"
msgid "--output doesn't work for this command\n"
msgstr "--output tidak berfungsi untuk perintah ini\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "kunci '%s' tidak ditemukan: %s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %s\n"
@@ -874,23 +874,23 @@ msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s dienkripsi untuk: %s\n"
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr "%s data terenkripsi\n"
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"PERINGATAN: pesan dienkripsi dengan kunci lemah dalam cipher simetrik.\n"
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
msgid "problem handling encrypted packet\n"
msgstr "masalah menangani paket terenkripsi\n"
@@ -1023,7 +1023,7 @@ msgstr ""
msgid "WARNING: nothing exported\n"
msgstr "PERINGATAN: tidak ada yang diekspor\n"
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -1031,128 +1031,128 @@ msgstr ""
"@Perintah:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[file]|buat signature"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[file]|buat signature teks"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "buat detached signature"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "enkripsi data"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr "enkripsi hanya dengan symmetric cipher"
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "dekripsi data (default)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "verifikasi signature"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "tampilkan kunci"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "tampilkan kunci dan signature"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
#, fuzzy
msgid "list and check key signatures"
msgstr "periksa signature kunci"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "tampilkan kunci dan fingerprint"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "tampilkan kunci rahasia"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "buat sepasang kunci baru"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "remove keys from the public keyring"
msgstr "hapus kunci dari keyring publik"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
msgid "remove keys from the secret keyring"
msgstr "hapus kunci dari keyring pribadi"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "tandai kunci"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "tandai kunci secara lokal"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "tandai atau edit kunci"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr "buat sertifikat revokasi"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "ekspor kunci"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "ekspor kunci ke key server"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "impor kunci dari key server"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "search for keys on a key server"
msgstr "cari kunci di key server"
-#: g10/gpg.c:411
+#: g10/gpg.c:412
msgid "update all keys from a keyserver"
msgstr "update semua kunci dari keyserver"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "impor/gabung kunci"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr "perbarui database trust"
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr "|algo [file]|cetak digest pesan"
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1162,51 +1162,51 @@ msgstr ""
"Pilihan:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr "ciptakan output ascii"
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|NAMA|enkripsi untuk NAMA"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
msgid "use this user-id to sign or decrypt"
msgstr "gunakan id-user ini untuk menandai/dekripsi"
-#: g10/gpg.c:456
+#: g10/gpg.c:457
msgid "|N|set compress level N (0 disables)"
msgstr "|N|set tingkat kompresi N (0 tidak ada)"
-#: g10/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr "gunakan mode teks kanonikal"
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "gunakan sebagai file output"
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "detil"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "jangan buat perubahan"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr "tanya sebelum menimpa"
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1214,7 +1214,7 @@ msgstr ""
"@\n"
"(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
-#: g10/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1234,15 +1234,15 @@ msgstr ""
" --list-keys [nama] tampilkan kunci\n"
" --fingerprint [nama] tampilkan fingerprint\n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Laporkan bug ke <[email protected]>.\n"
-#: g10/gpg.c:778
+#: g10/gpg.c:780
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
-#: g10/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1252,7 +1252,7 @@ msgstr ""
"tandai, cek, enkripsi atau dekripsi\n"
"operasi baku tergantung pada data input\n"
-#: g10/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1260,585 +1260,585 @@ msgstr ""
"\n"
"Algoritma yang didukung:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr "Pubkey: "
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr "Cipher: "
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr "Hash: "
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
msgid "Compression: "
msgstr "Kompresi: "
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "pemakaian: gpg [pilihan] "
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "perintah saling konflik\n"
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, fuzzy, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
-#: g10/gpg.c:1259
+#: g10/gpg.c:1261
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
-#: g10/gpg.c:1277
+#: g10/gpg.c:1279
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
-#: g10/gpg.c:1286
+#: g10/gpg.c:1288
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
-#: g10/gpg.c:1289
+#: g10/gpg.c:1291
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
-#: g10/gpg.c:1295
+#: g10/gpg.c:1297
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
-#: g10/gpg.c:1298
+#: g10/gpg.c:1300
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
-#: g10/gpg.c:1301
+#: g10/gpg.c:1303
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
-#: g10/gpg.c:1442
+#: g10/gpg.c:1444
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "tampilkan keyring tempat kunci yang dipilih berada"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
-#: g10/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr "file pilihan `%s': %s\n"
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr "membaca pilihan dari `%s'\n"
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, 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/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s bukanlah set karakter yang valid\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s bukanlah set karakter yang valid\n"
-#: g10/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "tidak dapat memparsing URI keyserver\n"
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opsi ekspor tidak valid\n"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opsi impor tidak valid\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
msgid "invalid import options\n"
msgstr "opsi impor tidak valid\n"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
msgid "invalid export options\n"
msgstr "opsi ekspor tidak valid\n"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opsi impor tidak valid\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
#, fuzzy
msgid "invalid list options\n"
msgstr "opsi impor tidak valid\n"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s bukanlah set karakter yang valid\n"
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s bukanlah set karakter yang valid\n"
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
#, fuzzy
msgid "invalid verify options\n"
msgstr "opsi ekspor tidak valid\n"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "tidak dapat menset path exec ke %s\n"
-#: g10/gpg.c:2764
+#: g10/gpg.c:2768
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
msgid "WARNING: program may create a core file!\n"
msgstr "PERINGATAN: program mungkin membuat file core!\n"
-#: g10/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "PERINGATAN: %s menimpa %s\n"
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s tidak dibolehkan dengan %s!\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s tidak masuk akal dengan %s!\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2865
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "menulis kunci rahasia ke `%s'\n"
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
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/gpg.c:2896
+#: g10/gpg.c:2900
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/gpg.c:2902
+#: g10/gpg.c:2906
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/gpg.c:2915
+#: g10/gpg.c:2919
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n"
-#: g10/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritma cipher yang dipilih tidak valid\n"
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr "algoritma digest yang dipilih tidak valid\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "algoritma cipher yang dipilih tidak valid\n"
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
msgid "selected certification digest algorithm is invalid\n"
msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed harus lebih dari 0\n"
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed harus lebih dari 1\n"
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
#, 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/gpg.c:3021
+#: g10/gpg.c:3025
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/gpg.c:3023
+#: g10/gpg.c:3027
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/gpg.c:3026
+#: g10/gpg.c:3030
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
-#: g10/gpg.c:3030
+#: g10/gpg.c:3034
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3041
msgid "invalid default preferences\n"
msgstr "preferensi baku tidak valid\n"
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
msgid "invalid personal cipher preferences\n"
msgstr "preferensi cipher personal tidak valid\n"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
msgid "invalid personal digest preferences\n"
msgstr "preferensi digest personal tidak valid\n"
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
msgid "invalid personal compress preferences\n"
msgstr "preferensi kompresi personal tidak valid\n"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s belum dapat dipakai dengan %s\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, 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/gpg.c:3139
+#: g10/gpg.c:3143
#, 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/gpg.c:3144
+#: g10/gpg.c:3148
#, 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/gpg.c:3246
+#: g10/gpg.c:3250
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
-#: g10/gpg.c:3257
+#: g10/gpg.c:3261
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public "
"key \n"
-#: g10/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [namafile]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [namafile]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "dekripsi gagal: %s\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [namafile]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [namafile]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, 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/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--sign [namafile]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [namafile]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [namafile]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, 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/gpg.c:3376
+#: g10/gpg.c:3380
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [namafile]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [namafile]"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [namafile]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key id-user"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key id-user"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-user [perintah]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id-user] [keyring]"
-#: g10/gpg.c:3556
+#: g10/gpg.c:3560
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "Pengiriman keyserver gagal: %s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "Penerimaan keyserver gagal: %s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, c-format
msgid "key export failed: %s\n"
msgstr "Ekspor kunci gagal: %s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Pencarian keyserver gagal: %s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Refresh keyserver gagal: %s\n"
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "gagal dearmoring: %s\n"
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "gagal enarmoring: %s\n"
-#: g10/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritma hash tidak valid `%s'\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[namafile]"
-#: g10/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr "Teruskan dan ketikkan pesan anda ....\n"
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
msgid "the given certification policy URL is invalid\n"
msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
msgid "the given signature policy URL is invalid\n"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
-#: g10/gpg.c:4193
+#: g10/gpg.c:4197
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@ -1863,7 +1863,7 @@ msgstr ""
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n"
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, fuzzy, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "tidak ada subkey rahasia untuk subkey publik %08lX. diabaikan\n"
@@ -2269,426 +2269,426 @@ msgstr "kunci rahasia tidak dapat dipakai"
msgid "remove as much as possible from key after import"
msgstr ""
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr "melewati blok tipe %d\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu kunci telah diproses\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Jumlah yang telah diproses: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " lewati kunci baru: %lu\n"
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " tanpa ID user: %lu\n"
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr " diimpor: %lu"
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr " tidak berubah: %lu\n"
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr " ID user baru: %lu\n"
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr " subkey baru: %lu\n"
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr " signature baru: %lu\n"
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr " pembatalan kunci baru: %lu\n"
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr " kunci rahasia dibaca: %lu\n"
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " kunci rahasia diimpor: %lu\n"
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " kunci rahasia tidak berubah: %lu\n"
-#: g10/import.c:321
+#: g10/import.c:322
#, c-format
msgid " not imported: %lu\n"
msgstr " tidak diimpor: %lu\n"
-#: g10/import.c:323
+#: g10/import.c:324
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " signature baru: %lu\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " kunci rahasia dibaca: %lu\n"
-#: g10/import.c:566
+#: g10/import.c:567
#, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr ""
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
#, fuzzy
msgid " algorithms on these user IDs:\n"
msgstr "Anda telah menandai ID user ini:\n"
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
-#: g10/import.c:619
+#: g10/import.c:620
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s signature, algoritma digest %s\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "kunci %08lX: tidak ada ID user\n"
-#: g10/import.c:749
+#: g10/import.c:750
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "kunci %08lX: subkey HKP yang rusak diperbaiki\n"
-#: g10/import.c:764
+#: g10/import.c:765
#, fuzzy, c-format
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:770
+#: g10/import.c:771
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "kunci %08lX: tidak ada ID user yang valid\n"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
-#: g10/import.c:788
+#: g10/import.c:789
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "kunci %08lX: kunci baru - dilewati\n"
-#: g10/import.c:797
+#: g10/import.c:798
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr "menulis ke `%s'\n"
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
-#: g10/import.c:825
+#: g10/import.c:826
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "kunci %08lX: kunci publik \"%s\" diimpor\n"
-#: g10/import.c:849
+#: g10/import.c:850
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "kunci %08lX: tidak dapat menemukan keyblock orisinal: %s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "kunci %08lX: 1 user ID baru \"%s\"\n"
-#: g10/import.c:914
+#: g10/import.c:915
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
-#: g10/import.c:917
+#: g10/import.c:918
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "kunci %08lX: \"%s\" 1 signature baru\n"
-#: g10/import.c:920
+#: g10/import.c:921
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "kunci %08lX: \"%s\" %d signature baru\n"
-#: g10/import.c:923
+#: g10/import.c:924
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "kunci %08lX: \"%s\" 1 subkey baru\n"
-#: g10/import.c:926
+#: g10/import.c:927
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "kunci %08lX: \"%s\" %d subkey baru\n"
-#: g10/import.c:929
+#: g10/import.c:930
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "kunci %08lX: \"%s\" %d signature baru\n"
-#: g10/import.c:932
+#: g10/import.c:933
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "kunci %08lX: \"%s\" %d signature baru\n"
-#: g10/import.c:935
+#: g10/import.c:936
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
-#: g10/import.c:938
+#: g10/import.c:939
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
-#: g10/import.c:961
+#: g10/import.c:962
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "kunci %08lX: \"%s\" tidak berubah\n"
-#: g10/import.c:1124
+#: g10/import.c:1125
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "kunci %08lX: kunci rahasia dengan cipher tidak valid %d - dilewati\n"
-#: g10/import.c:1135
+#: g10/import.c:1136
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "menulis kunci rahasia ke `%s'\n"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "tidak ada keyring rahasia baku: %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "kunci %08lX: kunci rahasia diimpor\n"
-#: g10/import.c:1193
+#: g10/import.c:1194
#, fuzzy, c-format
msgid "key %s: already in secret keyring\n"
msgstr "kunci %08lX: sudah ada di keyring rahasia\n"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, fuzzy, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"kunci %08lX: tdk ada kunci publik-tdk dpt mengaplikasikan sertifikat "
"pembatalan\n"
-#: g10/import.c:1276
+#: g10/import.c:1277
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
-#: g10/import.c:1308
+#: g10/import.c:1309
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "kunci %08lX: \"%s\" sertifikat pembatalan diimpor\n"
-#: g10/import.c:1374
+#: g10/import.c:1375
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
-#: g10/import.c:1389
+#: g10/import.c:1390
#, fuzzy, c-format
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:1391
+#: g10/import.c:1392
#, fuzzy, c-format
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:1409
+#: g10/import.c:1410
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
-#: g10/import.c:1422
+#: g10/import.c:1423
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "kunci %08lX: subkey binding tidak valid\n"
-#: g10/import.c:1437
+#: g10/import.c:1438
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "kunci %08lX: hapus subkey binding ganda\n"
-#: g10/import.c:1459
+#: g10/import.c:1460
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "kunci %08lX: tidak ada subkey untuk pembatalan kunci\n"
-#: g10/import.c:1472
+#: g10/import.c:1473
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "kunci %08lX: pembatalan subkey tidak valid\n"
-#: g10/import.c:1487
+#: g10/import.c:1488
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "kunci %08lX: hapus pembatalan subkey ganda\n"
-#: g10/import.c:1529
+#: g10/import.c:1530
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "kunci %08lX: melewati ID user "
-#: g10/import.c:1550
+#: g10/import.c:1551
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "kunci %08lX: melewati subkey\n"
-#: g10/import.c:1577
+#: g10/import.c:1578
#, fuzzy, c-format
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:1587
+#: g10/import.c:1588
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n"
-#: g10/import.c:1604
+#: g10/import.c:1605
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
-#: g10/import.c:1618
+#: g10/import.c:1619
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
-#: g10/import.c:1626
+#: g10/import.c:1627
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "kunci %08lX: klas signature tidak diharapkan (0x%02x) - dilewati\n"
-#: g10/import.c:1726
+#: g10/import.c:1727
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
-#: g10/import.c:1788
+#: g10/import.c:1789
#, fuzzy, c-format
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:1802
+#: g10/import.c:1803
#, 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:1861
+#: g10/import.c:1862
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
-#: g10/import.c:1895
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
-#: g10/import.c:2284
+#: g10/import.c:2285
#, fuzzy
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "kunci publik tidak cocok dengan kunci rahasia!\n"
-#: g10/import.c:2292
+#: g10/import.c:2293
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "dilewati: kunci pribadi telah ada\n"
-#: g10/import.c:2294
+#: g10/import.c:2295
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "dilewati: kunci pribadi telah ada\n"
@@ -3016,8 +3016,8 @@ msgstr ""
msgid "Really sign? (y/N) "
msgstr "Ditandai? "
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "gagal menandai: %s\n"
@@ -3547,7 +3547,7 @@ msgstr ""
"dapat menyebabkan beberapa versi\n"
" PGP menolak kunci ini.\n"
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Anda tetap ingin menambahkannya? (y/n) "
@@ -3590,12 +3590,32 @@ msgstr "Tidak ada yang dihapus.\n"
msgid "invalid"
msgstr "armor tidak valid"
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "User ID \"%s\" dibatalkan."
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "User ID \"%s\" dibatalkan."
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "User ID \"%s\" dibatalkan."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "User ID \"%s\" telah dibatalkan\n"
+
+#: g10/keyedit.c:3252
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "User ID \"%s\" telah dibatalkan\n"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3605,202 +3625,202 @@ msgstr ""
"designated dapat\n"
"............menyebabkan beberapa versi PGP menolak kunci ini.\n"
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3357
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:3372
+#: g10/keyedit.c:3377
msgid "Enter the user ID of the designated revoker: "
msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3402
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:3412
+#: g10/keyedit.c:3417
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:3434
+#: g10/keyedit.c:3439
#, 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:3453
+#: g10/keyedit.c:3458
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:3459
+#: g10/keyedit.c:3464
#, fuzzy
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:3520
+#: g10/keyedit.c:3525
msgid "Please remove selections from the secret keys.\n"
msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3531
#, fuzzy
msgid "Please select at most one subkey.\n"
msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Merubah batas waktu untuk kunci sekunder.\n"
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
msgid "Changing expiration time for the primary key.\n"
msgstr "Merubah batas waktu untuk kunci primer.\n"
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3584
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:3595
+#: g10/keyedit.c:3600
msgid "No corresponding signature in secret ring\n"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3673
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
msgid "Please select exactly one user ID.\n"
msgstr "Anda harus memilih minimum satu ID user.\n"
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, 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:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4132
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4194
#, fuzzy
msgid "Enter the notation: "
msgstr "Notasi signature: "
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Ditimpa (y/T)? "
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, c-format
msgid "No user ID with index %d\n"
msgstr "Tidak ada ID user dengan index %d\n"
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4465
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Tidak ada ID user dengan index %d\n"
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Tidak ada ID user dengan index %d\n"
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID user: "
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " ditandai oleh %08lX pada %s%s%s\n"
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr " (tidak dapat diekspor)"
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Kunci ini akan kadaluarsa pada %s \n"
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Anda tetap ingin membatalkannya? (y/n) "
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4644
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4671
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Anda telah menandai ID user ini:\n"
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
#, fuzzy
msgid " (non-revocable)"
msgstr " (tidak dapat diekspor)"
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " dibatalkan oleh %08lX pada %s\n"
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr "Anda akan membatalkan signature ini:\n"
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
msgid "Really create the revocation certificates? (y/N) "
msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr "tidak ada kunci rahasia\n"
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "User ID \"%s\" telah dibatalkan\n"
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4863
#, 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:4922
+#: g10/keyedit.c:4927
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "User ID \"%s\" telah dibatalkan\n"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "User ID \"%s\" telah dibatalkan\n"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, 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"
@@ -4420,7 +4440,7 @@ msgstr "disable"
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "opsi ekspor tidak valid\n"
@@ -4455,106 +4475,106 @@ msgstr "mencari \"%s\" dari server HKP %s\n"
msgid "searching for names from %s\n"
msgstr "mencari \"%s\" dari server HKP %s\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "mencari \"%s\" dari server HKP %s\n"
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"ditandai dengan kunci anda %08lX pada %s\n"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "mencari \"%s\" dari server HKP %s\n"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "mencari \"%s\" dari server HKP %s\n"
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
#, fuzzy
msgid "no keyserver action!\n"
msgstr "opsi ekspor tidak valid\n"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
#, fuzzy
msgid "keyserver timed out\n"
msgstr "kesalahan keyserver"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
#, fuzzy
msgid "keyserver internal error\n"
msgstr "kesalahan keyserver"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "Penerimaan keyserver gagal: %s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "meminta kunci %08lX dari %s\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "meminta kunci %08lX dari %s\n"
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
@@ -4959,12 +4979,12 @@ msgstr "Masukkan passphrase\n"
msgid "cancelled by user\n"
msgstr "dibatalkan oleh user\n"
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
#, fuzzy
msgid "can't query passphrase in batch mode\n"
msgstr "tidak dapat meminta password dalam mode batch\n"
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "Masukkan passphrase: "
@@ -4988,7 +5008,7 @@ msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "Ulangi passphrase: "
@@ -6450,18 +6470,6 @@ msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
#~ msgstr "tidak dapat mengeksekusi %s \"%s\": %s\n"
#, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "User ID \"%s\" dibatalkan."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "User ID \"%s\" dibatalkan."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "User ID \"%s\" dibatalkan."
-
-#, fuzzy
#~ msgid "No user IDs are removable.\n"
#~ msgstr "User ID \"%s\" telah dibatalkan\n"
diff --git a/po/it.po b/po/it.po
index 27f72d185..cd3544788 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: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\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"
@@ -40,7 +40,7 @@ msgstr "scrittura della chiave segreta in `%s'\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -77,7 +77,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:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, c-format
@@ -309,77 +309,77 @@ msgstr ""
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "Non sono stati trovati dati OpenPGP validi.\n"
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr "armatura: %s\n"
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr "header dell'armatura non valido: "
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr "header dell'armatura: "
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr "header della firma in chiaro non valido\n"
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr "firme in chiaro annidate\n"
-#: g10/armor.c:568
+#: g10/armor.c:620
#, fuzzy
msgid "unexpected armor: "
msgstr "armatura inaspettata:"
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr "riga protetta con il trattino non valida: "
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "Carattere radix64 non valido %02x saltato\n"
-#: g10/armor.c:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr "eof prematura (nessun CRC)\n"
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr "eof prematura (nel CRC)\n"
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr "CRC malformato\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "errore nel CRC; %06lx - %06lx\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "eof prematura (nella coda)\n"
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr "errore nella riga della coda\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr "Non sono stati trovati dati OpenPGP validi.\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, 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:1167
+#: g10/armor.c:1219
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -472,7 +472,7 @@ msgstr "non c'� una chiave pubblica corrispondente: %s\n"
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
@@ -748,7 +748,7 @@ msgstr "Ripeti la passphrase: "
msgid "PIN not correctly repeated; try again"
msgstr "passphrase non ripetuta correttamente; prova ancora"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -758,13 +758,13 @@ msgstr "impossibile aprire `%s'\n"
msgid "--output doesn't work for this command\n"
msgstr "--output non funziona con questo comando\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "chiave `%s' non trovata: %s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %s\n"
@@ -884,24 +884,24 @@ msgstr "non � possibile usare %s in modalit� %s\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrato per: \"%s\"\n"
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr "dati cifrati con %s\n"
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "cifrato con l'algoritmo sconosciuto %d\n"
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"ATTENZIONE: il messaggio era stato cifrato usando una chiave debole\n"
"per il cifrario simmetrico\n"
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
msgid "problem handling encrypted packet\n"
msgstr "problema nella gestione del pacchetto cifrato\n"
@@ -1034,7 +1034,7 @@ msgstr "ATTENZIONE: la chiave segreta %08lX non ha un checksum SK semplice\n"
msgid "WARNING: nothing exported\n"
msgstr "ATTENZIONE: non � stato esportato nulla\n"
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -1042,128 +1042,128 @@ msgstr ""
"@Comandi:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[file]|fai una firma"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "fai una firma separata"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "cifra dati"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr "cifra solo con un cifrario simmetrico"
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "decifra dati (predefinito)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "verifica una firma"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "elenca le chiavi"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "elenca le chiavi e le firme"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
#, fuzzy
msgid "list and check key signatures"
msgstr "controlla le firme delle chiavi"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "elenca le chiavi e le impronte digitali"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "elenca le chiavi segrete"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "genera una nuova coppia di chiavi"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "remove keys from the public keyring"
msgstr "rimuove le chiavi dal portachiavi pubblico"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
msgid "remove keys from the secret keyring"
msgstr "rimuove le chiavi dal portachiavi privato"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "firma una chiave"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "firma una chiave localmente"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "firma o modifica una chiave"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr "genera un certificato di revoca"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "esporta delle chiavi"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "esporta le chiavi a un key server"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "importa le chiavi da un key server"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "search for keys on a key server"
msgstr "cerca delle chiavi su un key server"
-#: g10/gpg.c:411
+#: g10/gpg.c:412
msgid "update all keys from a keyserver"
msgstr "aggiorna tutte le chiavi da un key server"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "importa/aggiungi delle chiavi"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr "aggiorna il database della fiducia"
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr "|algo [files]|stampa tutti i message digests"
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1173,51 +1173,51 @@ msgstr ""
"Opzioni:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr "crea un output ascii con armatura"
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|NOME|cifra per NOME"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
msgid "use this user-id to sign or decrypt"
msgstr "usa questo user-id per firmare o decifrare"
-#: g10/gpg.c:456
+#: g10/gpg.c:457
msgid "|N|set compress level N (0 disables)"
msgstr "|N|imposta il livello di compressione (0 disab.)"
-#: g10/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr "usa il modo testo canonico"
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "usa come file di output"
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "prolisso"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "non fa cambiamenti"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr "chiede prima di sovrascrivere"
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1225,7 +1225,7 @@ msgstr ""
"@\n"
"(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
-#: g10/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1245,15 +1245,15 @@ msgstr ""
" --list-keys [nomi] mostra le chiavi\n"
" --fingerprint [nomi] mostra le impronte digitali\n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Per favore segnala i bug a <[email protected]>.\n"
-#: g10/gpg.c:778
+#: g10/gpg.c:780
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
-#: g10/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1263,7 +1263,7 @@ msgstr ""
"firma, controlla, cifra o decifra\n"
"l'operazione predefinita dipende dai dati di input\n"
-#: g10/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1271,582 +1271,582 @@ msgstr ""
"\n"
"Algoritmi gestiti:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr "A chiave pubblica: "
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr "Cifrari: "
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr "Hash: "
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
msgid "Compression: "
msgstr "Compressione: "
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "uso: gpg [opzioni] "
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "comandi in conflitto\n"
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, fuzzy, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "non � stato trovato il segno = nella definizione del gruppo \"%s\"\n"
-#: g10/gpg.c:1259
+#: g10/gpg.c:1261
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
-#: g10/gpg.c:1277
+#: g10/gpg.c:1279
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
-#: g10/gpg.c:1286
+#: g10/gpg.c:1288
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
-#: g10/gpg.c:1289
+#: g10/gpg.c:1291
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
-#: g10/gpg.c:1295
+#: g10/gpg.c:1297
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
-#: g10/gpg.c:1298
+#: g10/gpg.c:1300
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
-#: g10/gpg.c:1301
+#: g10/gpg.c:1303
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
-#: g10/gpg.c:1442
+#: g10/gpg.c:1444
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "elemento della configurazione sconosciuto \"%s\"\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "l'URL della politica di firma indicato non � valido\n"
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, 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/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr "file con le opzioni `%s': %s\n"
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr "lettura delle opzioni da `%s'\n"
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: %s normalmente non deve essere usato!\n"
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, 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/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s non � un set di caratteri valido\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s non � un set di caratteri valido\n"
-#: g10/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "impossibile fare il parsing dell'URI del keyserver\n"
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opzioni di esportazione non valide\n"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opzioni di importazione non valide\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
msgid "invalid import options\n"
msgstr "opzioni di importazione non valide\n"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
msgid "invalid export options\n"
msgstr "opzioni di esportazione non valide\n"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opzioni di importazione non valide\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
#, fuzzy
msgid "invalid list options\n"
msgstr "opzioni di importazione non valide\n"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s non � un set di caratteri valido\n"
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "l'URL della politica di firma indicato non � valido\n"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s non � un set di caratteri valido\n"
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
#, fuzzy
msgid "invalid verify options\n"
msgstr "opzioni di esportazione non valide\n"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "impossibile impostare exec-path a %s\n"
-#: g10/gpg.c:2764
+#: g10/gpg.c:2768
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
msgid "WARNING: program may create a core file!\n"
msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
-#: g10/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Non � permesso usare %s con %s!\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "Non ha senso usare %s con %s!\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2865
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "gpg-agent non � disponibile in questa sessione\n"
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "scrittura della chiave segreta in `%s'\n"
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
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/gpg.c:2896
+#: g10/gpg.c:2900
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/gpg.c:2902
+#: g10/gpg.c:2906
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/gpg.c:2915
+#: g10/gpg.c:2919
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/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algoritmo di cifratura selezionato non � valido\n"
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr "l'algoritmo di digest selezionato non � valido\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "l'algoritmo di cifratura selezionato non � valido\n"
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
msgid "selected certification digest algorithm is invalid\n"
msgstr "l'algoritmo di digest selezionato non � valido\n"
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve essere maggiore di 0\n"
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve essere maggiore di 1\n"
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
#, 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/gpg.c:3021
+#: g10/gpg.c:3025
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/gpg.c:3023
+#: g10/gpg.c:3027
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/gpg.c:3026
+#: g10/gpg.c:3030
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
-#: g10/gpg.c:3030
+#: g10/gpg.c:3034
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3041
msgid "invalid default preferences\n"
msgstr "preferenze predefinite non valide\n"
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
msgid "invalid personal cipher preferences\n"
msgstr "preferenze personali del cifrario non valide\n"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
msgid "invalid personal digest preferences\n"
msgstr "preferenze personali del digest non valide\n"
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
msgid "invalid personal compress preferences\n"
msgstr "preferenze personali di compressione non valide\n"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s non funziona ancora con %s\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, 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/gpg.c:3139
+#: g10/gpg.c:3143
#, 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/gpg.c:3144
+#: g10/gpg.c:3148
#, 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/gpg.c:3246
+#: g10/gpg.c:3250
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
-#: g10/gpg.c:3257
+#: g10/gpg.c:3261
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/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [nomefile]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [nomefile]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "decifratura fallita: %s\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [nomefile]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nomefile]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "non � possibile usare %s in modalit� %s\n"
-#: g10/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--sign [nomefile]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nomefile]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nomefile]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, 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/gpg.c:3376
+#: g10/gpg.c:3380
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nomefile]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [nomefile]"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [nomefile]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [comandi]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
-#: g10/gpg.c:3556
+#: g10/gpg.c:3560
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "invio al keyserver fallito: %s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "ricezione dal keyserver fallita: %s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, c-format
msgid "key export failed: %s\n"
msgstr "esportazione della chiave fallita: %s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "ricerca nel keyserver fallita: %s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "aggiornamento del keyserver fallito: %s\n"
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "rimozione dell'armatura fallita: %s\n"
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
-#: g10/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo di hash non valido `%s'\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[nomefile]"
-#: g10/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr "Vai avanti e scrivi il messaggio...\n"
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
msgid "the given certification policy URL is invalid\n"
msgstr "l'URL della politica di certificazione indicato non � valido\n"
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
msgid "the given signature policy URL is invalid\n"
msgstr "l'URL della politica di firma indicato non � valido\n"
-#: g10/gpg.c:4193
+#: g10/gpg.c:4197
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "l'URL della politica di firma indicato non � valido\n"
@@ -1871,7 +1871,7 @@ msgstr ""
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "Chiave %08lX non valida resa valida da --allow-non-selfsigned-uid\n"
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, fuzzy, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr ""
@@ -2279,429 +2279,429 @@ msgstr "chiave segreta inutilizzabile"
msgid "remove as much as possible from key after import"
msgstr ""
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr "salto un blocco di tipo %d\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "Per ora sono state esaminate %lu chiavi\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Numero totale esaminato: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " nuove chiavi saltate: %lu\n"
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " senza user ID: %lu\n"
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr " importate: %lu"
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr " non modificate: %lu\n"
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nuovi user ID: %lu\n"
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nuove subchiavi: %lu\n"
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr " nuove firme: %lu\n"
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr "nuove revoche di chiavi: %lu\n"
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr " chiavi segrete lette: %lu\n"
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "chiavi segrete importate: %lu\n"
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "chiavi segrete non cambiate: %lu\n"
-#: g10/import.c:321
+#: g10/import.c:322
#, c-format
msgid " not imported: %lu\n"
msgstr " importate: %lu\n"
-#: g10/import.c:323
+#: g10/import.c:324
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " nuove firme: %lu\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " chiavi segrete lette: %lu\n"
-#: g10/import.c:566
+#: g10/import.c:567
#, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr ""
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
#, fuzzy
msgid " algorithms on these user IDs:\n"
msgstr "Non puoi cancellare l'ultimo user ID!\n"
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
-#: g10/import.c:619
+#: g10/import.c:620
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "Firma %s, algoritmo di digest %s\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "chiave %08lX: nessun user ID\n"
-#: g10/import.c:749
+#: g10/import.c:750
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "chiave %08lX: riparati i danni di HKP alla subchiave\n"
-#: g10/import.c:764
+#: g10/import.c:765
#, fuzzy, c-format
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:770
+#: g10/import.c:771
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "chiave %08lX: nessun user ID valido\n"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr "questo pu� essere causato da una autofirma mancante\n"
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
-#: g10/import.c:788
+#: g10/import.c:789
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "chiave %08lX: nuova chiave - saltata\n"
-#: g10/import.c:797
+#: g10/import.c:798
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr "scrittura in `%s'\n"
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "errore scrivendo il portachiavi `%s': %s\n"
-#: g10/import.c:825
+#: g10/import.c:826
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "chiave %08lX: importata la chiave pubblica \"%s\"\n"
-#: g10/import.c:849
+#: g10/import.c:850
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "chiave %08lX: \"%s\" 1 nuovo user ID\n"
-#: g10/import.c:914
+#: g10/import.c:915
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
-#: g10/import.c:917
+#: g10/import.c:918
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "chiave %08lX: \"%s\" una nuova firma\n"
-#: g10/import.c:920
+#: g10/import.c:921
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
-#: g10/import.c:923
+#: g10/import.c:924
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "chiave %08lX: \"%s\" una nuova subchiave\n"
-#: g10/import.c:926
+#: g10/import.c:927
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "chiave %08lX: \"%s\" %d nuove subchiavi\n"
-#: g10/import.c:929
+#: g10/import.c:930
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
-#: g10/import.c:932
+#: g10/import.c:933
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
-#: g10/import.c:935
+#: g10/import.c:936
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
-#: g10/import.c:938
+#: g10/import.c:939
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
-#: g10/import.c:961
+#: g10/import.c:962
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "chiave %08lX: \"%s\" non cambiata\n"
-#: g10/import.c:1124
+#: g10/import.c:1125
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "chiave %08lX: chiave segreta con cifrario %d non valido - saltata\n"
-#: g10/import.c:1135
+#: g10/import.c:1136
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "scrittura della chiave segreta in `%s'\n"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "nessun portachiavi segreto predefinito: %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "chiave %08lX: chiave segreta importata\n"
-#: g10/import.c:1193
+#: g10/import.c:1194
#, fuzzy, c-format
msgid "key %s: already in secret keyring\n"
msgstr "chiave %08lX: gi� nel portachiavi segreto\n"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, fuzzy, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"chiave %08lX: manca la chiave pubblica - impossibile applicare il\n"
"certificato di revoca\n"
-#: g10/import.c:1276
+#: g10/import.c:1277
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n"
-#: g10/import.c:1308
+#: g10/import.c:1309
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "chiave %08lX: \"%s\" certificato di revoca importato\n"
-#: g10/import.c:1374
+#: g10/import.c:1375
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "chiave %08lX: nessun user ID per la firma\n"
-#: g10/import.c:1389
+#: g10/import.c:1390
#, fuzzy, c-format
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:1391
+#: g10/import.c:1392
#, fuzzy, c-format
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:1409
+#: g10/import.c:1410
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
-#: g10/import.c:1422
+#: g10/import.c:1423
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "chiave %08lX: legame con la subchiave non valido:\n"
-#: g10/import.c:1437
+#: g10/import.c:1438
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "chiave %08lX: rimossi i legami con subochiavi multiple\n"
-#: g10/import.c:1459
+#: g10/import.c:1460
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "chiave %08lX: non ci sono subchiavi per la revoca della chiave\n"
-#: g10/import.c:1472
+#: g10/import.c:1473
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "chiave %08lX: revoca della subchiave non valida\n"
-#: g10/import.c:1487
+#: g10/import.c:1488
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "chiave %08lX: rimosse le revoche di subchiavi multiple\n"
-#: g10/import.c:1529
+#: g10/import.c:1530
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "chiave %08lX: saltato l'user ID '"
-#: g10/import.c:1550
+#: g10/import.c:1551
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "chiave %08lX: saltata la subchiave\n"
-#: g10/import.c:1577
+#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n"
-#: g10/import.c:1587
+#: g10/import.c:1588
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltata\n"
-#: g10/import.c:1604
+#: g10/import.c:1605
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "chiave %08lX: certificato di revoca non valido: %s - saltata\n"
-#: g10/import.c:1618
+#: g10/import.c:1619
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
-#: g10/import.c:1626
+#: g10/import.c:1627
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "chiave %08lX: classe della firma inaspettata (0x%02x) - saltata\n"
-#: g10/import.c:1726
+#: g10/import.c:1727
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
-#: g10/import.c:1788
+#: g10/import.c:1789
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"ATTENZIONE: la chiave %08lX pu� essere stata revocata: scarico la chiave\n"
"di revoca %08lX.\n"
-#: g10/import.c:1802
+#: g10/import.c:1803
#, 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:1861
+#: g10/import.c:1862
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n"
-#: g10/import.c:1895
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
-#: g10/import.c:2284
+#: g10/import.c:2285
#, fuzzy
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n"
-#: g10/import.c:2292
+#: g10/import.c:2293
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "saltata: chiave pubblica gi� presente\n"
-#: g10/import.c:2294
+#: g10/import.c:2295
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "saltata: chiave pubblica gi� presente\n"
@@ -3027,8 +3027,8 @@ msgstr ""
msgid "Really sign? (y/N) "
msgstr "Firmo davvero? "
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "firma fallita: %s\n"
@@ -3559,7 +3559,7 @@ 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
@@ -3603,12 +3603,32 @@ msgstr "Non � stato cancellato nulla.\n"
msgid "invalid"
msgstr "armatura non valida"
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "L'user ID \"%s\" � stato revocato."
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "L'user ID \"%s\" � stato revocato."
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "L'user ID \"%s\" � stato revocato."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "l'user ID \"%s\" � gi� stato revocato\n"
+
+#: g10/keyedit.c:3252
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "l'user ID \"%s\" � gi� stato revocato\n"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3618,207 +3638,207 @@ msgstr ""
" designato pu� causarne il rifiuto da parte di alcune versioni\n"
" di PGP.\n"
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3357
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:3372
+#: g10/keyedit.c:3377
msgid "Enter the user ID of the designated revoker: "
msgstr "Inserisci l'user ID del revocatore designato: "
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3402
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:3412
+#: g10/keyedit.c:3417
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:3434
+#: g10/keyedit.c:3439
#, 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:3453
+#: g10/keyedit.c:3458
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:3459
+#: g10/keyedit.c:3464
#, fuzzy
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:3520
+#: g10/keyedit.c:3525
msgid "Please remove selections from the secret keys.\n"
msgstr "Togli le selezioni dalle chiavi segrete.\n"
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3531
#, fuzzy
msgid "Please select at most one subkey.\n"
msgstr "Seleziona al massimo una chiave secondaria.\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
msgid "Changing expiration time for the primary key.\n"
msgstr "Cambio la data di scadenza per la chiave primaria.\n"
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3584
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:3595
+#: g10/keyedit.c:3600
msgid "No corresponding signature in secret ring\n"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3673
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr ""
"ATTENZIONE: la sottochiave per firme %08lX non ha una certificature "
"incrociata\n"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
msgid "Please select exactly one user ID.\n"
msgstr "Devi selezionare esattamente un user ID.\n"
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, 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:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Sei sicuro di volerla usare? (s/N) "
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4132
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Sei sicuro di volerla usare? (s/N) "
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4194
#, fuzzy
msgid "Enter the notation: "
msgstr "Annotazione della firma: "
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Sovrascrivo (s/N)? "
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nessun user ID con l'indice %d\n"
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4465
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Nessun user ID con l'indice %d\n"
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Nessun user ID con l'indice %d\n"
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "user ID: \""
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " firmata da %08lX il %s%s%s\n"
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr " (non esportabile)"
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Questa chiave � scaduta il %s.\n"
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4644
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Creare un certificato di revoca per questa firma? (s/N) "
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4671
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Non puoi cancellare l'ultimo user ID!\n"
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
#, fuzzy
msgid " (non-revocable)"
msgstr " (non esportabile)"
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revocata da %08lX il %s\n"
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr "Stai per revocare queste firme:\n"
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
msgid "Really create the revocation certificates? (y/N) "
msgstr "Creare davvero i certificati di revoca? (s/N) "
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr "manca la chiave segreta\n"
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "l'user ID \"%s\" � gi� stato revocato\n"
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4863
#, 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:4922
+#: g10/keyedit.c:4927
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "l'user ID \"%s\" � gi� stato revocato\n"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "l'user ID \"%s\" � gi� stato revocato\n"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@ -4444,7 +4464,7 @@ msgstr "disable"
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "opzioni di esportazione non valide\n"
@@ -4479,12 +4499,12 @@ msgstr "cerco \"%s\" sul server HKP %s\n"
msgid "searching for names from %s\n"
msgstr "cerco \"%s\" sul server HKP %s\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "cerco \"%s\" sul server HKP %s\n"
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
@@ -4492,94 +4512,94 @@ msgstr ""
"firmata con la tua chiave %08lX il %s\n"
"\n"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "cerco \"%s\" sul server HKP %s\n"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "cerco \"%s\" sul server HKP %s\n"
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
#, fuzzy
msgid "no keyserver action!\n"
msgstr "opzioni di esportazione non valide\n"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
#, fuzzy
msgid "keyserver timed out\n"
msgstr "errore del keyserver"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
#, fuzzy
msgid "keyserver internal error\n"
msgstr "errore del keyserver"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "ricezione dal keyserver fallita: %s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "richiedo la chiave %08lX a %s\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "richiedo la chiave %08lX a %s\n"
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
@@ -4988,12 +5008,12 @@ msgstr "Inserisci la passphrase\n"
msgid "cancelled by user\n"
msgstr "interrotto dall'utente\n"
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
#, fuzzy
msgid "can't query passphrase in batch mode\n"
msgstr "impossibile chiedere la password in modo batch\n"
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "Inserisci la passphrase: "
@@ -5017,7 +5037,7 @@ msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "Ripeti la passphrase: "
@@ -6501,18 +6521,6 @@ msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
#~ msgstr "impossibile eseguire %s \"%s\": %s\n"
#, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "L'user ID \"%s\" � stato revocato."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "L'user ID \"%s\" � stato revocato."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "L'user ID \"%s\" � stato revocato."
-
-#, fuzzy
#~ msgid "No user IDs are removable.\n"
#~ msgstr "l'user ID \"%s\" � gi� stato revocato\n"
diff --git a/po/ja.po b/po/ja.po
index a797f49cb..e1bcd86a7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.3.92\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\n"
"PO-Revision-Date: 2004-11-23 11:14+0900\n"
"Last-Translator: IIDA Yosiaki <[email protected]>\n"
"Language-Team: Japanese <[email protected]>\n"
@@ -43,7 +43,7 @@ msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -79,7 +79,7 @@ msgstr "��%s�פ��ɤ�ޤ���: %s\n"
msgid "note: random_seed file not updated\n"
msgstr "����: random_seed �ե�����ι����򤷤ޤ���\n"
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, c-format
@@ -305,75 +305,75 @@ msgstr ""
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "%s�˥��������Ǥ��ޤ��� - ̵����OpenPGP������?\n"
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr "����: %s\n"
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr "̵���������إå���: "
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr "�����إå���: "
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr "̵���ʥ��ꥢ��̾�إå���\n"
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr "����ҤΥ��ꥢ��̾\n"
-#: g10/armor.c:568
+#: g10/armor.c:620
msgid "unexpected armor: "
msgstr "ͽ����������: "
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr "̵���ʥ��å���ǥ��������פ��줿��: "
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "̵����64��ʸ��%02X��ȤФ��ޤ���\n"
-#: g10/armor.c:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr "�ե������������᤹���ޤ� (CRC������ޤ���)\n"
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr "�ե������������᤹���ޤ� (CRC������)\n"
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr "CRC�ν񼰤�����������ޤ���\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC���顼��%06lX - %06lX\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
msgid "premature eof (in trailer)\n"
msgstr "�ե������������᤹���ޤ� (����������ˤ���ޤ�)\n"
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr "�����ιԤ˥��顼������ޤ�\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr "ͭ����OpenPGP�ǡ��������Ĥ���ޤ���\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "̵��������: �Ԥ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
-#: g10/armor.c:1167
+#: g10/armor.c:1219
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -459,7 +459,7 @@ msgstr "��������õ������URL: "
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr "��%s�פ��ɽФ����顼: %s\n"
@@ -717,7 +717,7 @@ msgstr "PIN�������: "
msgid "PIN not correctly repeated; try again"
msgstr "PIN������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -727,13 +727,13 @@ msgstr "��%s�פ������ޤ���\n"
msgid "--output doesn't work for this command\n"
msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "����%s�ɤ����Ĥ���ޤ���: %s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %s\n"
@@ -839,22 +839,22 @@ msgstr "%s��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s�Ź沽 ������:��%s��\n"
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr "%s�Ź沽�Ѥߥǡ���\n"
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "̤�ΤΥ��르�ꥺ��%d�ˤ��Ź沽\n"
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr "�ٹ�: ��å��������оΰŹ�ˡ�μ夤���ǰŹ沽����Ƥ��ޤ���\n"
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
msgid "problem handling encrypted packet\n"
msgstr "�Ź沽�ѥ��åȤμ谷���Ǿ㳲\n"
@@ -982,7 +982,7 @@ msgstr "�ٹ�: ��̩��%s�ˤϡ�ñ���SK�����å����ब����ޤ���\n"
msgid "WARNING: nothing exported\n"
msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -990,127 +990,127 @@ msgstr ""
"@���ޥ��:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[�ե�����]|��̾�����"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[�ե�����]|���ꥢ��̾�����"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "ʬΥ��̾�����"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "�ǡ�����Ź沽"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "�ǡ��������� (����)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "��̾�򸡾�"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "�����"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "���Ƚ�̾�ΰ���"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "list and check key signatures"
msgstr "����̾�θ����Ȱ���"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "���Ȼ���ΰ���"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "��̩���ΰ���"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "��������������"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "remove keys from the public keyring"
msgstr "�������ؤ��鸰������"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
msgid "remove keys from the secret keyring"
msgstr "��̩���ؤ��鸰������"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "���˽�̾"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "��������Ū�˽�̾"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "���ؤν�̾���Խ�"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr "���������������"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "����񤭽Ф�"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "�������С��˸���񤭽Ф�"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "�������С����鸰���ɤ߹���"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "search for keys on a key server"
msgstr "�������С��θ��򸡺�����"
-#: g10/gpg.c:411
+#: g10/gpg.c:412
msgid "update all keys from a keyserver"
msgstr "�������С����鸰��������������"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "�����ɹ���/ʻ��"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr "�����ɾ��֤�ɽ��"
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr "�����ɤΥǡ������ѹ�"
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr "�����ɤ�PIN���ѹ�"
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr "���ѥǡ����١����򹹿�"
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr "|���르�ꥺ�� [�ե�����]|��å����������ɽ��"
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1120,55 +1120,55 @@ msgstr ""
"���ץ����:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr "ASCII���������������"
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|̾��|��̾�����Ѥ˰Ź沽"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
msgid "use this user-id to sign or decrypt"
msgstr ""
"��̾������ˤ��Υ桼����id\n"
"�����"
-#: g10/gpg.c:456
+#: g10/gpg.c:457
msgid "|N|set compress level N (0 disables)"
msgstr ""
"|N|���̥�٥��N������\n"
"(0���󰵽�)"
-#: g10/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr "����ƥ����ȡ��⡼�ɤ����"
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "���ϥե�����Ȥ��ƻ���"
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "��Ĺ"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "̵�ѹ�"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr "������˳�ǧ"
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr "��̩��OpenPGP�ο�������"
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr "PGP 2.x�ߴ��Υ�å�����������"
-#: g10/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1177,7 +1177,7 @@ msgstr ""
"(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
"�ޥ˥奢�롦�ڡ���������������)\n"
-#: g10/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1197,15 +1197,15 @@ msgstr ""
" --list-keys [̾��] ����ɽ��\n"
" --fingerprint [̾��] �����ɽ��\n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
msgid "Please report bugs to <[email protected]>.\n"
msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
-#: g10/gpg.c:778
+#: g10/gpg.c:780
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
-#: g10/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1215,7 +1215,7 @@ msgstr ""
"��̾���������Ź沽������\n"
"��������ϡ����ϥǡ����˰�¸\n"
-#: g10/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1223,566 +1223,566 @@ msgstr ""
"\n"
"���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr "������: "
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr "�Ź�ˡ: "
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr "�ϥå���: "
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
msgid "Compression: "
msgstr "����: "
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "�Ȥ���: gpg [���ץ����] "
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "��Ω���륳�ޥ��\n"
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "=���椬�����롼�������%s����˸��Ĥ���ޤ���\n"
-#: g10/gpg.c:1259
+#: g10/gpg.c:1261
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���ͭ��\n"
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���ͭ��\n"
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���ͭ��\n"
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ�����\n"
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ�����\n"
-#: g10/gpg.c:1277
+#: g10/gpg.c:1279
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ�����\n"
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
-#: g10/gpg.c:1286
+#: g10/gpg.c:1288
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
-#: g10/gpg.c:1289
+#: g10/gpg.c:1291
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
-#: g10/gpg.c:1295
+#: g10/gpg.c:1297
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
-#: g10/gpg.c:1298
+#: g10/gpg.c:1300
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
-#: g10/gpg.c:1301
+#: g10/gpg.c:1303
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
-#: g10/gpg.c:1442
+#: g10/gpg.c:1444
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "̤�Τι������ܡ�%s��\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
#, fuzzy
msgid "show all notations during signature listings"
msgstr "��̩���ؤ��б������̾������ޤ���\n"
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "��̩���ȸ������ΰ�����ȿž"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "��̩���ؤ��б������̾������ޤ���\n"
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
-#: g10/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr "���ץ���󡦥ե������%s��: %s\n"
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "����: ����%s�ϻȤ��ޤ���!\n"
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, c-format
msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr "�����Ǥʤ����ĤΤ��ᡢ�Ź�ˡ��ĥ��%s�פ�����ɤ��ޤ���\n"
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
-#: g10/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
msgid "could not parse keyserver URL\n"
msgstr "�������С���URL�������ǽ\n"
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ̵���ʸ������С������ץ����Ǥ�\n"
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
msgid "invalid keyserver options\n"
msgstr "̵���ʸ������С������ץ����Ǥ�\n"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����Ǥ�\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
msgid "invalid import options\n"
msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ̵���ʽ�Ф����ץ����Ǥ�\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
msgid "invalid export options\n"
msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ̵���ʰ������ץ����Ǥ�\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
msgid "invalid list options\n"
msgstr "̵���ʰ������ץ����Ǥ�\n"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
#, fuzzy
msgid "show all notations during signature verification"
msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
msgid "invalid verify options\n"
msgstr "̵���ʸ��ڥ��ץ����Ǥ�\n"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-path��%s��������ǽ\n"
-#: g10/gpg.c:2764
+#: g10/gpg.c:2768
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
msgid "WARNING: program may create a core file!\n"
msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
-#: g10/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "�ٹ�: %s��%s���ͥ��\n"
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s��%s�ȤȤ�˻ȤäƤ�̵��̣�Ǥ�!\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2865
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
-#: g10/gpg.c:2896
+#: g10/gpg.c:2900
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ沽��Ʊ���ˤǤ��ޤ���\n"
-#: g10/gpg.c:2902
+#: g10/gpg.c:2906
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
-#: g10/gpg.c:2915
+#: g10/gpg.c:2919
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
-#: g10/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
msgid "selected compression algorithm is invalid\n"
msgstr "���򤵤줿���̥��르�ꥺ��ϡ�̵���Ǥ�\n"
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
msgid "selected certification digest algorithm is invalid\n"
msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
-#: g10/gpg.c:3021
+#: g10/gpg.c:3025
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "̵����default-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
-#: g10/gpg.c:3023
+#: g10/gpg.c:3027
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "̵����min-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
-#: g10/gpg.c:3026
+#: g10/gpg.c:3030
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
-#: g10/gpg.c:3030
+#: g10/gpg.c:3034
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3041
msgid "invalid default preferences\n"
msgstr "̵���ʴ��������\n"
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
msgid "invalid personal cipher preferences\n"
msgstr "̵���ʸĿ��ѰŹ�ˡ������\n"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
msgid "invalid personal digest preferences\n"
msgstr "̵���ʸĿ������������\n"
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
msgid "invalid personal compress preferences\n"
msgstr "̵���ʸĿ��Ѱ��̤�����\n"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
-#: g10/gpg.c:3139
+#: g10/gpg.c:3143
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3148
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
-#: g10/gpg.c:3246
+#: g10/gpg.c:3250
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
-#: g10/gpg.c:3257
+#: g10/gpg.c:3261
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
-#: g10/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [�ե�����̾]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [�ե�����̾]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [�ե�����̾]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [�ե�����̾]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
-#: g10/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--sign [�ե�����̾]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [�ե�����̾]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [�ե�����̾]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
-#: g10/gpg.c:3376
+#: g10/gpg.c:3380
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [�ե�����̾]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [�ե�����̾]"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [�ե�����̾]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key �桼����id"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key �桼����id"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key �桼����id [���ޥ��]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [�桼����id] [����]"
-#: g10/gpg.c:3556
+#: g10/gpg.c:3560
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, c-format
msgid "key export failed: %s\n"
msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "��������˼��Ԥ��ޤ���: %s\n"
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "�����˼��Ԥ��ޤ���: %s\n"
-#: g10/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[�ե�����̾]"
-#: g10/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr "���Ϥ��ޤ�����å��������ǤäƤ������� ...\n"
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
msgid "the given certification policy URL is invalid\n"
msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
msgid "the given signature policy URL is invalid\n"
msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
-#: g10/gpg.c:4193
+#: g10/gpg.c:4197
msgid "the given preferred keyserver URL is invalid\n"
msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
@@ -1805,7 +1805,7 @@ msgstr ""
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%s�Ǥ�\n"
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "��������%s�ˤ���������̩����������ޤ��� - ̵��\n"
@@ -2205,422 +2205,422 @@ msgstr "���ѤǤ��ʤ���̩���Ǥ�"
msgid "remove as much as possible from key after import"
msgstr ""
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr "��%d�Υ֥��å���ȤФ��ޤ�\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu���ޤǽ���\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr " ��������: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " skipped new keys: %lu\n"
msgstr "�ȤФ�����������: %lu\n"
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " �桼����ID�ʤ�: %lu\n"
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr " �ɹ���: %lu"
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr " �ѹ��ʤ�: %lu\n"
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr "�������桼����ID: %lu\n"
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr " ����������: %lu\n"
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr " ��������̾: %lu\n"
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr " �����������: %lu\n"
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr " ��̩�����ɽФ�: %lu\n"
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " ��̩�����ɹ���: %lu\n"
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " ̵�ѹ�����̩��: %lu\n"
-#: g10/import.c:321
+#: g10/import.c:322
#, c-format
msgid " not imported: %lu\n"
msgstr " ̤�ɹ���: %lu\n"
-#: g10/import.c:323
+#: g10/import.c:324
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr "����ޤǤ˺������줿��̾: %lu\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " ��̩�����ɽФ�: %lu\n"
-#: g10/import.c:566
+#: g10/import.c:567
#, fuzzy, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr "�ٹ�: ��%s�ˤϡ������ԲĤȤ�������������ޤ�\n"
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
#, fuzzy
msgid " algorithms on these user IDs:\n"
msgstr "�����Υ桼����ID�Υ��르�ꥺ��:\n"
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": �Ź楢�르�ꥺ������� %s\n"
-#: g10/import.c:619
+#: g10/import.c:620
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": ���󥢥르�ꥺ������� %s\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": ���̥��르�ꥺ������� %s\n"
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "it is strongly suggested that you update your preferences and\n"
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"����Ū�ʥ��르�ꥺ���԰���������򤱤뤿�ᡢ���θ�������ۤ��Ƥ�������\n"
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "�ʲ��ǡ������������Ǥ��ޤ�: gpg --edit-key %s updpref save\n"
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, c-format
msgid "key %s: no user ID\n"
msgstr "��%s: �桼����ID������ޤ���\n"
-#: g10/import.c:749
+#: g10/import.c:750
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "��%s: PKS��������¤����\n"
-#: g10/import.c:764
+#: g10/import.c:765
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "��%s: ��������̤���ʽ�̾�Υ桼����ID��%s��\n"
-#: g10/import.c:770
+#: g10/import.c:771
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "��%s: ͭ���ʥ桼����ID������ޤ���\n"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr "���ʽ�̾�Τʤ������Ǥ��礦\n"
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "��%s: �����������Ĥ���ޤ���: %s\n"
-#: g10/import.c:788
+#: g10/import.c:789
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "��%s: ���������Ǥ� - �ȤФ��ޤ�\n"
-#: g10/import.c:797
+#: g10/import.c:798
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "����߲�ǽ�ʸ��ؤ����Ĥ���ޤ���: %s\n"
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr "��%s�פؤν����\n"
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "���ء�%s�פν���ߥ��顼: %s\n"
-#: g10/import.c:825
+#: g10/import.c:826
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "��%s: ��������%s�ɤ��ɤ߹��ߤޤ���\n"
-#: g10/import.c:849
+#: g10/import.c:850
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "��%s: �������ʣ���ȹ礤�ޤ���\n"
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "��%s: ���θ��֥��å��˰��֤Ť��Ǥ��ޤ���: %s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "��%s: ���θ��֥��å����ɤ߽Ф��ޤ���: %s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "��%s:��%s�ɿ������桼����ID��1��\n"
-#: g10/import.c:914
+#: g10/import.c:915
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
-#: g10/import.c:917
+#: g10/import.c:918
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "��%s:��%s�ɿ�������̾��1��\n"
-#: g10/import.c:920
+#: g10/import.c:921
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "��%s:��%s�ɿ�������̾��%d��\n"
-#: g10/import.c:923
+#: g10/import.c:924
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "��%s:��%s�ɿ�����������1��\n"
-#: g10/import.c:926
+#: g10/import.c:927
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "��%s:��%s�ɿ�����������%d��\n"
-#: g10/import.c:929
+#: g10/import.c:930
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "��%s:��%s�ɿ�������̾��%d��\n"
-#: g10/import.c:932
+#: g10/import.c:933
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "��%s:��%s�ɿ�������̾��%d��\n"
-#: g10/import.c:935
+#: g10/import.c:936
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
-#: g10/import.c:938
+#: g10/import.c:939
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
-#: g10/import.c:961
+#: g10/import.c:962
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "��%s:��%s���ѹ��ʤ�\n"
-#: g10/import.c:1124
+#: g10/import.c:1125
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "��%s: ̵���ʰŹ�ˡ%d����̩���Ǥ� - �ȤФ��ޤ�\n"
-#: g10/import.c:1135
+#: g10/import.c:1136
msgid "importing secret keys not allowed\n"
msgstr "��̩�����ɹ��ߤ϶ػߤǤ�\n"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "�������̩���ؤ�����ޤ���: %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, c-format
msgid "key %s: secret key imported\n"
msgstr "��%s: ��̩�����ɤ߹��ߤޤ���\n"
-#: g10/import.c:1193
+#: g10/import.c:1194
#, c-format
msgid "key %s: already in secret keyring\n"
msgstr "��%s: �⤦��̩���ؤˤ���ޤ�\n"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "��%s: ��̩�������Ĥ���ޤ���: %s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "��%s: ������������ޤ��� - �����������Ŭ�ѤǤ��ޤ���\n"
-#: g10/import.c:1276
+#: g10/import.c:1277
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "��%s: ̵���ʼ���������: %s - ����\n"
-#: g10/import.c:1308
+#: g10/import.c:1309
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "��%s:��%s�ɼ�����������ɤ߹��ߤޤ���\n"
-#: g10/import.c:1374
+#: g10/import.c:1375
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "��%s: ��̾���б�����桼����ID������ޤ���\n"
-#: g10/import.c:1389
+#: g10/import.c:1390
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "��%s: �桼����ID��%s�ɤΥ��ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
-#: g10/import.c:1391
+#: g10/import.c:1392
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "��%s: �桼����ID��%s�ɤμ��ʽ�̾����̵���Ǥ�\n"
-#: g10/import.c:1409
+#: g10/import.c:1410
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "��%s: �����б���������������ޤ���\n"
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "��%s: ���ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
-#: g10/import.c:1422
+#: g10/import.c:1423
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "��%s: ̵�����������б��Ǥ�\n"
-#: g10/import.c:1437
+#: g10/import.c:1438
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "��%s: ¿���������б��������ޤ�\n"
-#: g10/import.c:1459
+#: g10/import.c:1460
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "��%s: �������ˤ�����������������ޤ���\n"
-#: g10/import.c:1472
+#: g10/import.c:1473
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "��%s: ̵�������������Ǥ�\n"
-#: g10/import.c:1487
+#: g10/import.c:1488
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "��%s: ̵����������¿�ż����������ޤ�\n"
-#: g10/import.c:1529
+#: g10/import.c:1530
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "��%s: �ȤФ����桼����ID��%s��\n"
-#: g10/import.c:1550
+#: g10/import.c:1551
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "��%s: �ȤФ�������\n"
-#: g10/import.c:1577
+#: g10/import.c:1578
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "��%s: ��Ф��ԲĤʽ�̾ (���饹%02X) - �ȤФ��ޤ�\n"
-#: g10/import.c:1587
+#: g10/import.c:1588
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "��%s: ���������񤬸��ä����ꤵ��Ƥ��ޤ� - �ȤФ��ޤ�\n"
-#: g10/import.c:1604
+#: g10/import.c:1605
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "��%s: ̵���ʼ���������: %s - �ȤФ��ޤ�\n"
-#: g10/import.c:1618
+#: g10/import.c:1619
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "��%s: ������̾�ξ�꤬�����äƤ��ޤ� - �ȤФ��ޤ�\n"
-#: g10/import.c:1626
+#: g10/import.c:1627
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "��%s: ͽ�����̽�̾���饹 (0x%02X) - �ȤФ��ޤ�\n"
-#: g10/import.c:1726
+#: g10/import.c:1727
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "��%s: ��ʣ�����桼����ID�θ��� - ʻ��\n"
-#: g10/import.c:1788
+#: g10/import.c:1789
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s�ΰ����Ф�\n"
-#: g10/import.c:1802
+#: g10/import.c:1803
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s���Ժߡ�\n"
-#: g10/import.c:1861
+#: g10/import.c:1862
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "��%s:��%s�ɼ�����������ɲ�\n"
-#: g10/import.c:1895
+#: g10/import.c:1896
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "��%s: ľ�ܸ���̾���ɲ�\n"
-#: g10/import.c:2284
+#: g10/import.c:2285
#, fuzzy
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "����������̩�����ȹ礷�ޤ���!\n"
-#: g10/import.c:2292
+#: g10/import.c:2293
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
-#: g10/import.c:2294
+#: g10/import.c:2295
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
@@ -2918,8 +2918,8 @@ msgstr "���θ��ϡ����ʤ����դ��Ƹ������ޤ�����\n"
msgid "Really sign? (y/N) "
msgstr "�����˽�̾���ޤ���? (y/N) "
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
@@ -3437,7 +3437,7 @@ msgstr ""
"�ٹ�: �����PGP2�����θ��Ǥ����ե���ID���ɲäǡ��������Ǥ�PGP�ϡ�\n"
" ���θ�����ݤ��뤫�⤷��ޤ���\n"
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
msgid "Are you sure you still want to add it? (y/N) "
msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
@@ -3480,12 +3480,32 @@ msgstr "���������Ƥ��ޤ���\n"
msgid "invalid"
msgstr "̵���������Ǥ�"
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
+
+#: g10/keyedit.c:3252
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3494,191 +3514,191 @@ msgstr ""
"�ٹ�: �����PGP 2.x�����θ��Ǥ�����̾�����Ԥ��ɲäǡ��������Ǥ�PGP�ϡ�\n"
" ���θ�����ݤ��뤫�⤷��ޤ���\n"
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3357
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "PGP 2.x�����θ��ˤϻ�̾�����Ԥ��ɲäǤ��ޤ���\n"
-#: g10/keyedit.c:3372
+#: g10/keyedit.c:3377
msgid "Enter the user ID of the designated revoker: "
msgstr "��̾�����ԤΥ桼����ID�����Ϥ��Ƥ�������: "
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3402
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "PGP 2.x�����θ��ϡ���̾�����Ԥ�Ǥ̿�Ǥ��ޤ���\n"
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3417
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "��̾�����Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
-#: g10/keyedit.c:3434
+#: g10/keyedit.c:3439
msgid "this key has already been designated as a revoker\n"
msgstr "���θ��ϼ����ԤȤ��Ƥ⤦��̾����Ƥ��ޤ�\n"
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3458
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "�ٹ�: ���븰���̾�����Ԥ����ꤹ��ȡ������᤻�ޤ���!\n"
-#: g10/keyedit.c:3459
+#: g10/keyedit.c:3464
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "�����ˤ��θ����̾�����Ԥ�Ǥ̿���ޤ���? (y/N) "
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3525
msgid "Please remove selections from the secret keys.\n"
msgstr "��̩���������Ȥ��Ƥ���������\n"
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3531
#, fuzzy
msgid "Please select at most one subkey.\n"
msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "������ͭ�����¤��ѹ����ޤ���\n"
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
msgid "Changing expiration time for the primary key.\n"
msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3584
msgid "You can't change the expiration date of a v3 key\n"
msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3600
msgid "No corresponding signature in secret ring\n"
msgstr "��̩���ؤ��б������̾������ޤ���\n"
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3673
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "�ٹ�: ��̾����%s�ϡ���߾����Ǥ���ޤ���\n"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
msgid "Please select exactly one user ID.\n"
msgstr "�桼����ID�򤭤ä���ҤȤ����򤷤Ƥ���������\n"
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "�桼����ID��%s�ɤ�v3���ʽ�̾��ȤФ��ޤ�\n"
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr "�����������С�URL�����Ϥ��Ƥ�������: "
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
msgid "Are you sure you want to replace it? (y/N) "
msgstr "�����˸򴹤������Ǥ���? (y/N) "
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4132
msgid "Are you sure you want to delete it? (y/N) "
msgstr "�����˺���������Ǥ���? (y/N) "
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4194
#, fuzzy
msgid "Enter the notation: "
msgstr "��̾����: "
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "��񤭤��ޤ���? (y/N) "
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, c-format
msgid "No user ID with index %d\n"
msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4465
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "�桼����ID:��%s��\n"
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "%s��%s%s%s�˽�̾����Ƥ��ޤ�\n"
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr " (��Ф��Բ�)"
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, c-format
msgid "This signature expired on %s.\n"
msgstr "���ν�̾��%s����λ�Ǥ���\n"
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "����Ǥ������˼����������Ǥ���? (y/N) "
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4644
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "���ν�̾�ˤ������뼺���������������ޤ���? (y/N) "
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4671
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "�����Υ桼����ID�˸�%s�ǽ�̾���ޤ���:\n"
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
msgid " (non-revocable)"
msgstr " (�����Բ�)"
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "���ʤ��θ�%s��%s�˼�������Ƥ��ޤ�\n"
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr "�����ν�̾�򼺸����褦�Ȥ��Ƥ��ޤ�:\n"
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
msgid "Really create the revocation certificates? (y/N) "
msgstr "����������������˺������ޤ���? (y/N) "
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr "��̩��������ޤ���\n"
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4863
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "�ٹ�: �桼����ID��̾����%d��̤��Ǥ�\n"
-#: g10/keyedit.c:4922
+#: g10/keyedit.c:4927
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "%s (�礭��%ld) �θ�%s (uid %d) �Υե���ID�Ȥ���ɽ��\n"
@@ -4286,7 +4306,7 @@ msgstr "disabled"
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "�ֹ�(s)��N)�����ޤ���Q)��ߤ����Ϥ��Ƥ������� >"
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "̵���ʸ������С����ץ��ȥ���Ǥ� (us %d!=handler %d)\n"
@@ -4320,101 +4340,101 @@ msgstr "��%s�ɤ�%s�����С�%s���鸡��\n"
msgid "searching for names from %s\n"
msgstr "��%s�ɤ򥵡��С�%s���鸡��\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "��%s��%s������%s������\n"
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, c-format
msgid "sending key %s to %s\n"
msgstr "��%s��%s������\n"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "��%s�ɤ�%s�����С�%s���鸡��\n"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "��%s�ɤ򥵡��С�%s���鸡��\n"
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
msgid "no keyserver action!\n"
msgstr "�������С�����������󤬤���ޤ���!\n"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "�ٹ�: ���� (%s) ��GnuPG�θ������С����ϥ�ɥ�\n"
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr "�������С���VERSION���������ޤ���Ǥ���\n"
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr "���Τθ������С�������ޤ��� (���ץ����--keyserver��Ȥ��ޤ��礦)\n"
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr "���ι��ۤǤϡ������������С��θƽФ��ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr "�������С������������%s���ѤΥϥ�ɥ餬����ޤ���\n"
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "����%s�פϡ��������С������������%s�פǥ��ݡ��Ȥ���Ƥ��ޤ���\n"
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, fuzzy, c-format
msgid "%s does not support handler version %d\n"
msgstr "gpgkeys_%s�ϡ��ϥ�ɥ�%d�Ǥ򥵥ݡ��Ȥ��ޤ���\n"
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
msgid "keyserver timed out\n"
msgstr "�������С��Υ����ॢ����\n"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
msgid "keyserver internal error\n"
msgstr "�������С����������顼\n"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "�������С��̿����顼: %s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "��%s�ɸ�ID�ǤϤ���ޤ���: �ȤФ��ޤ�\n"
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "1�ܤθ���%s�������\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "%d�ܤθ���%s�������\n"
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
@@ -4816,11 +4836,11 @@ msgstr "�ѥ��ե졼��������\n"
msgid "cancelled by user\n"
msgstr "�桼�����ˤ���ä�\n"
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
msgid "can't query passphrase in batch mode\n"
msgstr "�Хå����⡼�ɤǥѥ��ե졼������礻�Ǥ��ޤ���\n"
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "�ѥ��ե졼��������: "
@@ -4843,7 +4863,7 @@ msgstr "%u�ӥå�%s��, ID %s�������դ�%s"
msgid " (subkey on main key ID %s)"
msgstr " (�縰ID %s ������)"
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "�ѥ��ե졼���������: "
@@ -6244,18 +6264,6 @@ msgstr "(������Ū�ˤϸ��ä��ץ�������Ȥä��ΤǤ��礦)\n"
#~ msgstr "��%s�פ�¹ԤǤ��ޤ���: %s\n"
#, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
-
-#, fuzzy
#~ msgid "No user IDs are removable.\n"
#~ msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
diff --git a/po/nb.po b/po/nb.po
index a09238383..05f440914 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.3\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\n"
"PO-Revision-Date: 2006-06-13 20:31+0200\n"
"Last-Translator: Trond Endrest�l <[email protected]>\n"
"Language-Team: Norwegian Bokm�l <[email protected]>\n"
@@ -44,7 +44,7 @@ msgstr "venter p� l�sing av �%s� ...\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -80,7 +80,7 @@ msgstr "kan ikke lese �%s�: %s\n"
msgid "note: random_seed file not updated\n"
msgstr "merk: random_seed-fila ble ikke oppdatert\n"
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, c-format
@@ -305,75 +305,75 @@ msgstr "bekrefting av Admin PIN er forel�pig nektet gjennom denne kommandoen\n"
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\n"
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr "armor: %s\n"
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr "ugyldig armorheader: "
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr "armorheader: "
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr "ugyldig clearsigheader\n"
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr "n�stede klartekstsignaturer\n"
-#: g10/armor.c:568
+#: g10/armor.c:620
msgid "unexpected armor: "
msgstr "uforventet armering:"
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr "ugyldig bindestrekbeskyttet linje: "
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "hoppet over ugyldig radix64-tegn %02x\n"
-#: g10/armor.c:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr "for tidlig eof (ingen CRC)\n"
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr "for tidlig eof (i CRC)\n"
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr "misdannet CRC\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC-feil; %06lX - %06lX\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
msgid "premature eof (in trailer)\n"
msgstr "for tidlig eof (i trailer)\n"
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr "feil i trailerlinje\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr "ingen gyldig OpenPGP-data funnet.\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "ugyldig armor: linje lengre enn %d tegn\n"
-#: g10/armor.c:1167
+#: g10/armor.c:1219
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -458,7 +458,7 @@ msgstr "URL for � hente offentlig n�kkel: "
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Feil: URL er for lang (grensa g�r ved %d tegn).\n"
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr "feil ved lesing av �%s�: %s\n"
@@ -716,7 +716,7 @@ msgstr "Gjenta denne PIN: "
msgid "PIN not correctly repeated; try again"
msgstr "PIN ble ikke gjentatt korrekt; pr�v igjen"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -726,13 +726,13 @@ msgstr "kan ikke �pne �%s�\n"
msgid "--output doesn't work for this command\n"
msgstr "--output virker ikke for denne kommandoen\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "n�kkelen �%s� ble ikke funnet: %s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %s\n"
@@ -846,24 +846,24 @@ msgstr "du kan ikke bruke %s i %s modus\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s kryptert for: \"%s\"\n"
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr "%s krypterte data\n"
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "kryptert med en ukjent algoritme %d\n"
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"ADVARSEL: meldingen er kryptert med en svak n�kkel for den symmetriske "
"cipher.\n"
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
msgid "problem handling encrypted packet\n"
msgstr "problem ved h�ndtering av kryptert pakke\n"
@@ -987,7 +987,7 @@ msgstr "ADVARSEL: hemmelig n�kkel %s har ikke en enkel SK-sjekksum\n"
msgid "WARNING: nothing exported\n"
msgstr "ADVARSEL: ingenting eksportert\n"
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -995,127 +995,127 @@ msgstr ""
"@Kommandoer:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[fil]|lage en signatur"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[fil]|lage en klartekstsignatur"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "lage en adskilt signatur"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "kryptere data"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr "kryptering med bare symmetrisk cipher"
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "dekryptere data (standard)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "bekrefte en signatur"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "liste n�kler"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "liste n�kler og signaturer"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "list and check key signatures"
msgstr "vise og sjekke n�kkelsignaturer"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "liste n�kler og fingeravtrykk"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "liste hemmelige n�kler"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "generere et nytt n�kkelpar"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "remove keys from the public keyring"
msgstr "fjerne n�kler fra det offentlige n�kkelknippet"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
msgid "remove keys from the secret keyring"
msgstr "fjerne n�kler fra det hemmelige n�kkelknippet"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "signere en n�kkel"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "signere en n�kkel lokalt"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "signere eller redigere en n�kkel"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr "generere et opphevingssertifikat"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "eksportere n�kler"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "eksportere n�kler til en n�kkelserver"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "importere n�kler fra en n�kkelserver"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "search for keys on a key server"
msgstr "s�ke etter n�kler p� en n�kkelserver"
-#: g10/gpg.c:411
+#: g10/gpg.c:412
msgid "update all keys from a keyserver"
msgstr "oppdatere alle n�klene fra en n�kkelserver"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "importere/flette n�kler"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr "vis kortets status"
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr "endre data p� et kort"
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr "endre PIN p� et kort"
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr "oppdatere tillitsdatabasen"
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr "|algo [filer]|skrive meldingsdigester"
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1125,51 +1125,51 @@ msgstr ""
"Valg:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr "lage ASCII-beskyttet output"
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|NAVN|kryptere for NAVN"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
msgid "use this user-id to sign or decrypt"
msgstr "bruke denne brukeriden for signering eller dekryptering"
-#: g10/gpg.c:456
+#: g10/gpg.c:457
msgid "|N|set compress level N (0 disables)"
msgstr "|N|sette kompresjonsniv� til N (0 sl�r av kompresjon)"
-#: g10/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr "bruk kanonisk tekstmodus"
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "bruk som outputfil"
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "fyldig output"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "ikke gj�r noen endringer"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr "sp�r f�r overskriving"
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr "bruk streng OpenPGP-oppf�rsel"
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr "generere PGP 2.x-kompatible meldinger"
-#: g10/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1177,7 +1177,7 @@ msgstr ""
"@\n"
"(Se mansiden for en komplett liste over alle kommandoene og valgene)\n"
-#: g10/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1197,15 +1197,15 @@ msgstr ""
" --list-keys [navn] vise n�kler\n"
" --fingerprint [navn] vise fingeravtrykk\n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Vennligst rapporter feil til <[email protected]>.\n"
-#: g10/gpg.c:778
+#: g10/gpg.c:780
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
-#: g10/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1215,7 +1215,7 @@ msgstr ""
"signere, sjekke, kryptere eller dekryptere\n"
"standard operasjon avhenger av inputdata\n"
-#: g10/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1223,73 +1223,73 @@ msgstr ""
"\n"
"St�ttede algoritmer:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr "Offentlig n�kkel: "
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr "Cipher: "
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr "Hash: "
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
msgid "Compression: "
msgstr "Kompresjon: "
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "bruksm�te: gpg [valg] "
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "motstridende kommandoer\n"
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "fant ingen �=�-tegn i gruppedefinisjonen �%s�\n"
-#: g10/gpg.c:1259
+#: g10/gpg.c:1261
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "ADVARSEL: utrygt eierskap p� hjemmekatalogen �%s�\n"
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "ADVARSEL: utrygt eierskap p� konfigurasjonsfilen �%s�\n"
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "ADVARSEL: utrygt eierskap p� utvidelsen �%s�\n"
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "ADVARSEL: utrygge rettigheter p� hjemmekatalogen �%s�\n"
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "ADVARSEL: utrygge rettigheter p� konfigurasjonsfilen �%s�\n"
-#: g10/gpg.c:1277
+#: g10/gpg.c:1279
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "ADVARSEL: utrygge rettigheter p� utvidelsen �%s�\n"
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over hjemmekatalogen �%"
"s�\n"
-#: g10/gpg.c:1286
+#: g10/gpg.c:1288
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1297,20 +1297,20 @@ msgstr ""
"ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over konfigurasjonsfilen "
"�%s�\n"
-#: g10/gpg.c:1289
+#: g10/gpg.c:1291
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
"ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over utvidelsen �%s�\n"
-#: g10/gpg.c:1295
+#: g10/gpg.c:1297
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over hjemmekatalogen "
"�%s�\n"
-#: g10/gpg.c:1298
+#: g10/gpg.c:1300
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1318,476 +1318,476 @@ msgstr ""
"ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over "
"konfigurasjonsfilen �%s�\n"
-#: g10/gpg.c:1301
+#: g10/gpg.c:1303
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
"ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over utvidelsen �%s�\n"
-#: g10/gpg.c:1442
+#: g10/gpg.c:1444
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "ukjent konfigurasjonspunkt �%s�\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
msgid "show all notations during signature listings"
msgstr ""
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
msgid "show the keyring name in key listings"
msgstr "vise navnet til n�kkelknippene i n�kkellister"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
msgid "show expiration dates during signature listings"
msgstr ""
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "MERK: den gamle valgfila �%s� ble ignorert\n"
-#: g10/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "MERK: ingen standard valgfil �%s�\n"
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr "valgfil �%s�: %s\n"
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr "leser valg fra �%s�\n"
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "MERK: %s er ikke for vanlig bruk!\n"
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, c-format
msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr "cipherutvidelse �%s� ble ikke lastet p� grunn av utrygge rettigheter\n"
# Tenk litt p� denne du, Trond.
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "�%s� er ikke en gyldig signaturutg�else\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "�%s� er ikke et gyldig tegnsett\n"
-#: g10/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
msgid "could not parse keyserver URL\n"
msgstr "kunne ikke parse n�kkelserverens URL\n"
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ugyldige valg for n�kkelserver\n"
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
msgid "invalid keyserver options\n"
msgstr "ugyldige valg for n�kkelserver\n"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ugyldige importvalg\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
msgid "invalid import options\n"
msgstr "ugyldige importvalg\n"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ugyldige eksportvalg\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
msgid "invalid export options\n"
msgstr "ugyldige eksportvalg\n"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ugyldige listevalg\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
msgid "invalid list options\n"
msgstr "ugyldige listevalg\n"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
msgid "show all notations during signature verification"
msgstr ""
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
msgid "show user ID validity during signature verification"
msgstr ""
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ugyldige valg for bekreftelse\n"
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
msgid "invalid verify options\n"
msgstr "ugyldige valg for bekreftelse\n"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "kunne ikke sette exec-path til %s\n"
-#: g10/gpg.c:2764
+#: g10/gpg.c:2768
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
msgid "WARNING: program may create a core file!\n"
msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
-#: g10/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ADVARSEL: %s overstyrere %s\n"
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s er ikke tillatt sammen med %s!\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s er ikke fornuftig med %s!\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2865
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr ""
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr ""
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "du kan bare lage adskilte eller klare signaturer i --pgp2-modus\n"
-#: g10/gpg.c:2896
+#: g10/gpg.c:2900
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "du kan ikke signere og kryptere samtidig i --pgp2-modus\n"
-#: g10/gpg.c:2902
+#: g10/gpg.c:2906
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "du m� bruke filer (og ikke en pipe) n�r --pgp2 er p�sl�tt\n"
-#: g10/gpg.c:2915
+#: g10/gpg.c:2919
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "kryptering en melding i --pgp2-modus krever IDEA-algoritmen\n"
-#: g10/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr "valgt krypteringsalgoritme er ugyldig\n"
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr "valg digestalgoritme er ugyldig\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
msgid "selected compression algorithm is invalid\n"
msgstr "valgt kompresjonsalgoritme er ugyldig\n"
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
msgid "selected certification digest algorithm is invalid\n"
msgstr "valgt sertifikasjondigestalgoritme er ugyldig\n"
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed m� v�re st�rre enn 0\n"
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-neede m� v�re st�rre enn 1\n"
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth m� v�re i intervallet fra 1 til 255\n"
-#: g10/gpg.c:3021
+#: g10/gpg.c:3025
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "ugyldig default-cert-level; m� v�re 0, 1, 2 eller 3\n"
-#: g10/gpg.c:3023
+#: g10/gpg.c:3027
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "ugyldig min-cert-level; m� v�re 0, 1, 2 eller 3\n"
-#: g10/gpg.c:3026
+#: g10/gpg.c:3030
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "MERK: enkel S2K-modus (0) er sterkt frar�det\n"
-#: g10/gpg.c:3030
+#: g10/gpg.c:3034
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ugyldig S2K-modus; m� v�re 0, 1 eller 3\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3041
msgid "invalid default preferences\n"
msgstr "ugyldig standard preferanser\n"
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
msgid "invalid personal cipher preferences\n"
msgstr "ugyldig personlig cipherpreferanser\n"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
msgid "invalid personal digest preferences\n"
msgstr "ugyldig personlig digestpreferanser\n"
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
msgid "invalid personal compress preferences\n"
msgstr "ugyldig personlig kompresjonspreferanser\n"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s virker ikke enn� med %s\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "du kan ikke bruke cipheralgoritmen �%s� i %s-modus\n"
-#: g10/gpg.c:3139
+#: g10/gpg.c:3143
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "du kan ikke bruke digestalgoritmen �%s� i %s-modus\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3148
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "du kan ikke bruke kompresjonsalgoritmen �%s� i %s-modus\n"
-#: g10/gpg.c:3246
+#: g10/gpg.c:3250
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
-#: g10/gpg.c:3257
+#: g10/gpg.c:3261
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"ADVARSEL: mottakere (-r) angitt uten � bruke offentlig n�kkelkryptering\n"
-#: g10/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [filnavn]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [filnavn]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "symmetrisk kryptering av �%s� mislyktes: %s\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [filnavn]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [filnavn]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "du kan ikke bruke --symmtric --encrypt i %s-modus\n"
-#: g10/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--sign [filnavn]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnavn]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [filnavn]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "du kan ikke bruke --symmetric --sign --encrypt i %s-modus\n"
-#: g10/gpg.c:3376
+#: g10/gpg.c:3380
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filnavn]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [filnavn]"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [filnavn]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key brukerid"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key brukerid"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key brukerid [kommandoer]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [brukerid] [n�kkelknippe]"
-#: g10/gpg.c:3556
+#: g10/gpg.c:3560
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "sending til n�kkelserver mislyktes: %s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "mottak fra n�kkelserver mislyktes: %s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, c-format
msgid "key export failed: %s\n"
msgstr "n�kkeleksport mislyktes: %s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "s�k p� n�kkelserver mislyktes: %s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "refresh p� n�kkelserver mislyktes: %s\n"
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dearmoring failed: %s\n"
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "enarmoring failed: %s\n"
-#: g10/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "ugyldig hashalgoritme �%s�\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[filnavn]"
-#: g10/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr "Sett i gang og tast inn meldingen din ...\n"
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
msgid "the given certification policy URL is invalid\n"
msgstr "den angitte URLen for sertifikasjonspolicyen er ugyldig\n"
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
msgid "the given signature policy URL is invalid\n"
msgstr "den angitte URLen for signaturpolicy er ugyldig\n"
-#: g10/gpg.c:4193
+#: g10/gpg.c:4197
msgid "the given preferred keyserver URL is invalid\n"
msgstr "den angitte URLen for den foretrukkede n�kkelserveren er ugyldig\n"
@@ -1810,7 +1810,7 @@ msgstr ""
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "Ugyldig n�kkel %s gjort gyldig av --allow-non-selfsigned-uid\n"
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "ingen hemmelig undern�kkel for offentlig undern�kkel %s - ignorerer\n"
@@ -2141,421 +2141,421 @@ msgstr ""
msgid "remove as much as possible from key after import"
msgstr ""
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr "hopper over blokk av typen %d\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu n�kler behandlet hittil\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Totalt antall behandlet: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " skipped new keys: %lu\n"
msgstr "nye n�kler som ble hoppet over: %lu\n"
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " uten brukerider: %lu\n"
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr " importert: %lu"
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr " uendret: %lu\n"
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nye brukerider: %lu\n"
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nye undern�kler: %lu\n"
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr " nye signaturer: %lu\n"
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nye n�kkelopphevinger: %lu\n"
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr " leste hemmelige n�kler: %lu\n"
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " importerte hemmelige n�kler: %lu\n"
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " uforandrede hemmelige n�kler: %lu\n"
-#: g10/import.c:321
+#: g10/import.c:322
#, c-format
msgid " not imported: %lu\n"
msgstr " ikke importert: %lu\n"
-#: g10/import.c:323
+#: g10/import.c:324
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " oppryddete signaturer: %lu\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " oppryddete brukerider: %lu\n"
-#: g10/import.c:566
+#: g10/import.c:567
#, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr ""
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
#, fuzzy
msgid " algorithms on these user IDs:\n"
msgstr " nye brukerider: %lu\n"
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
-#: g10/import.c:619
+#: g10/import.c:620
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " �%s� preferanse for digestalgoritme %s\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, c-format
msgid "key %s: no user ID\n"
msgstr "n�kkel %s: ingen brukerid\n"
-#: g10/import.c:749
+#: g10/import.c:750
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "n�kkel %s: PKS-undern�kkel reparert\n"
-#: g10/import.c:764
+#: g10/import.c:765
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "n�kkel %s: akseptert ikke-selvsignert brukerid �%s�\n"
-#: g10/import.c:770
+#: g10/import.c:771
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "n�kkel %s: ingen gyldig brukerid\n"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr "dette kan skyldes en manglende selvsignatur\n"
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "n�kkel %s: offentlig n�kkel ikke funnet: %s\n"
-#: g10/import.c:788
+#: g10/import.c:789
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "n�kkel %s: ny n�kkel - hoppet over\n"
-#: g10/import.c:797
+#: g10/import.c:798
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "ingen skrivbart n�kkelknippe funnet: %s\n"
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr "skriver til �%s�\n"
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
-#: g10/import.c:825
+#: g10/import.c:826
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "n�kkel %s: offentlig n�kkel �%s� importert\n"
-#: g10/import.c:849
+#: g10/import.c:850
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "n�kkel %s: stemmer ikke med v�r kopi\n"
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "n�kkel %s: kan ikke finne original n�kkelblokk: %s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "n�kkel %s: kan ikke lese original n�kkelblokk: %s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "n�kkel %s: �%s� 1 ny brukerid\n"
-#: g10/import.c:914
+#: g10/import.c:915
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "n�kkel %s: �%s� %d nye brukerider\n"
-#: g10/import.c:917
+#: g10/import.c:918
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "n�kkel %s: �%s� 1 ny signatur\n"
-#: g10/import.c:920
+#: g10/import.c:921
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
-#: g10/import.c:923
+#: g10/import.c:924
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "n�kkel %s: �%s� 1 ny undern�kkel\n"
-#: g10/import.c:926
+#: g10/import.c:927
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "n�kkel %s: �%s� %d nye undern�kler\n"
-#: g10/import.c:929
+#: g10/import.c:930
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
-#: g10/import.c:932
+#: g10/import.c:933
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
-#: g10/import.c:935
+#: g10/import.c:936
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "n�kkel %s: �%s� %d nye brukerider\n"
-#: g10/import.c:938
+#: g10/import.c:939
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "n�kkel %s: �%s� %d nye brukerider\n"
-#: g10/import.c:961
+#: g10/import.c:962
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "n�kkel %s: �%s� ikke endret\n"
-#: g10/import.c:1124
+#: g10/import.c:1125
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "n�kkel %s: hemmelig n�kkel med ugyldig cipher %d - hoppet over\n"
-#: g10/import.c:1135
+#: g10/import.c:1136
msgid "importing secret keys not allowed\n"
msgstr "import av hemmelig n�kkel er ikke tillatt\n"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "ingen standard hemmelig n�kkelknippe: %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, c-format
msgid "key %s: secret key imported\n"
msgstr "n�kkel %s: hemmelig n�kkel importert\n"
-#: g10/import.c:1193
+#: g10/import.c:1194
#, c-format
msgid "key %s: already in secret keyring\n"
msgstr "n�kkel %s: finnes allerede i hemmelig n�kkelknippe\n"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "n�kkel %s: hemmelig n�kkel ikke funnet: %s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"n�kkel %s: ingen offentlig n�kkel - kan ikke anvende opphevingssertifikat\n"
-#: g10/import.c:1276
+#: g10/import.c:1277
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
-#: g10/import.c:1308
+#: g10/import.c:1309
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "n�kkel %s: �%s� opphevingssertifikat importert\n"
-#: g10/import.c:1374
+#: g10/import.c:1375
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "n�kkel %s: ingen brukerid for signatur\n"
-#: g10/import.c:1389
+#: g10/import.c:1390
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "n�kkel %s: ust�ttet offentlig n�kkelalgoritme for brukerid �%s�\n"
-#: g10/import.c:1391
+#: g10/import.c:1392
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "n�kkel %s: ugyldig selvsignatur for brukerid �%s�\n"
-#: g10/import.c:1409
+#: g10/import.c:1410
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "n�kkel %s: ingen undern�kkel for n�kkelbinding\n"
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "n�kkel %s: ust�ttet offentlig n�kkelalgoritme\n"
-#: g10/import.c:1422
+#: g10/import.c:1423
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "n�kkel %s: ugyldig undern�kkelbinding\n"
-#: g10/import.c:1437
+#: g10/import.c:1438
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "n�kkel %s: fjernet flere undern�kkelbindinger\n"
-#: g10/import.c:1459
+#: g10/import.c:1460
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "n�kkel %s: ingen undern�kkel for n�kkeloppheving\n"
-#: g10/import.c:1472
+#: g10/import.c:1473
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "n�kkel %s: ugyldig undern�kkeloppheving\n"
-#: g10/import.c:1487
+#: g10/import.c:1488
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "n�kkel %s: fjernet flere undern�kkelopphevinger\n"
-#: g10/import.c:1529
+#: g10/import.c:1530
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "n�kkel %s: hoppet over brukerid �%s�\n"
-#: g10/import.c:1550
+#: g10/import.c:1551
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "n�kkel %s: hoppet over undern�kkel\n"
-#: g10/import.c:1577
+#: g10/import.c:1578
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "n�kkel %s: ikke-eksporterbar signatur (klasse 0x%02X) - hoppet over\n"
-#: g10/import.c:1587
+#: g10/import.c:1588
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "n�kkel %s: opphevingssertifikat p� feil plass - hoppet over\n"
-#: g10/import.c:1604
+#: g10/import.c:1605
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - hoppet over\n"
-#: g10/import.c:1618
+#: g10/import.c:1619
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "n�kkel %s: undern�kkelsignatur p� feil plass - hoppet over\n"
-#: g10/import.c:1626
+#: g10/import.c:1627
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "n�kkel %s: uforventet signaturklasse (0x%02X) - hoppet over\n"
-#: g10/import.c:1726
+#: g10/import.c:1727
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "n�kkel %s: duplikert brukerid oppdaget - flettet sammen\n"
-#: g10/import.c:1788
+#: g10/import.c:1789
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "ADVARSEL: n�kkel %s kan v�re opphevet: henter opphevingsn�kkel %s\n"
-#: g10/import.c:1802
+#: g10/import.c:1803
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"ADVARSEL: n�kkel %s kan v�re opphevet: opphevingsn�kkel %s ikke tilstede.\n"
-#: g10/import.c:1861
+#: g10/import.c:1862
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "n�kkel %s: �%s� opphevingssertifikat lagt til\n"
-#: g10/import.c:1895
+#: g10/import.c:1896
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "n�kkel %s: direkte n�kkelsignatur lagt til\n"
-#: g10/import.c:2284
+#: g10/import.c:2285
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr ""
-#: g10/import.c:2292
+#: g10/import.c:2293
msgid "NOTE: primary key is online and stored on card\n"
msgstr ""
-#: g10/import.c:2294
+#: g10/import.c:2295
msgid "NOTE: secondary key is online and stored on card\n"
msgstr ""
@@ -2850,8 +2850,8 @@ msgstr "Jeg har sjekket denne n�kkelen veldig n�ye.\n"
msgid "Really sign? (y/N) "
msgstr "Virkelig signere? (j/N) "
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "signering mislyktes: %s\n"
@@ -3326,7 +3326,7 @@ msgid ""
" of PGP to reject this key.\n"
msgstr ""
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Er du sikker p� at du vil legge den til? (j/N) "
@@ -3368,201 +3368,221 @@ msgstr "Ingen ble slettet.\n"
msgid "invalid"
msgstr "ugyldig"
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "brukerid �%s�: allerede renset\n"
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "brukerid �%s�: allerede renset\n"
+
+#: g10/keyedit.c:3252
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "brukerid �%s�: allerede renset\n"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
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:3352
+#: g10/keyedit.c:3357
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
-#: g10/keyedit.c:3372
+#: g10/keyedit.c:3377
msgid "Enter the user ID of the designated revoker: "
msgstr ""
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3402
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3417
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
-#: g10/keyedit.c:3434
+#: g10/keyedit.c:3439
msgid "this key has already been designated as a revoker\n"
msgstr ""
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3458
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
-#: g10/keyedit.c:3459
+#: g10/keyedit.c:3464
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Er du fortsatt sikker p� at du vil gj�re denne n�kkelen til en opphever? (j/"
"N) "
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3525
msgid "Please remove selections from the secret keys.\n"
msgstr ""
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3531
msgid "Please select at most one subkey.\n"
msgstr "Vennligst velg minst en undern�kkel.\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
msgid "Changing expiration time for a subkey.\n"
msgstr ""
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
msgid "Changing expiration time for the primary key.\n"
msgstr ""
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3584
msgid "You can't change the expiration date of a v3 key\n"
msgstr ""
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3600
msgid "No corresponding signature in secret ring\n"
msgstr ""
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3673
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "Undern�kkel %s er allerede opphevet.\n"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
msgid "Please select exactly one user ID.\n"
msgstr ""
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "hopper over v3 selvsignatur for brukerid �%s�\n"
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Er du sikker p� at du vil erstatte den? (j/N) "
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4132
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Er du sikker p� at du vil slette den? (j/N) "
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4194
msgid "Enter the notation: "
msgstr ""
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
msgid "Proceed? (y/N) "
msgstr ""
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, c-format
msgid "No user ID with index %d\n"
msgstr ""
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4465
#, c-format
msgid "No user ID with hash %s\n"
msgstr ""
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, c-format
msgid "No subkey with index %d\n"
msgstr ""
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, c-format
msgid "user ID: \"%s\"\n"
msgstr ""
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr ""
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr " (ikke-eksporterbar)"
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Denne signaturen utgikk den %s.\n"
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr ""
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4644
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr ""
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4671
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr ""
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
msgid " (non-revocable)"
msgstr " (ikke-opphevbar)"
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr ""
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr ""
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
msgid "Really create the revocation certificates? (y/N) "
msgstr ""
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr "ingen hemmelig n�kkel\n"
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "brukerid �%s� er allerede opphevet\n"
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4863
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "ADVARSEL: en brukeridsignatur er datert %d sekunder i fremtiden\n"
-#: g10/keyedit.c:4922
+#: g10/keyedit.c:4927
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "N�kkelen %s er allerede opphevet.\n"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Undern�kkel %s er allerede opphevet.\n"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@ -4181,7 +4201,7 @@ msgstr "utkoblet"
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr ""
@@ -4215,101 +4235,101 @@ msgstr "s�ke etter navn fra %s server %s\n"
msgid "searching for names from %s\n"
msgstr "s�ker etter navn fra %s\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr ""
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, c-format
msgid "sending key %s to %s\n"
msgstr ""
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "s�ke etter �%s� fra %s server %s\n"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "s�ker etter �%s� fra %s\n"
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
msgid "no keyserver action!\n"
msgstr "ingen handling for n�kkelserver!\n"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr "n�kkelserver sendte ikke VERSION\n"
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
msgid "keyserver timed out\n"
msgstr "n�kkelserver svarte ikke tidsnok\n"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
msgid "keyserver internal error\n"
msgstr "intern feil ved n�kkelserver\n"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "kommunikasjonsfeil med n�kkelserver: %s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "ADVARSEL: klarte ikke � oppfriske n�kkel %s via %s: %s\n"
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "oppfrisker 1 n�kkel fra %s\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "oppfrisker %d n�kler fra %s\n"
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "ADVARSEL: klarte ikke � fange URI %s: %s\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "ADVARSEL: klarte ikke � parse URI %s\n"
@@ -4711,11 +4731,11 @@ msgstr "Tast inn passfrase\n"
msgid "cancelled by user\n"
msgstr ""
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
msgid "can't query passphrase in batch mode\n"
msgstr "kan ikke sp�rre om passfrase i batchmodus\n"
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "Tast inn passfrase: "
@@ -4738,7 +4758,7 @@ msgstr "%u-bit %s-n�kkel, ID %s, opprettet %s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "Gjenta passfrase: "
diff --git a/po/pl.po b/po/pl.po
index dd6db33c0..70d588372 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: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\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"
@@ -50,7 +50,7 @@ msgstr "zapisuj� klucz tajny w '%s'\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -87,7 +87,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:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, c-format
@@ -323,77 +323,77 @@ msgstr ""
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr "opakowanie: %s\n"
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr "niepoprawny nag��wek opakowania: "
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr "nag��wek opakowania: "
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr "niew�a�ciwy nag��wek dokumentu z podpisem na ko�cu\n"
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr "zagnie�d�one podpisy na ko�cu dokumentu\n"
-#: g10/armor.c:568
+#: g10/armor.c:620
#, fuzzy
msgid "unexpected armor: "
msgstr "nieoczekiwane opakowanie:"
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr "niepoprawne oznaczenie linii minusami: "
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, 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:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr "przewczesny koniec pliku (brak CRC)\n"
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr "przedwczesny koniec pliku (w CRC)\n"
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr "b��d formatu CRC\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "B��d sumy CRC; %06lx - %06lx\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "przedwczesny koniec pliku (w linii ko�cz�cej)\n"
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr "b��d w linii ko�cz�cej\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, 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:1167
+#: g10/armor.c:1219
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -485,7 +485,7 @@ msgstr "brak odpowiadaj�cego klucza publicznego: %s\n"
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr "b��d odczytu ,,%s'': %s\n"
@@ -766,7 +766,7 @@ msgstr "Powt�rz has�o: "
msgid "PIN not correctly repeated; try again"
msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -776,13 +776,13 @@ msgstr "nie mo�na otworzy� ,,%s''\n"
msgid "--output doesn't work for this command\n"
msgstr "opcja --output nie dzia�a z tym poleceniem\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %s\n"
@@ -894,23 +894,23 @@ msgstr "%s nie jest dost�pne w trybie %s\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s zaszyfrowany dla: ,,%s''\n"
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr "dane zaszyfrowano za pomoc� %s\n"
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"OSTRZE�ENIE: wiadomo�� by�a szyfrowana kluczem s�abym szyfru symetrycznego.\n"
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
msgid "problem handling encrypted packet\n"
msgstr "problem podczas obr�bki pakietu szyfrowego\n"
@@ -1042,7 +1042,7 @@ msgstr "OSTRZE�ENIE: klucz prywatny %08lX nie ma prostej sumy kontrolnej SK.\n"
msgid "WARNING: nothing exported\n"
msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -1050,128 +1050,128 @@ msgstr ""
"@Polecenia:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[plik]|z�o�enie podpisu"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[plik]|z�o�enie podpisu pod dokumentem"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "z�o�enie podpisu oddzielonego od dokumentu"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "szyfrowanie danych"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr "szyfrowanie tylko szyfrem symetrycznym"
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "odszyfrowywanie danych (domy�lne)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "sprawdzenie podpisu"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "lista kluczy"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "lista kluczy i podpis�w"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
#, fuzzy
msgid "list and check key signatures"
msgstr "sprawdzenie podpis�w kluczy"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "lista kluczy i ich odcisk�w"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "lista kluczy prywatnych"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "generacja nowej pary kluczy"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "remove keys from the public keyring"
msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
msgid "remove keys from the secret keyring"
msgstr "usuni�cie klucza ze zbioru kluczy prywatnych"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "z�o�enie podpisu na kluczu"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "z�o�enie prywatnego podpisu na kluczu"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "podpisanie lub modyfikacja klucza"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr "tworzenie certyfikatu uniewa�nienia klucza"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "eksport kluczy do pliku"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "eksport kluczy do serwera kluczy"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "import kluczy z serwera kluczy"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "search for keys on a key server"
msgstr "szukanie kluczy na serwerze"
-#: g10/gpg.c:411
+#: g10/gpg.c:412
msgid "update all keys from a keyserver"
msgstr "od�wie�enie wszystkich kluczy z serwera"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "import/do��czenie kluczy"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr "uaktualnienie bazy zaufania"
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr "|algo [pliki]|skr�ty wiadomo�ci"
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1181,51 +1181,51 @@ msgstr ""
"Opcje:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr "opakowanie ASCII pliku wynikowego"
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
msgid "use this user-id to sign or decrypt"
msgstr "identyfikator do podpisania lub odszyfrowania"
-#: g10/gpg.c:456
+#: g10/gpg.c:457
msgid "|N|set compress level N (0 disables)"
msgstr "|N|poziom kompresji N (0 - bez)"
-#: g10/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr "kanoniczny format tekstowy"
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "plik wyj�ciowy"
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "z dodatkowymi informacjami"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "pozostawienie bez zmian"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr "pytanie przed nadpisaniem plik�w"
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1233,7 +1233,7 @@ msgstr ""
"@\n"
"(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
-#: g10/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1254,15 +1254,15 @@ msgstr ""
" --list-keys [nazwy] pokazuje klucze\n"
" --fingerprint [nazwy] pokazuje odciski kluczy\n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
msgid "Please report bugs to <[email protected]>.\n"
msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
-#: g10/gpg.c:778
+#: g10/gpg.c:780
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
-#: g10/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1272,7 +1272,7 @@ msgstr ""
"podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
"domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
-#: g10/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1280,73 +1280,73 @@ msgstr ""
"\n"
"Obs�ugiwane algorytmy:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr "Asymetryczne: "
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr "Symetryczne: "
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr "Skr�t�w: "
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
msgid "Compression: "
msgstr "Kompresji: "
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "wywo�anie: gpg [opcje]"
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "sprzeczne polecenia\n"
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, fuzzy, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
-#: g10/gpg.c:1259
+#: g10/gpg.c:1261
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
-#: g10/gpg.c:1277
+#: g10/gpg.c:1279
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, fuzzy, c-format
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/gpg.c:1286
+#: g10/gpg.c:1288
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1354,21 +1354,21 @@ msgstr ""
"OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
" zawieraj�cego %s ,,%s''\n"
-#: g10/gpg.c:1289
+#: g10/gpg.c:1291
#, fuzzy, c-format
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/gpg.c:1295
+#: g10/gpg.c:1297
#, fuzzy, c-format
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/gpg.c:1298
+#: g10/gpg.c:1300
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1376,496 +1376,496 @@ msgstr ""
"OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
" zawieraj�cego %s ,,%s''\n"
-#: g10/gpg.c:1301
+#: g10/gpg.c:1303
#, fuzzy, c-format
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/gpg.c:1442
+#: g10/gpg.c:1444
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "nieznana opcja ,,%s''\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "okazanie, w kt�rym zbiorze znajduje si� dany klucz"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "UWAGA: stary domy�lny plik opcji ,,%s'' zosta� zignorowany\n"
-#: g10/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr "plik opcji ,,%s'': %s\n"
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr "odczyt opcji z ,,%s''\n"
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, 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/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
-#: g10/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "niezrozuma�y URI serwera kluczy\n"
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "niepoprawne opcje eksportu kluczy\n"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
msgid "invalid import options\n"
msgstr "niepoprawne opcje wczytania kluczy\n"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
msgid "invalid export options\n"
msgstr "niepoprawne opcje eksportu kluczy\n"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
#, fuzzy
msgid "invalid list options\n"
msgstr "niepoprawne opcje wczytania kluczy\n"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
#, fuzzy
msgid "invalid verify options\n"
msgstr "niepoprawne opcje eksportu kluczy\n"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, 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/gpg.c:2764
+#: g10/gpg.c:2768
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
msgid "WARNING: program may create a core file!\n"
msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
-#: g10/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Nie wolno u�ywa� %s z %s!\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nie ma sensu w po��czeniu z %s!\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2865
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "zapisuj� klucz tajny w '%s'\n"
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
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/gpg.c:2896
+#: g10/gpg.c:2900
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/gpg.c:2902
+#: g10/gpg.c:2906
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/gpg.c:2915
+#: g10/gpg.c:2919
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/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
msgid "selected certification digest algorithm is invalid\n"
msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
msgid "completes-needed must be greater than 0\n"
msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
#, 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/gpg.c:3021
+#: g10/gpg.c:3025
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/gpg.c:3023
+#: g10/gpg.c:3027
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/gpg.c:3026
+#: g10/gpg.c:3030
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
-#: g10/gpg.c:3030
+#: g10/gpg.c:3034
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3041
msgid "invalid default preferences\n"
msgstr "niew�a�ciwe domy�lne ustawienia\n"
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
msgid "invalid personal cipher preferences\n"
msgstr "niew�a�ciwe ustawienia szyfr�w\n"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
msgid "invalid personal digest preferences\n"
msgstr "niew�a�ciwe ustawienia skr�t�w\n"
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
msgid "invalid personal compress preferences\n"
msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s jeszcze nie dzia�a z %s!\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, 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/gpg.c:3139
+#: g10/gpg.c:3143
#, 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/gpg.c:3144
+#: g10/gpg.c:3148
#, 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/gpg.c:3246
+#: g10/gpg.c:3250
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
-#: g10/gpg.c:3257
+#: g10/gpg.c:3261
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/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [plik]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [plik]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "b��d odszyfrowywania: %s\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [plik]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [plik]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, 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/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--sign [plik]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [plik]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [plik]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, 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/gpg.c:3376
+#: g10/gpg.c:3380
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [plik]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [plik]\""
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [plik]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key nazwa u�ytkownika"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key nazwa u�ytkownika"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key nazwa u�ytkownika [polecenia]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
-#: g10/gpg.c:3556
+#: g10/gpg.c:3560
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, c-format
msgid "key export failed: %s\n"
msgstr "eksport kluczy nie powi�d� si�: %s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
-#: g10/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[nazwa pliku]"
-#: g10/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
msgid "the given certification policy URL is invalid\n"
msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
msgid "the given signature policy URL is invalid\n"
msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
-#: g10/gpg.c:4193
+#: g10/gpg.c:4197
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
@@ -1891,7 +1891,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Opcja --allow-non-selfsigned-uid wymusi�a uznanie za poprawny klucza %08lX.\n"
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, fuzzy, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "brak prywatnego odpowiednika podklucza publicznego %08lX - pomini�ty\n"
@@ -2286,430 +2286,430 @@ msgstr "bezu�yteczny klucz prywatny"
msgid "remove as much as possible from key after import"
msgstr ""
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr "blok typu %d zostaje pomini�ty\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu kluczy przetworzonych do tej chwili\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Og�em przetworzonych kluczy: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " pomini�tych nowych kluczy: %lu\n"
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " bez identyfikatora: %lu\n"
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr " do��czono do zbioru: %lu"
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr " bez zmian: %lu\n"
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nowych identyfikator�w: %lu\n"
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nowych podkluczy: %lu\n"
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr " nowych podpis�w: %lu\n"
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nowych uniewa�nie� kluczy: %lu\n"
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr " tajnych kluczy wczytanych: %lu\n"
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " tajnych kluczy dodanych: %lu\n"
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " tajnych kluczy bez zmian: %lu\n"
-#: g10/import.c:321
+#: g10/import.c:322
#, c-format
msgid " not imported: %lu\n"
msgstr " nie w��czono do zbioru: %lu\n"
-#: g10/import.c:323
+#: g10/import.c:324
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " nowych podpis�w: %lu\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " tajnych kluczy wczytanych: %lu\n"
-#: g10/import.c:566
+#: g10/import.c:567
#, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr ""
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
#, fuzzy
msgid " algorithms on these user IDs:\n"
msgstr "Te identyfikatory s� podpisane przez Ciebie:\n"
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
-#: g10/import.c:619
+#: g10/import.c:620
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "podpis %s, skr�t %s\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
-#: g10/import.c:749
+#: g10/import.c:750
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "klucz %08lX: podklucz uszkodzony przez serwer zosta� naprawiony\n"
-#: g10/import.c:764
+#: g10/import.c:765
#, fuzzy, c-format
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:770
+#: g10/import.c:771
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "klucz %08lX: brak poprawnych identyfikator�w u�ytkownika\n"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr "to mo�e by� spowodowane brakiem podpisu klucza nim samym\n"
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "klucz %08lX: brak klucza publicznego: %s\n"
-#: g10/import.c:788
+#: g10/import.c:789
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "klucz %08lX: nowy klucz - pomini�ty\n"
-#: g10/import.c:797
+#: g10/import.c:798
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "brak zapisywalnego zbioru kluczy: %s\n"
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr "zapis do '%s'\n"
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
-#: g10/import.c:825
+#: g10/import.c:826
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "klucz %08lX: klucz publiczny ,,%s'' wczytano do zbioru\n"
-#: g10/import.c:849
+#: g10/import.c:850
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "klucz %08lX: nie zgadza si� z lokaln� kopi�\n"
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "klucz %08lX: nie mo�na odczyta� oryginalnego bloku klucza; %s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "klucz %08lX: ,,%s'' 1 nowy identyfikator u�ytkownika\n"
-#: g10/import.c:914
+#: g10/import.c:915
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
-#: g10/import.c:917
+#: g10/import.c:918
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "klucz %08lX: ,,%s'' 1 nowy podpis\n"
-#: g10/import.c:920
+#: g10/import.c:921
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
-#: g10/import.c:923
+#: g10/import.c:924
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "klucz %08lX: ,,%s'' 1 nowy podklucz\n"
-#: g10/import.c:926
+#: g10/import.c:927
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "klucz %08lX: ,,%s'' %d nowych podkluczy\n"
-#: g10/import.c:929
+#: g10/import.c:930
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
-#: g10/import.c:932
+#: g10/import.c:933
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
-#: g10/import.c:935
+#: g10/import.c:936
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
-#: g10/import.c:938
+#: g10/import.c:939
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
-#: g10/import.c:961
+#: g10/import.c:962
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "klucz %08lX: ,,%s'' bez zmian\n"
-#: g10/import.c:1124
+#: g10/import.c:1125
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "klucz %08lX: klucz tajny z ustawionym szyfrem %d - pomini�ty\n"
-#: g10/import.c:1135
+#: g10/import.c:1136
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "zapisuj� klucz tajny w '%s'\n"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "brak domy�lego zbioru kluczy tajnych: %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n"
-#: g10/import.c:1193
+#: g10/import.c:1194
#, fuzzy, c-format
msgid "key %s: already in secret keyring\n"
msgstr "Klucz %08lX: ten klucz ju� znajduje si� w zbiorze\n"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, fuzzy, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "klucz %08lX: brak klucza tajnego: %s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"klucz %08lX: brak klucza publicznego kt�rego dotyczy wczytany certyfikat\n"
" uniwa�nienia\n"
-#: g10/import.c:1276
+#: g10/import.c:1277
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "klucz %08lX: niepoprawny certyfikat uniewa�nienia: %s - odrzucony\n"
-#: g10/import.c:1308
+#: g10/import.c:1309
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "klucz %08lX: ,,%s'' certyfikat uniewa�nienia zosta� ju� wczytany\n"
-#: g10/import.c:1374
+#: g10/import.c:1375
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "klucz %08lX: brak identyfikatora u�ytkownika do podpisu\n"
-#: g10/import.c:1389
+#: g10/import.c:1390
#, fuzzy, c-format
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:1391
+#: g10/import.c:1392
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "klucz %08lX: niepoprawny podpis na identyfikatorze \"%s\"\n"
-#: g10/import.c:1409
+#: g10/import.c:1410
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "klucz %08lX: brak podklucza do dowi�zania\n"
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "klucz %08lX: nie obs�ugiwany algorytm asymetryczny\n"
-#: g10/import.c:1422
+#: g10/import.c:1423
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "klucz %08lX: niepoprawne dowi�zanie podklucza\n"
-#: g10/import.c:1437
+#: g10/import.c:1438
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "klucz %08lX: usuni�to wielokrotne dowi�zanie podklucza\n"
-#: g10/import.c:1459
+#: g10/import.c:1460
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "klucz %08lX: brak podklucza, kt�rego dotyczy uniewa�nienie\n"
-#: g10/import.c:1472
+#: g10/import.c:1473
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "klucz %08lX: nieoprawne uniewa�nienie podklucza\n"
-#: g10/import.c:1487
+#: g10/import.c:1488
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "klucz %08lX: usuni�to wielokrotne uniewa�nienie podklucza\n"
-#: g10/import.c:1529
+#: g10/import.c:1530
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "klucz %08lX: pomini�to identyfikator u�ytkownika '"
-#: g10/import.c:1550
+#: g10/import.c:1551
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "klucz %08lX: podklucz pomini�ty\n"
-#: g10/import.c:1577
+#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "klucz %08lX: podpis nieeksportowalny (klasy %02x) - pomini�ty\n"
-#: g10/import.c:1587
+#: g10/import.c:1588
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr ""
"klucz %08lX: pomini�to certyfikat uniewa�nienia umieszczony \n"
" w niew�a�ciwym miejscu\n"
-#: g10/import.c:1604
+#: g10/import.c:1605
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "klucz %08lX: pomini�to - niepoprawny certyfikat uniewa�nienia: %s\n"
-#: g10/import.c:1618
+#: g10/import.c:1619
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "klucz %08lX: pomini�to - podpis na podkluczu w niew�a�ciwym miejscu\n"
-#: g10/import.c:1626
+#: g10/import.c:1627
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "klucz %08lX: pomini�to - nieoczekiwana klasa podpisu (%02x)\n"
-#: g10/import.c:1726
+#: g10/import.c:1727
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "key %08lX: do��czono powt�rzony identyfikator u�ytkownika\n"
-#: g10/import.c:1788
+#: g10/import.c:1789
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewazniony:\n"
" zapytanie o uniewa�niaj�cy klucz %08lX w serwerze kluczy\n"
-#: g10/import.c:1802
+#: g10/import.c:1803
#, 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:1861
+#: g10/import.c:1862
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "klucz %08lX: ,,%s'' dodany certyfikat uniewa�nienia\n"
-#: g10/import.c:1895
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "klucz %08lX: dodano bezpo�redni podpis\n"
-#: g10/import.c:2284
+#: g10/import.c:2285
#, fuzzy
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "klucz publiczny nie pasuje do klucza prywatngeo!\n"
-#: g10/import.c:2292
+#: g10/import.c:2293
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
-#: g10/import.c:2294
+#: g10/import.c:2295
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
@@ -3035,8 +3035,8 @@ msgstr ""
msgid "Really sign? (y/N) "
msgstr "Czy na pewno podpisa�? (t/N) "
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
@@ -3570,7 +3570,7 @@ 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Czy dalej chcesz je doda�? (t/N) "
@@ -3612,12 +3612,32 @@ msgstr "Nic nie zosta�o usuni�te.\n"
msgid "invalid"
msgstr "niepoprawny"
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
+
+#: g10/keyedit.c:3252
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3627,199 +3647,199 @@ msgstr ""
" uniewa�niaj�cego, spowoduje, �e niekt�re wersje PGP przestan�\n"
" go rozumie�.\n"
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3357
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:3372
+#: g10/keyedit.c:3377
msgid "Enter the user ID of the designated revoker: "
msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3402
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:3412
+#: g10/keyedit.c:3417
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:3434
+#: g10/keyedit.c:3439
#, 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:3453
+#: g10/keyedit.c:3458
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:3459
+#: g10/keyedit.c:3464
#, fuzzy
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:3520
+#: g10/keyedit.c:3525
msgid "Please remove selections from the secret keys.\n"
msgstr "Prosz� usun�� znacznik wyboru z kluczy prywatnych.\n"
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3531
#, fuzzy
msgid "Please select at most one subkey.\n"
msgstr "Prosz� wybra� tylko jeden podklucz.\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Zmiana daty wa�no�ci podklucza.\n"
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
msgid "Changing expiration time for the primary key.\n"
msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3584
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:3595
+#: g10/keyedit.c:3600
msgid "No corresponding signature in secret ring\n"
msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3673
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "OSTRZE�ENIE: podklucz podpisuj�cy %08lX nie jest skro�nie podpisany\n"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
msgid "Please select exactly one user ID.\n"
msgstr "Prosz� wybra� dok�adnie jeden identyfikator u�ytkownika.\n"
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, 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:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
#, 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:4127
+#: g10/keyedit.c:4132
#, 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:4189
+#: g10/keyedit.c:4194
#, fuzzy
msgid "Enter the notation: "
msgstr "Adnotacje podpisu: "
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Nadpisa� (t/N)? "
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, c-format
msgid "No user ID with index %d\n"
msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4465
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "Identyfikator u�ytkownika: "
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "podpisany przez %08lX w %s%s%s\n"
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr " (podpis nieeksportowalny) "
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Wa�no�� tego klucza wygas�a %s.\n"
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Czy dalej chcesz go uniewa�ni�? (t/N) "
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4644
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N) "
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4671
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Te identyfikatory s� podpisane przez Ciebie:\n"
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
#, fuzzy
msgid " (non-revocable)"
msgstr " (podpis nieeksportowalny) "
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr "uniewa�niony przez %08lX w %s\n"
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
msgid "Really create the revocation certificates? (y/N) "
msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N) "
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr "brak klucza tajnego\n"
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4863
#, 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:4922
+#: g10/keyedit.c:4927
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, 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"
@@ -4449,7 +4469,7 @@ msgstr "wy�kl"
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "niepoprawne opcje eksportu kluczy\n"
@@ -4484,106 +4504,106 @@ msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
msgid "searching for names from %s\n"
msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"podpisano Twoim kluczem %08lX w %s\n"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
#, fuzzy
msgid "no keyserver action!\n"
msgstr "niepoprawne opcje eksportu kluczy\n"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr "brak znanyk serwer�w kluczy (u�yj opcji --keyserver)\n"
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
#, fuzzy
msgid "keyserver timed out\n"
msgstr "b��d serwera kluczy"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
#, fuzzy
msgid "keyserver internal error\n"
msgstr "b��d serwera kluczy"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s: nie jest poprawnym identyfikatorem klucza\n"
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "zapytanie o klucz %08lX w %s\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "zapytanie o klucz %08lX w %s\n"
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
@@ -4991,12 +5011,12 @@ msgstr "Has�o\n"
msgid "cancelled by user\n"
msgstr "anulowano przez u�ytkownika\n"
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
#, fuzzy
msgid "can't query passphrase in batch mode\n"
msgstr "pytanie o has�o nie dzia�a w trybie wsadowym\n"
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "Podaj has�o: "
@@ -5020,7 +5040,7 @@ msgstr "d�ugo�� %u bit�w, typ %s, numer %08lX, stworzony %s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "Powt�rz has�o: "
@@ -6491,18 +6511,6 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
#~ msgstr "nie mo�na wykona� %s ,,%s'': %s\n"
#, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
-
-#, fuzzy
#~ msgid "No user IDs are removable.\n"
#~ msgstr "Brak identyfikatora u�ytkownika dla klucza.\n"
diff --git a/po/pt.po b/po/pt.po
index a4da08485..528bebc7c 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: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\n"
"PO-Revision-Date: 2002-09-13 18:26+0100\n"
"Last-Translator: Pedro Morais <[email protected]>\n"
"Language-Team: pt <[email protected]>\n"
@@ -43,7 +43,7 @@ msgstr "a escrever chave privada para `%s'\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -80,7 +80,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:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, c-format
@@ -307,77 +307,77 @@ msgstr ""
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr "armadura: %s\n"
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr "cabe�alho de armadura inv�lido: "
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr "cabe�alho de armadura: "
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr "cabe�alho de assinatura em texto puro inv�lido\n"
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr "assinaturas em texto puro aninhadas\n"
-#: g10/armor.c:568
+#: g10/armor.c:620
#, fuzzy
msgid "unexpected armor: "
msgstr "armadura inesperada:"
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr "linha com h�fen inv�lida: "
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "caracter radix64 inv�lido %02x ignorado\n"
-#: g10/armor.c:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr "fim de ficheiro prematuro (sem CRC)\n"
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr "fim de ficheiro prematuro (no CRC)\n"
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr "CRC malformado\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "erro de CRC; %06lx - %06lx\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "fim de ficheiro prematuro (no \"Trailer\")\n"
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr "erro na �ltima linha\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "armadura inv�lida: linha maior que %d caracteres\n"
-#: g10/armor.c:1167
+#: g10/armor.c:1219
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -469,7 +469,7 @@ msgstr "a escrever chave p�blica para `%s'\n"
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
@@ -745,7 +745,7 @@ msgstr "Repita a frase secreta: "
msgid "PIN not correctly repeated; try again"
msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -755,13 +755,13 @@ msgstr "imposs�vel abrir `%s'\n"
msgid "--output doesn't work for this command\n"
msgstr "--output n�o funciona para este comando\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "chave `%s' n�o encontrada: %s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %s\n"
@@ -876,23 +876,23 @@ msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrado para: \"%s\"\n"
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr "dados cifrados com %s\n"
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "cifrado com algoritmo desconhecido %d\n"
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"AVISO: A mensagem foi cifrada com uma chave fraca na cifragem sim�trica.\n"
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
msgid "problem handling encrypted packet\n"
msgstr "problema ao tratar pacote cifrado\n"
@@ -1021,7 +1021,7 @@ msgstr ""
msgid "WARNING: nothing exported\n"
msgstr "AVISO: nada exportado\n"
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -1029,128 +1029,128 @@ msgstr ""
"@Comandos:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[ficheiro]|fazer uma assinatura"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "fazer uma assinatura separada"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "cifrar dados"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr "cifrar apenas com cifra sim�trica"
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "decifrar dados (ac��o por omiss�o)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "verificar uma assinatura"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "listar as chaves"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "listar as chaves e as assinaturas"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
#, fuzzy
msgid "list and check key signatures"
msgstr "verificar as assinaturas das chaves"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "listar as chaves e as impress�es digitais"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "listar as chaves secretas"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "gerar um novo par de chaves"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "remove keys from the public keyring"
msgstr "remover chaves do porta-chaves p�blico"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
msgid "remove keys from the secret keyring"
msgstr "remover chaves do porta-chaves secreto"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "assinar uma chave"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "assinar uma chave localmente"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "assinar ou editar uma chave"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr "gerar um certificado de revoga��o"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "exportar chaves"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "exportar chaves para um servidor de chaves"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "importar chaves de um servidor de chaves"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "search for keys on a key server"
msgstr "procurar chaves num servidor de chaves"
-#: g10/gpg.c:411
+#: g10/gpg.c:412
msgid "update all keys from a keyserver"
msgstr "actualizar todas as chaves a partir de um servidor de chaves"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "importar/fundir chaves"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr "actualizar a base de dados de confian�a"
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1160,55 +1160,55 @@ msgstr ""
"Op��es:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr "criar sa�da com armadura ascii"
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|NOME|cifrar para NOME"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
msgid "use this user-id to sign or decrypt"
msgstr ""
"usar este identificador de utilizador para\n"
"assinar ou decifrar"
-#: g10/gpg.c:456
+#: g10/gpg.c:457
msgid "|N|set compress level N (0 disables)"
msgstr ""
"|N|estabelecer n�vel de compress�o N\n"
"(0 desactiva)"
-#: g10/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr "usar modo de texto can�nico"
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "usar como ficheiro de sa�da"
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "detalhado"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "n�o fazer altera��es"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr "perguntar antes de sobrep�r"
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1216,7 +1216,7 @@ msgstr ""
"@\n"
"(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
-#: g10/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1236,15 +1236,15 @@ msgstr ""
" --list-keys [nomes] mostrar chaves\n"
" --fingerprint [nomes] mostrar impress�es digitais\n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Por favor comunique bugs para <[email protected]>.\n"
-#: g10/gpg.c:778
+#: g10/gpg.c:780
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
-#: g10/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1254,7 +1254,7 @@ msgstr ""
"assina, verifica, cifra ou decifra\n"
"a opera��o por omiss�o depende dos dados de entrada\n"
-#: g10/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1262,580 +1262,580 @@ msgstr ""
"\n"
"Algoritmos suportados:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr "Chave p�blica: "
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr "Cifra: "
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr "Dispers�o: "
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
msgid "Compression: "
msgstr "Compress�o: "
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "uso: gpg [op��es] "
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "comandos em conflito\n"
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, fuzzy, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "nenhum sinal = encontrada na defini��o de grupo \"%s\"\n"
-#: g10/gpg.c:1259
+#: g10/gpg.c:1261
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
-#: g10/gpg.c:1277
+#: g10/gpg.c:1279
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
-#: g10/gpg.c:1286
+#: g10/gpg.c:1288
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
-#: g10/gpg.c:1289
+#: g10/gpg.c:1291
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
-#: g10/gpg.c:1295
+#: g10/gpg.c:1297
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
-#: g10/gpg.c:1298
+#: g10/gpg.c:1300
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
-#: g10/gpg.c:1301
+#: g10/gpg.c:1303
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
-#: g10/gpg.c:1442
+#: g10/gpg.c:1444
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "criado um novo ficheiro de configura��o `%s'\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mostrar em que porta-chave a chave est�"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, 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/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr "ficheiro de op��es `%s': %s\n"
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr "a ler op��es de `%s'\n"
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: %s n�o � para uso normal!\n"
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, 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/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
-#: g10/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "n�o consegui processar a URI do servidor de chaves\n"
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "op��es de exporta��o inv�lidas\n"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: op��es de importa��o inv�lidas\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
msgid "invalid import options\n"
msgstr "op��es de importa��o inv�lidas\n"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
msgid "invalid export options\n"
msgstr "op��es de exporta��o inv�lidas\n"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: op��es de importa��o inv�lidas\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
#, fuzzy
msgid "invalid list options\n"
msgstr "op��es de importa��o inv�lidas\n"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
#, fuzzy
msgid "invalid verify options\n"
msgstr "op��es de exporta��o inv�lidas\n"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, 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/gpg.c:2764
+#: g10/gpg.c:2768
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: O programa pode criar um ficheiro core!\n"
-#: g10/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s sobrep�e %s\n"
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n�o � permitido com %s!\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n�o faz sentido com %s!\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2865
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "a escrever chave privada para `%s'\n"
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
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/gpg.c:2896
+#: g10/gpg.c:2900
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/gpg.c:2902
+#: g10/gpg.c:2906
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/gpg.c:2915
+#: g10/gpg.c:2919
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/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
msgid "selected certification digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve ser maior que 0\n"
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve ser maior que 1\n"
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
#, 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/gpg.c:3021
+#: g10/gpg.c:3025
#, 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/gpg.c:3023
+#: g10/gpg.c:3027
#, 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/gpg.c:3026
+#: g10/gpg.c:3030
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
-#: g10/gpg.c:3030
+#: g10/gpg.c:3034
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3041
msgid "invalid default preferences\n"
msgstr "prefer�ncias por omiss�o inv�lidas\n"
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
msgid "invalid personal cipher preferences\n"
msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
msgid "invalid personal digest preferences\n"
msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
msgid "invalid personal compress preferences\n"
msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s n�o faz sentido com %s!\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, fuzzy, c-format
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/gpg.c:3139
+#: g10/gpg.c:3143
#, fuzzy, c-format
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/gpg.c:3144
+#: g10/gpg.c:3148
#, fuzzy, c-format
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/gpg.c:3246
+#: g10/gpg.c:3250
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
-#: g10/gpg.c:3257
+#: g10/gpg.c:3261
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/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [nome_do_ficheiro]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [nome_do_ficheiro]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "decifragem falhou: %s\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [nome_do_ficheiro]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_ficheiro]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, 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/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--sign [nome_do_ficheiro]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_ficheiro]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_ficheiro]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, 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/gpg.c:3376
+#: g10/gpg.c:3380
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nome_do_ficheiro]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [nome_do_ficheiro]"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [nome_do_ficheiro]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key id-utilizador"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key id-utilizador"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-utilizador [comandos]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
-#: g10/gpg.c:3556
+#: g10/gpg.c:3560
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "actualiza��o da chave secreta falhou: %s\n"
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "retirada de armadura falhou: %s\n"
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
-#: g10/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de dispers�o inv�lido `%s'\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[nome_do_ficheiro]"
-#: g10/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr "Digite a sua mensagem ...\n"
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
msgid "the given certification policy URL is invalid\n"
msgstr "a URL de pol�tica de certifica��o dada � inv�lida\n"
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
msgid "the given signature policy URL is invalid\n"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
-#: g10/gpg.c:4193
+#: g10/gpg.c:4197
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
@@ -1860,7 +1860,7 @@ msgstr ""
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "Chave inv�lida %08lX tornada v�lida por --allow-non-selfsigned-uid\n"
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, fuzzy, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
@@ -2261,428 +2261,428 @@ msgstr "chave secreta n�o utiliz�vel"
msgid "remove as much as possible from key after import"
msgstr ""
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr "ignorando bloco do tipo %d\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu chaves processadas at� agora\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr "N�mero total processado: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ignorei novas chaves: %lu\n"
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sem IDs de utilizadores: %lu\n"
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr " importados: %lu"
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr " n�o modificados: %lu\n"
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr " novos IDs de utilizadores: %lu\n"
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr " novas subchaves: %lu\n"
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr " novas assinaturas: %lu\n"
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr " novas revoga��es de chaves: %lu\n"
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr " chaves secretas lidas: %lu\n"
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " chaves secretas importadas: %lu\n"
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " chaves secretas n�o modificadas: %lu\n"
-#: g10/import.c:321
+#: g10/import.c:322
#, c-format
msgid " not imported: %lu\n"
msgstr " n�o importadas: %lu\n"
-#: g10/import.c:323
+#: g10/import.c:324
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " novas assinaturas: %lu\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " chaves secretas lidas: %lu\n"
-#: g10/import.c:566
+#: g10/import.c:567
#, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr ""
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
#, fuzzy
msgid " algorithms on these user IDs:\n"
msgstr "Assinou estes identificadores de utilizadores:\n"
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
-#: g10/import.c:619
+#: g10/import.c:620
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "assinatura %s de: \"%s\"\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "chave %08lX: sem ID de utilizador\n"
-#: g10/import.c:749
+#: g10/import.c:750
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "chave %08lX: subchave HKP corrompida foi reparada\n"
-#: g10/import.c:764
+#: g10/import.c:765
#, fuzzy, c-format
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:770
+#: g10/import.c:771
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "chave %08lX: sem IDs de utilizadores v�lidos\n"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr "isto pode ser causado por falta de auto-assinatura\n"
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
-#: g10/import.c:788
+#: g10/import.c:789
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "chave %08lX: chave nova - ignorada\n"
-#: g10/import.c:797
+#: g10/import.c:798
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr "a escrever para `%s'\n"
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "erro na escrita do porta-chaves `%s': %s\n"
-#: g10/import.c:825
+#: g10/import.c:826
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
-#: g10/import.c:849
+#: g10/import.c:850
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "chave %8lX: \"%s\" 1 novo ID de utilizador\n"
-#: g10/import.c:914
+#: g10/import.c:915
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
-#: g10/import.c:917
+#: g10/import.c:918
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "chave %08lX: \"%s\" 1 nova assinatura\n"
-#: g10/import.c:920
+#: g10/import.c:921
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
-#: g10/import.c:923
+#: g10/import.c:924
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "chave %08lX: \"%s\" 1 nova subchave\n"
-#: g10/import.c:926
+#: g10/import.c:927
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "chave %08lX: \"%s\" %d novas subchaves\n"
-#: g10/import.c:929
+#: g10/import.c:930
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
-#: g10/import.c:932
+#: g10/import.c:933
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
-#: g10/import.c:935
+#: g10/import.c:936
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
-#: g10/import.c:938
+#: g10/import.c:939
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
-#: g10/import.c:961
+#: g10/import.c:962
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "chave %08lX: \"%s\" n�o modificada\n"
-#: g10/import.c:1124
+#: g10/import.c:1125
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "chave %08lX: chave secreta com cifra inv�lida %d - ignorada\n"
-#: g10/import.c:1135
+#: g10/import.c:1136
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "a escrever chave privada para `%s'\n"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "sem porta-chaves p�blico por omiss�o: %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "chave %08lX: chave secreta importada\n"
-#: g10/import.c:1193
+#: g10/import.c:1194
#, fuzzy, c-format
msgid "key %s: already in secret keyring\n"
msgstr "chave %08lX: j� est� no porta-chaves secreto\n"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, fuzzy, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
"de revoga��o\n"
-#: g10/import.c:1276
+#: g10/import.c:1277
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
-#: g10/import.c:1308
+#: g10/import.c:1309
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "chave %08lX: \"%s\" certificado de revoga��o importado\n"
-#: g10/import.c:1374
+#: g10/import.c:1375
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n"
-#: g10/import.c:1389
+#: g10/import.c:1390
#, fuzzy, c-format
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:1391
+#: g10/import.c:1392
#, fuzzy, c-format
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:1409
+#: g10/import.c:1410
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
-#: g10/import.c:1422
+#: g10/import.c:1423
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "chave %08lX: liga��o de subchave inv�lida\n"
-#: g10/import.c:1437
+#: g10/import.c:1438
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "chave %08lX: apagada liga��o m�ltipla de subchave \n"
-#: g10/import.c:1459
+#: g10/import.c:1460
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "chave %08lX: sem subchave para revoca��o de chave\n"
-#: g10/import.c:1472
+#: g10/import.c:1473
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "chave %08lX: revoca��o de subchave inv�lida\n"
-#: g10/import.c:1487
+#: g10/import.c:1488
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "chave %08lX: removida revoga��o m�ltiplace de subchaves\n"
-#: g10/import.c:1529
+#: g10/import.c:1530
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "chave %08lX: ignorado ID de utilizador '"
-#: g10/import.c:1550
+#: g10/import.c:1551
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "chave %08lX: subchave ignorada\n"
-#: g10/import.c:1577
+#: g10/import.c:1578
#, fuzzy, c-format
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:1587
+#: g10/import.c:1588
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "chave %08lX: certificado de revoga��o no local errado - ignorado\n"
-#: g10/import.c:1604
+#: g10/import.c:1605
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorado\n"
-#: g10/import.c:1618
+#: g10/import.c:1619
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
-#: g10/import.c:1626
+#: g10/import.c:1627
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "chave %08lX: classe de assinatura inesperada (%02x) - ignorada\n"
-#: g10/import.c:1726
+#: g10/import.c:1727
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
-#: g10/import.c:1788
+#: g10/import.c:1789
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"AVISO: a chave %08lX pode estar revocada: a transferir a chave de revoca��o %"
"08lX\n"
-#: g10/import.c:1802
+#: g10/import.c:1803
#, 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:1861
+#: g10/import.c:1862
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
-#: g10/import.c:1895
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chave %08lX: assinatura directa de chave adicionada\n"
-#: g10/import.c:2284
+#: g10/import.c:2285
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr ""
-#: g10/import.c:2292
+#: g10/import.c:2293
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "ignorado: a chave secreta j� est� presente\n"
-#: g10/import.c:2294
+#: g10/import.c:2295
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "ignorado: a chave secreta j� est� presente\n"
@@ -3008,8 +3008,8 @@ msgstr ""
msgid "Really sign? (y/N) "
msgstr "Realmente assinar? "
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "assinatura falhou: %s\n"
@@ -3540,7 +3540,7 @@ 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
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) "
@@ -3584,12 +3584,32 @@ msgstr "Nada removido.\n"
msgid "invalid"
msgstr "armadura inv�lida"
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "Utilizador \"%s\" est� revocado."
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "Utilizador \"%s\" est� revocado."
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "Utilizador \"%s\" est� revocado."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
+
+#: g10/keyedit.c:3252
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3598,198 +3618,198 @@ 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:3352
+#: g10/keyedit.c:3357
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:3372
+#: g10/keyedit.c:3377
msgid "Enter the user ID of the designated revoker: "
msgstr "Insira o ID de utilizador do revogador escolhido: "
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3402
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:3412
+#: g10/keyedit.c:3417
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:3434
+#: g10/keyedit.c:3439
#, 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:3453
+#: g10/keyedit.c:3458
#, 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:3459
+#: g10/keyedit.c:3464
#, 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:3520
+#: g10/keyedit.c:3525
msgid "Please remove selections from the secret keys.\n"
msgstr "Por favor remova as selec��es das chaves secretas.\n"
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3531
#, fuzzy
msgid "Please select at most one subkey.\n"
msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "A modificar a data de validade para uma chave secund�ria.\n"
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
msgid "Changing expiration time for the primary key.\n"
msgstr "Modificar a data de validade para uma chave prim�ria.\n"
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3584
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:3595
+#: g10/keyedit.c:3600
msgid "No corresponding signature in secret ring\n"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3673
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
msgid "Please select exactly one user ID.\n"
msgstr "Seleccione exactamente um identificador de utilizador.\n"
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, 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:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
#, 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:4127
+#: g10/keyedit.c:4132
#, 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:4189
+#: g10/keyedit.c:4194
#, fuzzy
msgid "Enter the notation: "
msgstr "Nota��o de assinatura: "
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Escrever por cima (s/N)? "
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nenhum ID de utilizador com �ndice %d\n"
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4465
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Nenhum ID de utilizador com �ndice %d\n"
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Nenhum ID de utilizador com �ndice %d\n"
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID de utilizador: \""
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " assinado por %08lX em %s%s%s\n"
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr " (n�o-export�vel)"
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Esta assinatura expirou em %s.\n"
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
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:4639
+#: g10/keyedit.c:4644
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:4666
+#: g10/keyedit.c:4671
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Assinou estes identificadores de utilizadores:\n"
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
#, fuzzy
msgid " (non-revocable)"
msgstr " (n�o-export�vel)"
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revogado por %08lX em %s\n"
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr "Est� prestes a revogar estas assinaturas:\n"
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
msgid "Really create the revocation certificates? (y/N) "
msgstr "Realmente criar os certificados de revoga��o? (s/N) "
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr "nenhuma chave secreta\n"
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4863
#, 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:4922
+#: g10/keyedit.c:4927
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@ -4415,7 +4435,7 @@ msgstr "disable"
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "op��es de exporta��o inv�lidas\n"
@@ -4450,106 +4470,106 @@ msgstr "a procurar por \"%s\" no servidor HKP %s\n"
msgid "searching for names from %s\n"
msgstr "a procurar por \"%s\" no servidor HKP %s\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "a procurar por \"%s\" no servidor HKP %s\n"
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"assinado com a sua chave %08lX em %s\n"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "a procurar por \"%s\" no servidor HKP %s\n"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "a procurar por \"%s\" no servidor HKP %s\n"
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
#, fuzzy
msgid "no keyserver action!\n"
msgstr "op��es de exporta��o inv�lidas\n"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
#, fuzzy
msgid "keyserver timed out\n"
msgstr "erro do servidor de chaves"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
#, fuzzy
msgid "keyserver internal error\n"
msgstr "erro do servidor de chaves"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "a pedir a chave %08lX de %s\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "a pedir a chave %08lX de %s\n"
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
@@ -4963,12 +4983,12 @@ msgstr "Insira a frase secreta\n"
msgid "cancelled by user\n"
msgstr "cancelado pelo utilizador\n"
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
#, fuzzy
msgid "can't query passphrase in batch mode\n"
msgstr "imposs�vel pedir senha em modo n�o-interactivo\n"
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "Digite a frase secreta: "
@@ -4992,7 +5012,7 @@ msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "Repita a frase secreta: "
@@ -6453,18 +6473,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
#~ msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
#, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "Utilizador \"%s\" est� revocado."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "Utilizador \"%s\" est� revocado."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "Utilizador \"%s\" est� revocado."
-
-#, fuzzy
#~ msgid "No user IDs are removable.\n"
#~ msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9c3e7dc10..6a605532f 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: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\n"
"PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
"Last-Translator:\n"
"Language-Team: ?\n"
@@ -47,7 +47,7 @@ msgstr "escrevendo certificado privado para `%s'\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -84,7 +84,7 @@ msgstr "imposs�vel abrir `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr ""
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, fuzzy, c-format
@@ -312,77 +312,77 @@ msgstr ""
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr "armadura: %s\n"
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr "cabe�alho de armadura inv�lido: "
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr "cabe�alho de armadura: "
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr "cabe�alho de assinatura em texto puro inv�lido\n"
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr "assinaturas em texto puro aninhadas\n"
-#: g10/armor.c:568
+#: g10/armor.c:620
#, fuzzy
msgid "unexpected armor: "
msgstr "armadura inesperada:"
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr "linha com h�fen inv�lida: "
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "caractere radix64 inv�lido %02x ignorado\n"
-#: g10/armor.c:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr "fim de arquivo prematuro (sem CRC)\n"
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr "fim de arquivo prematuro (no CRC)\n"
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr "CRC malformado\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "erro de CRC; %06lx - %06lx\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "fim de arquivo prematuro (no \"Trailer\")\n"
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr "erro na linha \"trailer\"\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "armadura inv�lida: linha maior que %d caracteres\n"
-#: g10/armor.c:1167
+#: g10/armor.c:1219
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -473,7 +473,7 @@ msgstr "escrevendo certificado p�blico para `%s'\n"
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
@@ -755,7 +755,7 @@ msgstr "Repita a frase secreta: "
msgid "PIN not correctly repeated; try again"
msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -765,13 +765,13 @@ msgstr "imposs�vel abrir `%s'\n"
msgid "--output doesn't work for this command\n"
msgstr ""
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "usu�rio `%s' n�o encontrado: %s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, fuzzy, c-format
msgid "error reading keyblock: %s\n"
@@ -881,24 +881,24 @@ msgstr ""
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s criptografado para: %s\n"
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr "dados criptografados com %s\n"
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "criptografado com algoritmo desconhecido %d\n"
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"AVISO: A mensagem foi criptografada com uma chave fraca na criptografia\n"
"sim�trica.\n"
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
#, fuzzy
msgid "problem handling encrypted packet\n"
msgstr "eliminar o campo keyid dos pacotes criptografados\n"
@@ -1027,7 +1027,7 @@ msgstr ""
msgid "WARNING: nothing exported\n"
msgstr "AVISO: nada exportado\n"
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -1035,134 +1035,134 @@ msgstr ""
"@Comandos:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[arquivo]|fazer uma assinatura"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[arquivo]|fazer uma assinatura em texto puro"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "fazer uma assinatura separada"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "criptografar dados"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr ""
"criptografar apenas com criptografia\n"
"sim�trica"
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "descriptografar dados (padr�o)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "verificar uma assinatura"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "listar as chaves"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "listar as chaves e as assinaturas"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
#, fuzzy
msgid "list and check key signatures"
msgstr "verificar as assinaturas das chaves"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "listar as chaves e as impress�es digitais"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "listar as chaves secretas"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "gerar um novo par de chaves"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
#, fuzzy
msgid "remove keys from the public keyring"
msgstr "remover a chave do chaveiro p�blico"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
#, fuzzy
msgid "remove keys from the secret keyring"
msgstr "remover a chave do chaveiro secreto"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "assinar uma chave"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "assinar uma chave localmente"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "assinar ou editar uma chave"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr "gerar um certificado de revoga��o"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "exportar chaves"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "exportar chaves para um servidor"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "importar chaves de um servidor"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
#, fuzzy
msgid "search for keys on a key server"
msgstr "exportar chaves para um servidor"
-#: g10/gpg.c:411
+#: g10/gpg.c:412
#, fuzzy
msgid "update all keys from a keyserver"
msgstr "importar chaves de um servidor"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "importar/fundir chaves"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr "atualizar o banco de dados de confiabilidade"
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1172,61 +1172,61 @@ msgstr ""
"Op��es:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr "criar sa�da com armadura ascii"
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|NOME|criptografar para NOME"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
msgid "use this user-id to sign or decrypt"
msgstr ""
"usar este identificador de usu�rio para\n"
"assinar ou descriptografar"
-#: g10/gpg.c:456
+#: g10/gpg.c:457
msgid "|N|set compress level N (0 disables)"
msgstr ""
"|N|estabelecer n�vel de compress�o N\n"
"(0 desabilita)"
-#: g10/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr "usar modo de texto can�nico"
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "usar como arquivo de sa�da"
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "detalhado"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "n�o fazer altera��es"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr ""
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-#: g10/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1246,15 +1246,15 @@ msgstr ""
" --list-keys [nomes] mostrar chaves\n"
" --fingerprint [nomes] mostrar impress�es digitais\n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Por favor comunique bugs para <[email protected]>.\n"
-#: g10/gpg.c:778
+#: g10/gpg.c:780
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
-#: g10/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1264,7 +1264,7 @@ msgstr ""
"assina, verifica, criptografa ou descriptografa\n"
"a opera��o padr�o depende dos dados de entrada\n"
-#: g10/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1272,588 +1272,588 @@ msgstr ""
"\n"
"Algoritmos suportados:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr ""
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr ""
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr ""
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
#, fuzzy
msgid "Compression: "
msgstr "Coment�rio: "
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "uso: gpg [op��es] "
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "comandos conflitantes\n"
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr ""
-#: g10/gpg.c:1259
+#: g10/gpg.c:1261
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/gpg.c:1277
+#: g10/gpg.c:1279
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/gpg.c:1286
+#: g10/gpg.c:1288
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/gpg.c:1289
+#: g10/gpg.c:1291
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/gpg.c:1295
+#: g10/gpg.c:1297
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/gpg.c:1298
+#: g10/gpg.c:1300
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/gpg.c:1301
+#: g10/gpg.c:1303
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/gpg.c:1442
+#: g10/gpg.c:1444
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "a URL de pol�tica dada � inv�lida\n"
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "alterna entre listagem de chave secreta e p�blica"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, fuzzy, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
-#: g10/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr "arquivo de op��es `%s': %s\n"
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr "lendo op��es de `%s'\n"
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: %s n�o � para uso normal!\n"
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, c-format
msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr ""
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
-#: g10/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "imposs�vel escrever para o chaveiro: %s\n"
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "AVISO: `%s' � um arquivo vazio\n"
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "chaveiro inv�lido"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, fuzzy, c-format
msgid "%s:%d: invalid import options\n"
msgstr "AVISO: `%s' � um arquivo vazio\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
#, fuzzy
msgid "invalid import options\n"
msgstr "armadura inv�lida"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, fuzzy, c-format
msgid "%s:%d: invalid export options\n"
msgstr "AVISO: `%s' � um arquivo vazio\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
#, fuzzy
msgid "invalid export options\n"
msgstr "chaveiro inv�lido"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "AVISO: `%s' � um arquivo vazio\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
#, fuzzy
msgid "invalid list options\n"
msgstr "armadura inv�lida"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "a URL de pol�tica dada � inv�lida\n"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "AVISO: `%s' � um arquivo vazio\n"
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
#, fuzzy
msgid "invalid verify options\n"
msgstr "chaveiro inv�lido"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr ""
-#: g10/gpg.c:2764
+#: g10/gpg.c:2768
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "AVISO: `%s' � um arquivo vazio\n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: O programa pode criar um arquivo core!\n"
-#: g10/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr ""
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n�o � permitido com %s!\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n�o faz sentido com %s!\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2865
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "chave RSA n�o pode ser usada nesta vers�o\n"
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "escrevendo certificado privado para `%s'\n"
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
-#: g10/gpg.c:2896
+#: g10/gpg.c:2900
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
-#: g10/gpg.c:2902
+#: g10/gpg.c:2906
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
-#: g10/gpg.c:2915
+#: g10/gpg.c:2919
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
-#: g10/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
#, fuzzy
msgid "selected certification digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve ser maior que 0\n"
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve ser maior que 1\n"
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
#, 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/gpg.c:3021
+#: g10/gpg.c:3025
#, 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/gpg.c:3023
+#: g10/gpg.c:3027
#, 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/gpg.c:3026
+#: g10/gpg.c:3030
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
-#: g10/gpg.c:3030
+#: g10/gpg.c:3034
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3041
#, fuzzy
msgid "invalid default preferences\n"
msgstr "lista prefer�ncias"
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
#, fuzzy
msgid "invalid personal cipher preferences\n"
msgstr "lista prefer�ncias"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
#, fuzzy
msgid "invalid personal digest preferences\n"
msgstr "lista prefer�ncias"
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
#, fuzzy
msgid "invalid personal compress preferences\n"
msgstr "lista prefer�ncias"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s n�o faz sentido com %s!\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr ""
-#: g10/gpg.c:3139
+#: g10/gpg.c:3143
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr ""
-#: g10/gpg.c:3144
+#: g10/gpg.c:3148
#, 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/gpg.c:3246
+#: g10/gpg.c:3250
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
-#: g10/gpg.c:3257
+#: g10/gpg.c:3261
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
-#: g10/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [nome_do_arquivo]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [nome_do_arquivo]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "descriptografia falhou: %s\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [nome_do_arquivo]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_arquivo]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr ""
-#: g10/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--sign [nome_do_arquivo]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_arquivo]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_arquivo]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
-#: g10/gpg.c:3376
+#: g10/gpg.c:3380
#, fuzzy
msgid "--sign --symmetric [filename]"
msgstr "--symmetric [nome_do_arquivo]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [nome_do_arquivo]"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [nome_do_arquivo]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key id-usu�rio"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key id-usu�rio"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-usu�rio [comandos]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
-#: g10/gpg.c:3556
+#: g10/gpg.c:3560
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "enumera��o de chaves secretas falhou: %s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "get_dir_record: search_record falhou: %s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "enumera��o de chaves secretas falhou: %s\n"
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "retirada de armadura falhou: %s\n"
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, 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/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de hash inv�lido `%s'\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[nome_do_arquivo]"
-#: g10/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr "V� em frente e digite sua mensagem ...\n"
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
#, fuzzy
msgid "the given certification policy URL is invalid\n"
msgstr "a URL de pol�tica dada � inv�lida\n"
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
#, fuzzy
msgid "the given signature policy URL is invalid\n"
msgstr "a URL de pol�tica dada � inv�lida\n"
-#: g10/gpg.c:4193
+#: g10/gpg.c:4197
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "a URL de pol�tica dada � inv�lida\n"
@@ -1878,7 +1878,7 @@ msgstr ""
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, fuzzy, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "h� uma chave secreta para esta chave p�blica!\n"
@@ -2225,424 +2225,424 @@ msgstr "chave secreta incorreta"
msgid "remove as much as possible from key after import"
msgstr ""
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr "ignorando bloco do tipo %d\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu chaves processadas at� agora\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr "N�mero total processado: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, fuzzy, c-format
msgid " skipped new keys: %lu\n"
msgstr " novas subchaves: %lu\n"
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sem IDs de usu�rios: %lu\n"
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr " importados: %lu"
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr " n�o modificados: %lu\n"
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr " novos IDs de usu�rios: %lu\n"
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr " novas subchaves: %lu\n"
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr " novas assinaturas: %lu\n"
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr " novas revoga��es de chaves: %lu\n"
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr " chaves secretas lidas: %lu\n"
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " chaves secretas importadas: %lu\n"
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " chaves secretas n�o modificadas: %lu\n"
-#: g10/import.c:321
+#: g10/import.c:322
#, fuzzy, c-format
msgid " not imported: %lu\n"
msgstr " importados: %lu"
-#: g10/import.c:323
+#: g10/import.c:324
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " novas assinaturas: %lu\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " chaves secretas lidas: %lu\n"
-#: g10/import.c:566
+#: g10/import.c:567
#, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr ""
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
#, fuzzy
msgid " algorithms on these user IDs:\n"
msgstr "Voc� assinou estes IDs de usu�rio:\n"
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
-#: g10/import.c:619
+#: g10/import.c:620
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "assinatura %s de: %s\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "chave %08lX: sem ID de usu�rio\n"
-#: g10/import.c:749
+#: g10/import.c:750
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
-#: g10/import.c:764
+#: g10/import.c:765
#, fuzzy, c-format
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:770
+#: g10/import.c:771
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "chave %08lX: sem IDs de usu�rios v�lidos\n"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr "isto pode ser causado por falta de auto-assinatura\n"
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
-#: g10/import.c:788
+#: g10/import.c:789
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
-#: g10/import.c:797
+#: g10/import.c:798
#, fuzzy, c-format
msgid "no writable keyring found: %s\n"
msgstr "imposs�vel escrever chaveiro: %s\n"
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr "escrevendo para `%s'\n"
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "erro na escrita do chaveiro `%s': %s\n"
-#: g10/import.c:825
+#: g10/import.c:826
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "chave %08lX: chave p�blica importada\n"
-#: g10/import.c:849
+#: g10/import.c:850
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "chave %8lX: 1 novo ID de usu�rio\n"
-#: g10/import.c:914
+#: g10/import.c:915
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "chave %08lX: %d novos IDs de usu�rios\n"
-#: g10/import.c:917
+#: g10/import.c:918
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "chave %08lX: 1 nova assinatura\n"
-#: g10/import.c:920
+#: g10/import.c:921
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "chave %08lX: %d novas assinaturas\n"
-#: g10/import.c:923
+#: g10/import.c:924
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "chave %08lX: 1 nova subchave\n"
-#: g10/import.c:926
+#: g10/import.c:927
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "chave %08lX: %d novas subchaves\n"
-#: g10/import.c:929
+#: g10/import.c:930
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "chave %08lX: %d novas assinaturas\n"
-#: g10/import.c:932
+#: g10/import.c:933
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "chave %08lX: %d novas assinaturas\n"
-#: g10/import.c:935
+#: g10/import.c:936
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "chave %08lX: %d novos IDs de usu�rios\n"
-#: g10/import.c:938
+#: g10/import.c:939
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "chave %08lX: %d novos IDs de usu�rios\n"
-#: g10/import.c:961
+#: g10/import.c:962
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "chave %08lX: n�o modificada\n"
-#: g10/import.c:1124
+#: g10/import.c:1125
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
-#: g10/import.c:1135
+#: g10/import.c:1136
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "escrevendo certificado privado para `%s'\n"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, fuzzy, c-format
msgid "no default secret keyring: %s\n"
msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "chave %08lX: chave secreta importada\n"
-#: g10/import.c:1193
+#: g10/import.c:1194
#, fuzzy, c-format
msgid "key %s: already in secret keyring\n"
msgstr "chave %08lX: j� est� no chaveiro secreto\n"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, fuzzy, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
"de revoga��o\n"
-#: g10/import.c:1276
+#: g10/import.c:1277
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
-#: g10/import.c:1308
+#: g10/import.c:1309
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "chave %08lX: certificado de revoga��o importado\n"
-#: g10/import.c:1374
+#: g10/import.c:1375
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "chave %08lX: nenhum ID de usu�rio para assinatura\n"
-#: g10/import.c:1389
+#: g10/import.c:1390
#, fuzzy, c-format
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:1391
+#: g10/import.c:1392
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "chave %08lX: auto-assinatura inv�lida\n"
-#: g10/import.c:1409
+#: g10/import.c:1410
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
-#: g10/import.c:1422
+#: g10/import.c:1423
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "chave %08lX: liga��o de subchave inv�lida\n"
-#: g10/import.c:1437
+#: g10/import.c:1438
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "chave %08lX: liga��o de subchave inv�lida\n"
-#: g10/import.c:1459
+#: g10/import.c:1460
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
-#: g10/import.c:1472
+#: g10/import.c:1473
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "chave %08lX.%lu: Revoga��o de subchave v�lida\n"
-#: g10/import.c:1487
+#: g10/import.c:1488
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "chave %08lX: liga��o de subchave inv�lida\n"
-#: g10/import.c:1529
+#: g10/import.c:1530
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "chave %08lX: ignorado ID de usu�rio '"
-#: g10/import.c:1550
+#: g10/import.c:1551
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "chave %08lX: subchave ignorada\n"
-#: g10/import.c:1577
+#: g10/import.c:1578
#, fuzzy, c-format
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:1587
+#: g10/import.c:1588
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
-#: g10/import.c:1604
+#: g10/import.c:1605
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorada\n"
-#: g10/import.c:1618
+#: g10/import.c:1619
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
-#: g10/import.c:1626
+#: g10/import.c:1627
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
-#: g10/import.c:1726
+#: g10/import.c:1727
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "chave %08lX: detectado ID de usu�rio duplicado - unido\n"
-#: g10/import.c:1788
+#: g10/import.c:1789
#, fuzzy, c-format
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:1802
+#: g10/import.c:1803
#, 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:1861
+#: g10/import.c:1862
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chave %08lX: certificado de revoga��o adicionado\n"
-#: g10/import.c:1895
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chave %08lX: %d novas assinaturas\n"
-#: g10/import.c:2284
+#: g10/import.c:2285
#, fuzzy
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "lid %lu n�o tem chave\n"
-#: g10/import.c:2292
+#: g10/import.c:2293
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "ignorado: a chave secreta j� est� presente\n"
-#: g10/import.c:2294
+#: g10/import.c:2295
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "ignorado: a chave secreta j� est� presente\n"
@@ -2954,8 +2954,8 @@ msgstr ""
msgid "Really sign? (y/N) "
msgstr "Realmente assinar? "
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "assinatura falhou: %s\n"
@@ -3482,7 +3482,7 @@ msgid ""
" of PGP to reject this key.\n"
msgstr ""
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
#, fuzzy
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Voc� tem certeza de que quer este tamanho de chave? "
@@ -3526,213 +3526,233 @@ msgstr "Nada removido.\n"
msgid "invalid"
msgstr "armadura inv�lida"
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "A chave � protegida.\n"
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "A chave � protegida.\n"
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "A chave � protegida.\n"
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "A chave � protegida.\n"
+
+#: g10/keyedit.c:3252
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "A chave � protegida.\n"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
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:3352
+#: g10/keyedit.c:3357
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
-#: g10/keyedit.c:3372
+#: g10/keyedit.c:3377
#, fuzzy
msgid "Enter the user ID of the designated revoker: "
msgstr "Digite o tamanho da chave"
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3402
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3417
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
-#: g10/keyedit.c:3434
+#: g10/keyedit.c:3439
#, 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:3453
+#: g10/keyedit.c:3458
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
-#: g10/keyedit.c:3459
+#: g10/keyedit.c:3464
#, 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:3520
+#: g10/keyedit.c:3525
msgid "Please remove selections from the secret keys.\n"
msgstr "Por favor remova as sele��es das chaves secretas.\n"
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3531
#, fuzzy
msgid "Please select at most one subkey.\n"
msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Modificando a data de validade para uma chave secund�ria.\n"
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
msgid "Changing expiration time for the primary key.\n"
msgstr "Modificando a data de validade para uma chave prim�ria.\n"
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3584
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:3595
+#: g10/keyedit.c:3600
msgid "No corresponding signature in secret ring\n"
msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3673
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "A chave � protegida.\n"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
#, fuzzy
msgid "Please select exactly one user ID.\n"
msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "chave %08lX: auto-assinatura inv�lida\n"
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
#, 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:4127
+#: g10/keyedit.c:4132
#, 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:4189
+#: g10/keyedit.c:4194
#, fuzzy
msgid "Enter the notation: "
msgstr "Nota��o: "
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Sobrescrever (s/N)? "
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nenhum ID de usu�rio com �ndice %d\n"
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4465
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Nenhum ID de usu�rio com �ndice %d\n"
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Nenhum ID de usu�rio com �ndice %d\n"
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID de usu�rio: \""
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " assinado por %08lX em %s\n"
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr ""
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, fuzzy, c-format
msgid "This signature expired on %s.\n"
msgstr "Esta chave n�o � protegida.\n"
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
#, 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:4639
+#: g10/keyedit.c:4644
#, 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:4666
+#: g10/keyedit.c:4671
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Voc� assinou estes IDs de usu�rio:\n"
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
#, fuzzy
msgid " (non-revocable)"
msgstr "assinar uma chave localmente"
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revogado por %08lX em %s\n"
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
#, fuzzy
msgid "Really create the revocation certificates? (y/N) "
msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr "nenhuma chave secreta\n"
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, fuzzy, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "A chave � protegida.\n"
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4863
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
-#: g10/keyedit.c:4922
+#: g10/keyedit.c:4927
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "A chave � protegida.\n"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "A chave � protegida.\n"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@ -4369,7 +4389,7 @@ msgstr "disable"
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "chaveiro inv�lido"
@@ -4404,106 +4424,106 @@ msgstr "exportar chaves para um servidor"
msgid "searching for names from %s\n"
msgstr "lendo op��es de `%s'\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr ""
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"assinado com sua chave %08lX em %s\n"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "exportar chaves para um servidor"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "lendo op��es de `%s'\n"
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
#, fuzzy
msgid "no keyserver action!\n"
msgstr "chaveiro inv�lido"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
#, fuzzy
msgid "keyserver timed out\n"
msgstr "erro geral"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
#, fuzzy
msgid "keyserver internal error\n"
msgstr "erro geral"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "enumera��o de chaves secretas falhou: %s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s n�o � um mapa de caracteres v�lido\n"
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "imposs�vel escrever para o chaveiro: %s\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "imposs�vel escrever para o chaveiro: %s\n"
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "%s: novo arquivo de op��es criado\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "%s: novo arquivo de op��es criado\n"
@@ -4916,12 +4936,12 @@ msgstr "Digite a frase secreta: "
msgid "cancelled by user\n"
msgstr ""
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
#, fuzzy
msgid "can't query passphrase in batch mode\n"
msgstr "imposs�vel pedir senha em modo n�o-interativo\n"
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "Digite a frase secreta: "
@@ -4945,7 +4965,7 @@ msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "Repita a frase secreta: "
@@ -6396,18 +6416,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
#~ msgstr "imposs�vel abrir %s: %s\n"
#, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "A chave � protegida.\n"
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "A chave � protegida.\n"
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "A chave � protegida.\n"
-
-#, fuzzy
#~ msgid "No user IDs are removable.\n"
#~ msgstr "Nenhum identificador de usu�rio para chave\n"
diff --git a/po/ro.po b/po/ro.po
index f548ddfa5..ba2e2cce4 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.2rc1\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\n"
"PO-Revision-Date: 2005-05-31 22:00-0500\n"
"Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
"Language-Team: Romanian <[email protected]>\n"
@@ -44,7 +44,7 @@ msgstr "scriu cheia secret� �n `%s'\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -82,7 +82,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:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, c-format
@@ -310,75 +310,75 @@ msgstr ""
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr "armur�: %s\n"
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr "header armur� invalid: "
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr "header armur�: "
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr "header clearsig invalid\n"
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr "semn�turi text �n clar �ncuib�rite\n"
-#: g10/armor.c:568
+#: g10/armor.c:620
msgid "unexpected armor: "
msgstr "armur� nea�teptat�: "
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr "linie cu liniu�� escape invalid�: "
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "caracter radix64 invalid %02X s�rit\n"
-#: g10/armor.c:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr "eof prematur (nici un CRC)\n"
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr "eof prematur (�n CRC)\n"
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr "CRC anormal\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "eroare CRC; %06lX - %06lX\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
msgid "premature eof (in trailer)\n"
msgstr "eof prematur (�n trailer)\n"
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr "eroare linia de trailer\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr "nici o dat� OpenPGP valid� g�sit�.\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "armur� invalid�: linie mai lung� de %d caractere\n"
-#: g10/armor.c:1167
+#: g10/armor.c:1219
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -464,7 +464,7 @@ msgstr "URL pentru a aduce cheia public�: "
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Eroare: URL prea lung (limita este de %d caractere).\n"
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr "eroare la citire `%s': %s\n"
@@ -722,7 +722,7 @@ msgstr "Repeta�i acest PIN: "
msgid "PIN not correctly repeated; try again"
msgstr "PIN-ul nu a fost repetat corect; mai �ncerca�i o dat�"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -732,13 +732,13 @@ msgstr "nu pot deschide `%s'\n"
msgid "--output doesn't work for this command\n"
msgstr "--output nu merge pentru aceast� comand�\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "cheia \"%s\" nu a fost g�sit�: %s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %s\n"
@@ -852,23 +852,23 @@ msgstr "nu pute�i folosi %s c�t� vreme �n modul %s\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrat pentru: \"%s\"\n"
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr "%s date cifrate\n"
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "cifrat cu un algoritm necunoscut %d\n"
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"AVERTISMENT: mesajul a fost cifrat cu o cheie slab� din cifrul simetric.\n"
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
msgid "problem handling encrypted packet\n"
msgstr "problem� cu m�nuirea pachetului cifrat\n"
@@ -997,7 +997,7 @@ msgstr "AVERTISMENT: cheia secret� %s nu are un checksum SK simplu\n"
msgid "WARNING: nothing exported\n"
msgstr "AVERTISMENT: nimic exportat\n"
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -1005,127 +1005,127 @@ msgstr ""
"@Comenzi:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[fi�ier]|creaz� o semn�tur�"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "creaz� o semn�tur� deta�at�"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "cifreaz� datele"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr "cifreaz� numai cu cifru simetric"
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "decripteaz� datele (implicit)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "verific� o semn�tur�"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "enumer� chei"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "enumer� chei �i semn�turi"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "list and check key signatures"
msgstr "enumer� �i verific� semn�turile cheii"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "enumer� chei �i amprente"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "enumer� chei secrete"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "genereaz� o nou� perechi de chei"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "remove keys from the public keyring"
msgstr "�terge chei de pe inelul de chei public"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
msgid "remove keys from the secret keyring"
msgstr "�terge chei de pe inelul de chei secret"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "semneaz� o cheie"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "semneaz� o cheie local"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "semneaz� sau editeaz� o cheie"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr "genereaz� un certificat de revocare"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "export� chei"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "export� chei pentru un server de chei"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "import� chei de la un server de chei"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "search for keys on a key server"
msgstr "caut� pentru chei pe un server de chei"
-#: g10/gpg.c:411
+#: g10/gpg.c:412
msgid "update all keys from a keyserver"
msgstr "actualizeaz� toate cheile de la un server de chei"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "import�/combin� chei"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr "afi�eaz� starea cardului"
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr "schimb� data de pe card"
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr "schimb� PIN-ul unui card"
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr "actualizeaz� baza de date de �ncredere"
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1135,51 +1135,51 @@ msgstr ""
"Op�iuni:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr "creaz� ie�ire �n armur� ascii"
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|NUME|cifrare pentru NUME"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
msgid "use this user-id to sign or decrypt"
msgstr "folose�te acest id-utilizator pentru a semna sau decripta"
-#: g10/gpg.c:456
+#: g10/gpg.c:457
msgid "|N|set compress level N (0 disables)"
msgstr "|N|seteaz� nivel de compresie N (0 deactiveaz�)"
-#: g10/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr "folose�te modul text canonic"
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "folose�te ca fi�ier ie�ire"
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "locvace"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "nu face nici o schimbare"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr "�ntreab� �nainte de a suprascrie"
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr "folose�te comportament strict OpenPGP"
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr "genereaz� mesaje compatibile cu PGP 2.x"
-#: g10/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1187,7 +1187,7 @@ msgstr ""
"@\n"
"(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
-#: g10/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1207,15 +1207,15 @@ msgstr ""
" --list-keys [nume] arat� chei\n"
" --fingerprint [nume] arat� amprente\n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
msgid "Please report bugs to <[email protected]>.\n"
msgstr "Raporta�i bug-uri la <[email protected]>.\n"
-#: g10/gpg.c:778
+#: g10/gpg.c:780
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
-#: g10/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1225,7 +1225,7 @@ msgstr ""
"sign, check, encrypt sau decrypt\n"
"opera�iunea implicit� depinde de datele de intrare\n"
-#: g10/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1233,77 +1233,77 @@ msgstr ""
"\n"
"Algoritmuri suportate:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr "Pubkey: "
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr "Cifru: "
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr "Hash: "
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
msgid "Compression: "
msgstr "Compresie: "
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "folosire: gpg [op�iuni] "
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "comenzi �n conflict\n"
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, 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/gpg.c:1259
+#: g10/gpg.c:1261
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr ""
"AVERTISMENT: proprietate nesigur� (unsafe) pentru directorul home `%s'\n"
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr ""
"AVERTISMENT: proprietate nesigur� (unsafe) pentru fi�ier configurare `%s'\n"
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru extensia `%s'\n"
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr ""
"AVERTISMENT: permisiuni nesigure (unsafe) pentru directorul home `%s'\n"
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr ""
"AVERTISMENT: permisiuni nesigure (unsafe) pentru fi�ier configurare `%s'\n"
-#: g10/gpg.c:1277
+#: g10/gpg.c:1279
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
"directorul home `%s'\n"
-#: g10/gpg.c:1286
+#: g10/gpg.c:1288
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1311,21 +1311,21 @@ msgstr ""
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fi�ier "
"configurare `%s'\n"
-#: g10/gpg.c:1289
+#: g10/gpg.c:1291
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
"extensia `%s'\n"
-#: g10/gpg.c:1295
+#: g10/gpg.c:1297
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
"directorul home `%s'\n"
-#: g10/gpg.c:1298
+#: g10/gpg.c:1300
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1333,492 +1333,492 @@ msgstr ""
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fi�ier "
"configurare `%s'\n"
-#: g10/gpg.c:1301
+#: g10/gpg.c:1303
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
"extensia `%s'\n"
-#: g10/gpg.c:1442
+#: g10/gpg.c:1444
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "articol configurare necunoscut `%s'\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "arat� c�ruia dintre inelele de chei �i apar�ine o cheie enumerat�"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
-#: g10/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOT�: nici un fi�ier op�iuni implicit `%s'\n"
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr "fi�ier op�iuni `%s': %s\n"
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr "citesc op�iuni din `%s'\n"
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, 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/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "`%s' nu este expirare de semn�tur� valid�\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "`%s' nu este un set de carectere valid\n"
#
-#: g10/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
msgid "could not parse keyserver URL\n"
msgstr "nu am putut interpreta URL-ul serverului de chei\n"
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: op�iuni server de chei invalide\n"
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
msgid "invalid keyserver options\n"
msgstr "op�iuni server de chei invalide\n"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: op�iuni import invalide\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
msgid "invalid import options\n"
msgstr "op�iuni import invalide\n"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: op�iuni export invalide\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
msgid "invalid export options\n"
msgstr "op�iuni export invalide\n"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: op�iuni enumerare invalide\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
msgid "invalid list options\n"
msgstr "op�iuni enumerare invalide\n"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
#, fuzzy
msgid "show all notations during signature verification"
msgstr "`%s' nu este expirare de semn�tur� valid�\n"
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "`%s' nu este expirare de semn�tur� valid�\n"
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: op�iuni verificare invalide\n"
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
msgid "invalid verify options\n"
msgstr "op�iuni verificare invalide\n"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nu pot seta cale-execu�ie ca %s\n"
-#: g10/gpg.c:2764
+#: g10/gpg.c:2768
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: op�iuni verificare invalide\n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
-#: g10/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s nu este permis cu %s!\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nu are sens cu %s!\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2865
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "NOT�: %s nu este disponibil �n aceast� sesiune\n"
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "nu va rula cu memorie neprotejat� (insecure) pentru c� %s\n"
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
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/gpg.c:2896
+#: g10/gpg.c:2900
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/gpg.c:2902
+#: g10/gpg.c:2906
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/gpg.c:2915
+#: g10/gpg.c:2919
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/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritm cifrare selectat este invalid\n"
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr "algoritm rezumat selectat este invalid\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
msgid "selected compression algorithm is invalid\n"
msgstr "algoritm compresie selectat este invalid\n"
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
msgid "selected certification digest algorithm is invalid\n"
msgstr "algoritm rezumat certificare selectat este invalid\n"
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth trebuie s� fie �n intervalul de la 1 la 255\n"
-#: g10/gpg.c:3021
+#: g10/gpg.c:3025
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/gpg.c:3023
+#: g10/gpg.c:3027
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/gpg.c:3026
+#: g10/gpg.c:3030
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
-#: g10/gpg.c:3030
+#: g10/gpg.c:3034
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "mod S2K invalid; trebuie s� fie 0, 1 sau 3\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3041
msgid "invalid default preferences\n"
msgstr "preferin�e implicite invalide\n"
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
msgid "invalid personal cipher preferences\n"
msgstr "preferin�e cifrare personale invalide\n"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
msgid "invalid personal digest preferences\n"
msgstr "preferin�e rezumat personale invalide\n"
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
msgid "invalid personal compress preferences\n"
msgstr "preferin�e compresie personale invalide\n"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s nu merge �nc� cu %s!\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, 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/gpg.c:3139
+#: g10/gpg.c:3143
#, 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/gpg.c:3144
+#: g10/gpg.c:3148
#, 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/gpg.c:3246
+#: g10/gpg.c:3250
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
-#: g10/gpg.c:3257
+#: g10/gpg.c:3261
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/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [nume_fi�ier]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [nume_fi�ier]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "cifrarea simetric� a lui `%s' a e�uat: %s\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [nume_fi�ier]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [nume_fi�ier]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "nu pute�i folosi --symmetric --encrypt cu --s2k-mode 0\n"
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "nu pute�i folosi --symmetric --encrypt c�t� vreme �n modul %s\n"
-#: g10/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--sign [nume_fi�ier]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nume_fi�ier]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "nu pute�i folosi --symmetric --sign --encrypt cu --s2k-mode 0\n"
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "nu pute�i folosi --symmetric --sign --encrypt c�t� vreme �n modul %s\n"
-#: g10/gpg.c:3376
+#: g10/gpg.c:3380
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nume_fi�ier]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [nume_fi�ier]"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [nume_fi�ier]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key id-utilizator"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key id-utilizator"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-utilizator [comenzi]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id-utilizator] [inel_chei]"
-#: g10/gpg.c:3556
+#: g10/gpg.c:3560
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "trimitere server de chei e�uat�: %s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "recep�ie server de chei e�uat�: %s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, c-format
msgid "key export failed: %s\n"
msgstr "export cheie e�uat: %s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "c�utare server de chei e�uat�: %s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "actualizare server de chei e�uat�: %s\n"
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "eliminarea armurii a e�uat: %s\n"
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "punerea armurii a e�uat: %s\n"
-#: g10/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritm hash invalid `%s'\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[nume_fi�ier]"
-#: g10/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
msgid "the given certification policy URL is invalid\n"
msgstr "URL-ul politicii de certificare furnizat este invalid\n"
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
msgid "the given signature policy URL is invalid\n"
msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
-#: g10/gpg.c:4193
+#: g10/gpg.c:4197
msgid "the given preferred keyserver URL is invalid\n"
msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
@@ -1841,7 +1841,7 @@ msgstr ""
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "Cheia invalid� %s f�cut� valid� de --allow-non-selfsigned-uid\n"
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "nici o subcheie secret� pentru subcheia public� %s - ignorat�\n"
@@ -2255,427 +2255,427 @@ msgstr "cheie secret� de nefolosit"
msgid "remove as much as possible from key after import"
msgstr ""
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr "bloc de tip %d s�rit\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu chei procesate p�n� acum\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Num�r total procesate: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " chei noi s�rite: %lu\n"
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " f�r� ID-uri utilizator: %lu\n"
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr " importate: %lu"
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr " neschimbate: %lu\n"
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr " noi ID-uri utilizator: %lu\n"
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr " noi subchei: %lu\n"
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr " noi semn�turi: %lu\n"
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr " noi revoc�ri de chei: %lu\n"
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr " chei secrete citite: %lu\n"
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " chei secrete importate: %lu\n"
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "chei secrete neschimbate: %lu\n"
-#: g10/import.c:321
+#: g10/import.c:322
#, c-format
msgid " not imported: %lu\n"
msgstr " ne importate: %lu\n"
-#: g10/import.c:323
+#: g10/import.c:324
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr "semn�turi create p�n� acum: %lu\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " chei secrete citite: %lu\n"
-#: g10/import.c:566
+#: g10/import.c:567
#, fuzzy, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr "AVERTISMENT: cheia %s con�ine preferin�e pentru indisponibil\n"
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
#, fuzzy
msgid " algorithms on these user IDs:\n"
msgstr "algoritmuri pentru aceste ID-uri utilizator:\n"
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": preferin�� pentru algoritm de cifrare %s\n"
-#: g10/import.c:619
+#: g10/import.c:620
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": preferin�� pentru algoritm rezumat %s\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": preferin�� pentru algoritm compresie %s\n"
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
"este puternic sugerat s� v� actualiza�i preferin�ele �i re-distribui�i\n"
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"aceast� cheie pentru a avita probleme poten�iale de ne-potrivire de "
"algoritm\n"
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "v� pute�i actualiza preferin�ele cu: gpg --edit-key %s updpref save\n"
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, c-format
msgid "key %s: no user ID\n"
msgstr "cheia %s: nici un ID utilizator\n"
-#: g10/import.c:749
+#: g10/import.c:750
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "cheia %s: subcheia HPK corupt� a fost reparat�\n"
-#: g10/import.c:764
+#: g10/import.c:765
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "cheia %s: am acceptat ID-ul utilizator ce nu e auto-semnat \"%s\"\n"
-#: g10/import.c:770
+#: g10/import.c:771
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "cheia %s: nici un ID utilizator valid\n"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr "aceasta poate fi cauzat� de o auto-semn�tur� ce lipse�te\n"
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "cheia %s: cheia public� nu a fost g�sit�: %s\n"
-#: g10/import.c:788
+#: g10/import.c:789
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "cheia %s: cheie nou� - s�rit�\n"
-#: g10/import.c:797
+#: g10/import.c:798
#, c-format
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:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr "scriu �n `%s'\n"
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "eroare la scrierea inelului de chei `%s': %s\n"
-#: g10/import.c:825
+#: g10/import.c:826
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "cheia %s: cheia public� \"%s\" importat�\n"
-#: g10/import.c:849
+#: g10/import.c:850
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "cheia %s: nu se potrive�te cu copia noastr�\n"
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "cheia %s: nu pot g�si keyblock-ul original: %s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "cheia %s: nu pot citi keyblock-ul original: %s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "cheia %s: \"%s\" 1 nou ID utilizator\n"
-#: g10/import.c:914
+#: g10/import.c:915
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
-#: g10/import.c:917
+#: g10/import.c:918
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "cheia %s: \"%s\" 1 nou� semn�tur�\n"
-#: g10/import.c:920
+#: g10/import.c:921
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
-#: g10/import.c:923
+#: g10/import.c:924
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "cheia %s: \"%s\" 1 nou� subcheie\n"
-#: g10/import.c:926
+#: g10/import.c:927
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "cheia %s: \"%s\" %d noi subchei\n"
-#: g10/import.c:929
+#: g10/import.c:930
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
-#: g10/import.c:932
+#: g10/import.c:933
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
-#: g10/import.c:935
+#: g10/import.c:936
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
-#: g10/import.c:938
+#: g10/import.c:939
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
-#: g10/import.c:961
+#: g10/import.c:962
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "cheia %s: \"%s\" nu a fost schimbat�\n"
-#: g10/import.c:1124
+#: g10/import.c:1125
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "cheia %s: cheie secret� cu cifru invalid %d - s�rit�\n"
-#: g10/import.c:1135
+#: g10/import.c:1136
msgid "importing secret keys not allowed\n"
msgstr "importul de chei secrete nu este permis\n"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "nici un inel de chei secrete implicit: %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, c-format
msgid "key %s: secret key imported\n"
msgstr "cheia %s: cheie secret� importat�\n"
-#: g10/import.c:1193
+#: g10/import.c:1194
#, c-format
msgid "key %s: already in secret keyring\n"
msgstr "cheia %s: deja �n inelul de chei secrete\n"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "cheia %s: cheia secret� nu a fost g�sit�: %s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"cheia %s: nici o cheie public� - nu pot aplica certificatul de revocare\n"
-#: g10/import.c:1276
+#: g10/import.c:1277
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "cheia %s: certificat de revocare invalid: %s - respins\n"
-#: g10/import.c:1308
+#: g10/import.c:1309
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "cheia %s: certificatul de revocare \"%s\" importat\n"
-#: g10/import.c:1374
+#: g10/import.c:1375
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "cheia %s: nici un ID utilizator pentru semn�tur�\n"
-#: g10/import.c:1389
+#: g10/import.c:1390
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"cheia %s: algoritm cu cheie public� nesuportat pentru ID-ul utilizator \"%s"
"\"\n"
-#: g10/import.c:1391
+#: g10/import.c:1392
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "cheia %s: auto-semn�tur� invalid� pentru ID-ul utilizator \"%s\"\n"
-#: g10/import.c:1409
+#: g10/import.c:1410
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "cheia %s: nici o subcheie pentru legarea cheii\n"
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "cheia %s: algoritm cu cheie public� nesuportat\n"
-#: g10/import.c:1422
+#: g10/import.c:1423
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "cheia %s: legare subcheie invalid�\n"
-#: g10/import.c:1437
+#: g10/import.c:1438
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "cheia %s: am �ters multiple leg�turi de subchei\n"
-#: g10/import.c:1459
+#: g10/import.c:1460
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "cheia %s: nici o subcheie pentru revocare de cheie\n"
-#: g10/import.c:1472
+#: g10/import.c:1473
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "cheia %s: revocare de subcheie invalid�\n"
-#: g10/import.c:1487
+#: g10/import.c:1488
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "cheia %s: am �ters multiple revoc�ri de subcheie\n"
-#: g10/import.c:1529
+#: g10/import.c:1530
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "cheia %s: am s�rit ID-ul utilizator \"%s\"\n"
-#: g10/import.c:1550
+#: g10/import.c:1551
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "cheia %s: am s�rit subcheia\n"
-#: g10/import.c:1577
+#: g10/import.c:1578
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "cheia %s: semn�tura nu poate fi exportat� (clasa 0x%02X) - s�rit�\n"
-#: g10/import.c:1587
+#: g10/import.c:1588
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "cheia %s: certificat de revocare �ntr-un loc gre�it - s�rit\n"
-#: g10/import.c:1604
+#: g10/import.c:1605
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "cheia %s: certificat de revocare invalid: %s - s�rit\n"
-#: g10/import.c:1618
+#: g10/import.c:1619
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "cheia %s: semn�tur� subcheie �ntr-un loc gre�it - s�rit�\n"
-#: g10/import.c:1626
+#: g10/import.c:1627
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "cheia %s: clas� de semn�tur� nea�teptat� (0x%02X) - s�rit�\n"
-#: g10/import.c:1726
+#: g10/import.c:1727
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "cheia %s: am detectat un ID utilizator duplicat - combinate\n"
-#: g10/import.c:1788
+#: g10/import.c:1789
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "AVERTISMENT: cheia %s poate fi revocat�: aduc revocarea cheii %s\n"
-#: g10/import.c:1802
+#: g10/import.c:1803
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"AVERTISMENT: cheia %s poate fi revocat�: cheia de revocare %s nu este "
"prezent�.\n"
-#: g10/import.c:1861
+#: g10/import.c:1862
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "cheia %s: am ad�ugat certificatul de revocare \"%s\"\n"
-#: g10/import.c:1895
+#: g10/import.c:1896
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "cheia %s: am ad�ugat semn�tura de cheie direct�\n"
-#: g10/import.c:2284
+#: g10/import.c:2285
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "NOT�: S/N-ul unei chei nu se potrive�te cu cel al cardului\n"
-#: g10/import.c:2292
+#: g10/import.c:2293
msgid "NOTE: primary key is online and stored on card\n"
msgstr "NOT�: cheia primar� este online �i stocat� pe card\n"
-#: g10/import.c:2294
+#: g10/import.c:2295
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "NOT�: cheia secundar� este online �i stocat� pe card\n"
@@ -2978,8 +2978,8 @@ msgstr "Am verificat aceast� cheie foarte atent.\n"
msgid "Really sign? (y/N) "
msgstr "Dori�i cu adev�rat s� semna�i? (d/N) "
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "semnarea a e�uat: %s\n"
@@ -3484,7 +3484,7 @@ 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
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) "
@@ -3526,12 +3526,32 @@ msgstr "Nu am �ters nimic.\n"
msgid "invalid"
msgstr "invalid(�)"
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "ID utilizator \"%s\" a fost revocat."
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "ID utilizator \"%s\" a fost revocat."
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "ID utilizator \"%s\" a fost revocat."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
+
+#: g10/keyedit.c:3252
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3541,196 +3561,196 @@ msgstr ""
" desemnat poate face ca unele versiuni de PGP s� resping� "
"cheia.\n"
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3357
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:3372
+#: g10/keyedit.c:3377
msgid "Enter the user ID of the designated revoker: "
msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3402
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:3412
+#: g10/keyedit.c:3417
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:3434
+#: g10/keyedit.c:3439
msgid "this key has already been designated as a revoker\n"
msgstr "aceast� cheie a fost deja desemnat� ca un revocator\n"
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3458
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:3459
+#: g10/keyedit.c:3464
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 un revocator "
"desemnat? (d/N) "
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3525
msgid "Please remove selections from the secret keys.\n"
msgstr "V� rug�m �terge�i selec�iile din cheile secrete.\n"
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3531
msgid "Please select at most one subkey.\n"
msgstr "V� rug�m selecta�i cel mult o subcheie.\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
msgid "Changing expiration time for a subkey.\n"
msgstr "Schimb timpul de expirare pentru o subcheie.\n"
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
msgid "Changing expiration time for the primary key.\n"
msgstr "Schimb timpul de expirare pentru cheia primar�.\n"
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3584
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:3595
+#: g10/keyedit.c:3600
msgid "No corresponding signature in secret ring\n"
msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3673
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr ""
"AVERTISMENT: subcheia de semnare %s nu este certificat� reciproc (cross-"
"certified)\n"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
msgid "Please select exactly one user ID.\n"
msgstr "V� rug�m selecta�i exact un ID utilizator.\n"
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "auto-semn�tur� v3 s�rit� pentru ID-ul utilizator \"%s\"\n"
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr "Introduce�i URL-ul serverului de chei preferat: "
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
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:4127
+#: g10/keyedit.c:4132
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:4189
+#: g10/keyedit.c:4194
#, fuzzy
msgid "Enter the notation: "
msgstr "Notare semn�tur�: "
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Suprascriu? (d/N) "
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nici un ID utilizator cu indicele %d\n"
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4465
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Nici un ID utilizator cu hash-ul %s\n"
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, c-format
msgid "No subkey with index %d\n"
msgstr "Nici o subcheie cu indicele %d\n"
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID utilizator: \"%s\"\n"
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "semnat� de cheia d-voastr� %s la %s%s%s\n"
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr " (non-exportabil�)"
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Aceast� semn�tur� a expirat pe %s.\n"
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
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:4639
+#: g10/keyedit.c:4644
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:4666
+#: g10/keyedit.c:4671
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "A�i semnat aceste ID-uri utilizator pe cheia %s:\n"
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
msgid " (non-revocable)"
msgstr " (non-revocabil�)"
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "revocat� de cheia d-voastr� %s pe %s\n"
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr "Sunte�i pe cale s� revoca�i aceste semn�turi:\n"
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
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:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr "nici o cheie secret�\n"
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4863
#, 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:4922
+#: g10/keyedit.c:4927
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Cheia %s este deja revocat�.\n"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Subcheia %s este deja revocat�.\n"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, 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 %s (uid %d)\n"
@@ -4343,7 +4363,7 @@ msgstr "deactivat(�)"
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Introduce�i num�r/numere, N)ext (urm�tor), sau Q)uit (termin�) > "
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "protocol server de chei invalid (us %d!=handler %d)\n"
@@ -4377,104 +4397,104 @@ msgstr "caut \"%s\" de pe serverul %s %s\n"
msgid "searching for names from %s\n"
msgstr "caut \"%s\" de pe %s\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "trimit cheia %s serverului %s %s\n"
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, c-format
msgid "sending key %s to %s\n"
msgstr "trimit cheia %s lui %s\n"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "caut \"%s\" de pe serverul %s %s\n"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "caut \"%s\" de pe %s\n"
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
msgid "no keyserver action!\n"
msgstr "nici o ac�iune pentru serverul de chei!\n"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
"AVERTISMENT: manipulator server de chei dintr-o versiune diferit� de GnuPG (%"
"s)\n"
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr "serverul de chei nu a trimis VERSION (versiune)\n"
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr "nici un server de chei cunoscut (folosi�i op�iunea --keyserver)\n"
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
"apeluri c�tre server de chei extern nu este suportat de acest program\n"
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr "nici un manipulator (handler) pentru schema serverului de chei `%s'\n"
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "ac�iunea `%s' nu este suportat� cu schema serverului de chei `%s'\n"
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, c-format
msgid "%s does not support handler version %d\n"
msgstr "%s nu suport� versiunea de manipulator (handler) %d\n"
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
msgid "keyserver timed out\n"
msgstr "serverul de chei a epuizat timpul de a�teptare (timed out)\n"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
msgid "keyserver internal error\n"
msgstr "eroare intern� server de chei\n"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "eroare de comunicare server de chei: %s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" nu este un ID de cheie: s�rit\n"
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "reactualizez 1 cheie de la %s\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "reactualizez %d chei de la %s\n"
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
@@ -4883,11 +4903,11 @@ msgid "cancelled by user\n"
msgstr "anulat� de utilizator\n"
#
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
msgid "can't query passphrase in batch mode\n"
msgstr "nu pot cere fraza-parol� �n modul batch\n"
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "Introduce�i fraza-parol�: "
@@ -4910,7 +4930,7 @@ msgstr "cheia %u-bit %s, ID %s, creat� %s"
msgid " (subkey on main key ID %s)"
msgstr " (subcheie pe cheia principal� ID %s)"
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "Repeta�i fraza-parol�: "
@@ -6357,18 +6377,6 @@ msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
#~ msgstr "nu pot executa programul `%s': %s\n"
#, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "ID utilizator \"%s\" a fost revocat."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "ID utilizator \"%s\" a fost revocat."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "ID utilizator \"%s\" a fost revocat."
-
-#, fuzzy
#~ msgid "No user IDs are removable.\n"
#~ msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
diff --git a/po/ru.po b/po/ru.po
index 74bd35d9b..95b1c0c62 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GnuPG 1.4.2\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\n"
"PO-Revision-Date: 2005-06-22 02:53+0200\n"
"Last-Translator: Maxim Britov <[email protected]>\n"
"Language-Team: Russian <[email protected]>\n"
@@ -42,7 +42,7 @@ msgstr "сохранение секретного ключа в `%s'\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -78,7 +78,7 @@ msgstr "не могу прочитать `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "замечание: файл random_seed не обновлен\n"
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, c-format
@@ -306,75 +306,75 @@ msgstr ""
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "нет доступа %s - неработоспособная карта OpenPGP?\n"
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr "формат ASCII: %s\n"
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr "неправильный заголовок ASCII: "
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr "заголовок ASCII: "
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr "неправильный заголовок прозрачной подписи\n"
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr "вложенные прозрачные подписи\n"
-#: g10/armor.c:568
+#: g10/armor.c:620
msgid "unexpected armor: "
msgstr "неожиданный формат ASCII:"
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr "неправильный отступ из минусов: "
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "недопустимый символ radix64 %02X пропущен\n"
-#: g10/armor.c:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr "преждевременный конец файла (нет CRC)\n"
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr "преждевременный конец файла (в CRC)\n"
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr "поврежденный CRC\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "ошибка CRC; %06lX - %06lX\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
msgid "premature eof (in trailer)\n"
msgstr "преждевременный конец файла (в дополнении)\n"
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr "ошибка в строке дополнения\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr "не найдено данных формата OpenPGP.\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "неправильный ASCII формат: строка длиннее %d символов\n"
-#: g10/armor.c:1167
+#: g10/armor.c:1219
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -460,7 +460,7 @@ msgstr "URL для получения открытого ключа: "
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Ошибка: URL слишком длинный (предел - %d символов).\n"
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr "ошибка чтения `%s': %s\n"
@@ -718,7 +718,7 @@ msgstr "Повторите ввод PIN: "
msgid "PIN not correctly repeated; try again"
msgstr "повторный ввод PIN некорректен; попробуйте еще раз"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -728,13 +728,13 @@ msgstr "не могу открыть `%s'\n"
msgid "--output doesn't work for this command\n"
msgstr "--output не работает для данной команды\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "ключ \"%s\" не найден: %s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %s\n"
@@ -841,23 +841,23 @@ msgstr "Вы не можете использовать %s в режиме %s\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s зашифровано для: \"%s\"\n"
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr "Данные зашифрованы алгоритмом %s\n"
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "зашифровано неизвестным алгоритмом %d\n"
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"ВНИМАНИЕ: сообщение было зашифровано слабым ключом симметричного шифра.\n"
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
msgid "problem handling encrypted packet\n"
msgstr "проблема обработки зашифрованного пакета\n"
@@ -984,7 +984,7 @@ msgstr "ВНИМАНИЕ: секретный ключ %s не имеет про�
msgid "WARNING: nothing exported\n"
msgstr "ВНИМАНИЕ: нечего экспортировать\n"
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -992,127 +992,127 @@ msgstr ""
"@Команды:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[file]|создать подпись к файлу"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[file]|создать прозрачную подпись к файлу"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "создать отделенную подпись"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "зашифровать данные"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr "зашифровать только симметричным шифром"
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "расшифровать данные (по умолчанию)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "проверить подпись"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "вывести список ключей"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "вывести список ключей и подписей"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "list and check key signatures"
msgstr "вывести и проверить подписи ключей"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "вывести список ключей и их отпечатков"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "вывести список секретных ключей"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "создать новую пару ключей"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "remove keys from the public keyring"
msgstr "удалить ключи из таблицы открытых ключей"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
msgid "remove keys from the secret keyring"
msgstr "удалить ключи из таблицы закрытых ключей"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "подписать ключ"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "подписать ключ локально"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "подписать или редактировать ключ"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr "создать сертификат отзыва"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "экспортировать ключи"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "экспортировать ключи на сервер ключей"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "импортировать ключи с сервера ключей"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "search for keys on a key server"
msgstr "искать ключи на сервере ключей"
-#: g10/gpg.c:411
+#: g10/gpg.c:412
msgid "update all keys from a keyserver"
msgstr "обновить все ключи с сервера ключей"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "импортировать/объединить ключи"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr "показать состояние карты"
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr "изменить данные на карте"
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr "сменить PIN карты"
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr "обновить таблицу доверий"
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr "|algo [files]|вывести хэши файлов"
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1122,51 +1122,51 @@ msgstr ""
"Параметры:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr "вывод в ASCII формате"
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|NAME|зашифровать для получателя NAME"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
msgid "use this user-id to sign or decrypt"
msgstr "использовать данный User ID для подписывания и расшифрования"
-#: g10/gpg.c:456
+#: g10/gpg.c:457
msgid "|N|set compress level N (0 disables)"
msgstr "|N|установить уровень сжатия N (по умолчанию - 0)"
-#: g10/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr "использовать канонический текстовый режим"
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "вывод в указанный файл"
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "подробно"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "не делать никаких изменений"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr "спросить перед перезаписью"
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr "строго следовать стандарту OpenPGP"
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr "создает сообщение совместимым с PGP 2.x"
-#: g10/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1174,7 +1174,7 @@ msgstr ""
"@\n"
"(См. документацию для более полного ознакомления с командами и параметрами)\n"
-#: g10/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1194,15 +1194,15 @@ msgstr ""
" --list-keys [имена] показать ключи\n"
" --fingerprint [имена] показать отпечатки\n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
msgid "Please report bugs to <[email protected]>.\n"
msgstr "О найденных ошибка сообщайте <[email protected]>.\n"
-#: g10/gpg.c:778
+#: g10/gpg.c:780
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
-#: g10/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1212,7 +1212,7 @@ msgstr ""
"подписать и проверить, зашифровать или расшифровать\n"
"операция по умолчанию зависит от входных данных\n"
-#: g10/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1220,92 +1220,92 @@ msgstr ""
"\n"
"Поддерживаются следующие алгоритмы:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr "С открытым ключом: "
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr "Симметричные шифры: "
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr "Хэш-функции: "
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
msgid "Compression: "
msgstr "Алгоритмы сжатия: "
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "использование: gpg [опции] "
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "несовместимые команды\n"
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "отсутствует знак = в определении группы `%s'\n"
-#: g10/gpg.c:1259
+#: g10/gpg.c:1261
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "ВНИМАНИЕ: небезопасный владелец домашнего каталога `%s'\n"
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "ВНИМАНИЕ: небезопасный владелец файла конфигурации `%s'\n"
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "ВНИМАНИЕ: небезопасный владелец файла модуля расширения `%s'\n"
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "ВНИМАНИЕ: небезопасные права доступа к домашнему каталогу `%s'\n"
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "ВНИМАНИЕ: небезопасные права доступа к файлу конфигурации `%s'\n"
-#: g10/gpg.c:1277
+#: g10/gpg.c:1279
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "ВНИМАНИЕ: небезопасные права доступа к файлу модуля расширения `%s'\n"
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"ВНИМАНИЕ: небезопасный владелец каталога содержащего домашний каталог `%s'\n"
-#: g10/gpg.c:1286
+#: g10/gpg.c:1288
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr ""
"ВНИМАНИЕ: небезопасный владелец каталога содержащего файл конфигурации `%s'\n"
-#: g10/gpg.c:1289
+#: g10/gpg.c:1291
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr ""
"ВНИМАНИЕ: небезопасный владелец каталога содержащего модуль расширения `%s'\n"
-#: g10/gpg.c:1295
+#: g10/gpg.c:1297
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"ВНИМАНИЕ: небезопасные права доступа к каталогу содержащему домашний каталог "
"`%s'\n"
-#: g10/gpg.c:1298
+#: g10/gpg.c:1300
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1313,492 +1313,492 @@ msgstr ""
"ВНИМАНИЕ: небезопасные права доступа к каталогу содержащему файл "
"конфигурации `%s'\n"
-#: g10/gpg.c:1301
+#: g10/gpg.c:1303
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr ""
"ВНИМАНИЕ: небезопасные права доступа к каталогу содержащему файл модуля "
"расширения `%s'\n"
-#: g10/gpg.c:1442
+#: g10/gpg.c:1444
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "неизвестный параметр в файле конфигурации `%s'\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Нет соответствующей подписи в связке секретных\n"
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "переключение между просмотром открытых и закрытых ключей"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Нет соответствующей подписи в связке секретных\n"
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "ЗАМЕЧАНИЕ: старый файл конфигурации по умолчанию `%s' проигнорирован\n"
-#: g10/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr "файл конфигурации `%s': %s\n"
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr "параметры конфигурации взяты из файла `%s'\n"
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "ЗАМЕЧАНИЕ: %s не предназначен для нормального применения!\n"
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, c-format
msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr ""
"расширение шифра `%s' не загружено вследствие небезопасных прав доступа\n"
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "`%s' недопустимый срок действия подписи\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "`%s' недопустимая таблица символов\n"
-#: g10/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
msgid "could not parse keyserver URL\n"
msgstr "не могу проанализировать URL сервера ключей\n"
# test it
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: недопустимые параметры для сервера ключей\n"
# test it
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
msgid "invalid keyserver options\n"
msgstr "недопустимые параметры для сервера ключей\n"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: недопустимые параметры импорта\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
msgid "invalid import options\n"
msgstr "недопустимые параметры импорта\n"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: недопустимые параметры экспорта\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
msgid "invalid export options\n"
msgstr "недопустимые параметры экспорта\n"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: недопустимый список параметров\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
msgid "invalid list options\n"
msgstr "недопустимый список параметров\n"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
#, fuzzy
msgid "show all notations during signature verification"
msgstr "`%s' недопустимый срок действия подписи\n"
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "`%s' недопустимый срок действия подписи\n"
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
# test it
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: недопустимые параметры проверки \n"
# test it
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
msgid "invalid verify options\n"
msgstr "недопустимые параметры проверки\n"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "не могу определить путь запуска для %s\n"
# test it
-#: g10/gpg.c:2764
+#: g10/gpg.c:2768
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: недопустимые параметры проверки \n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
msgid "WARNING: program may create a core file!\n"
msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти!\n"
-#: g10/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ВНИМАНИЕ: %s заместит %s\n"
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s не допускается использовать с %s!\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s не имеет смысла совместно с %s!\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2865
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "ПРЕДУПРЕЖДАЮ: %s недоступен в данной версии\n"
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "не будет работать с небезопасной памятью из-за %s\n"
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
-#: g10/gpg.c:2896
+#: g10/gpg.c:2900
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "Вы не можете одновременно подписать и зашифровать в режиме --pgp2\n"
-#: g10/gpg.c:2902
+#: g10/gpg.c:2906
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "Вы должны использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
-#: g10/gpg.c:2915
+#: g10/gpg.c:2919
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "для зашифрования сообщения в режиме --pgp2 требуется шифр IDEA\n"
-#: g10/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr "выбран неверный алгоритм шифрования\n"
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr "выбрана неверная хэш-функция\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
msgid "selected compression algorithm is invalid\n"
msgstr "выбран неверный алгоритм сжатия\n"
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
msgid "selected certification digest algorithm is invalid\n"
msgstr "выбрана неверная хэш-функция для сертификации\n"
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed должен быть больше 0\n"
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed должен быть больше 1\n"
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
-#: g10/gpg.c:3021
+#: g10/gpg.c:3025
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "недопустимый default-cert-level; должен быть 0, 1, 2 или 3\n"
-#: g10/gpg.c:3023
+#: g10/gpg.c:3027
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
-#: g10/gpg.c:3026
+#: g10/gpg.c:3030
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "ЗАМЕЧАНИЕ: простой режим S2K (0) строго не рекомендуется\n"
-#: g10/gpg.c:3030
+#: g10/gpg.c:3034
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3041
msgid "invalid default preferences\n"
msgstr "недопустимые предпочтения по умолчанию\n"
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
msgid "invalid personal cipher preferences\n"
msgstr "недопустимые персональные предпочтения шифра\n"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
msgid "invalid personal digest preferences\n"
msgstr "недопустимые персональные предпочтения хэш-функции\n"
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
msgid "invalid personal compress preferences\n"
msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s пока не работает совместно с %s!\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "Вы не можете использовать шифрование `%s' в режиме %s\n"
-#: g10/gpg.c:3139
+#: g10/gpg.c:3143
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "Вы не можете использовать хэш-функцию `%s' в режиме %s\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3148
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "Вы не можете использовать сжатие `%s' в режиме %s\n"
-#: g10/gpg.c:3246
+#: g10/gpg.c:3250
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "сбой инициализации таблицы доверий: %s\n"
-#: g10/gpg.c:3257
+#: g10/gpg.c:3261
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
"ключом\n"
-#: g10/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [filename]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [filename]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "симметричное шифрование `%s' не удалось: %s\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [filename]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [имяфайла]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "нельзя использовать --symmetric --encrypt совместно с --s2k-mode 0\n"
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "невозможно использовать --symmetric --encrypt в режиме %s\n"
-#: g10/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--sign [filename]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filename]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [имяфайла]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
"нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "невозможно использовать --symmetric --sign --encrypt в режиме %s\n"
-#: g10/gpg.c:3376
+#: g10/gpg.c:3380
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filename]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [filename]"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [filename]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [commands]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [user-id] [keyring]"
-#: g10/gpg.c:3556
+#: g10/gpg.c:3560
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "сбой при отправке на сервер ключей: %s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "сбой при получении с сервера ключей: %s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, c-format
msgid "key export failed: %s\n"
msgstr "сбой при экспорте ключа: %s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "сбой при поиске на сервере ключей: %s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "сбой при обновлении с сервера ключей: %s\n"
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "ошибка преобразования из ASCII формата: %s\n"
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "ошибка преобразования в ASCII формат: %s\n"
-#: g10/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "недопустимая хэш-функция `%s'\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[filename]"
-#: g10/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr "Набирайте Ваше сообщение ...\n"
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
msgid "the given certification policy URL is invalid\n"
msgstr "заданный URL политики сертификации неверен\n"
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
msgid "the given signature policy URL is invalid\n"
msgstr "заданный URL политики подписи неверен\n"
-#: g10/gpg.c:4193
+#: g10/gpg.c:4197
msgid "the given preferred keyserver URL is invalid\n"
msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
@@ -1823,7 +1823,7 @@ msgstr ""
"Дефектный ключ %s признан пригодным согласно параметра --allow-non-"
"selfsigned-uid\n"
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "нет секретного подключа для открытого подключа %s - игнорируем\n"
@@ -2227,426 +2227,426 @@ msgstr "удаление неиспользуемых частей из ключ
msgid "remove as much as possible from key after import"
msgstr ""
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr "пропущен блок типа %d\n"
# test it
-#: g10/import.c:275
+#: g10/import.c:276
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu ключей обработано\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Всего обработано: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " пропущено новых ключей: %lu\n"
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " без User ID: %lu\n"
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr " импортировано: %lu"
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr " неизмененных: %lu\n"
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr " новых User ID: %lu\n"
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr " новых подключей: %lu\n"
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr " новых подписей: %lu\n"
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr " новых отзывов ключей: %lu\n"
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr " прочитано секретных ключей: %lu\n"
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "импортировано секретных ключей: %lu\n"
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " неизменённых секретных ключей: %lu\n"
-#: g10/import.c:321
+#: g10/import.c:322
#, c-format
msgid " not imported: %lu\n"
msgstr " не импортировано: %lu\n"
-#: g10/import.c:323
+#: g10/import.c:324
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " подписей очищено: %lu\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " очищено User ID: %lu\n"
-#: g10/import.c:566
+#: g10/import.c:567
#, fuzzy, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr "ВНИМАНИЕ: ключ %s содержит недопустимые предпочтения\n"
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
#, fuzzy
msgid " algorithms on these user IDs:\n"
msgstr "алгоритмы для этих User ID:\n"
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": предпочитает шифр %s\n"
-#: g10/import.c:619
+#: g10/import.c:620
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": предпочитает хеш-функцию %s\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": предпочитает сжатие %s\n"
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "крайне желательно, чтобы Вы обновили Ваши предпочтения и\n"
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"распространили этот ключ, чтобы избежать потенциальных проблем несовпадения "
"алгоритмов\n"
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"Вы можете обновить список предпочтений используя:\n"
"\tgpg --edit-key %s updpref save\n"
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, c-format
msgid "key %s: no user ID\n"
msgstr "ключ %s: не имеет User ID\n"
-#: g10/import.c:749
+#: g10/import.c:750
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "ключ %s: PKS повреждение ключа исправлено\n"
-#: g10/import.c:764
+#: g10/import.c:765
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "ключ %s: принят без самоподписанного User ID \"%s\"\n"
-#: g10/import.c:770
+#: g10/import.c:771
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "ключ %s: нет действительных User ID\n"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr "причиной этого может быть отсутствие самоподписи\n"
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "ключ %s: не найден открытый ключ: %s\n"
-#: g10/import.c:788
+#: g10/import.c:789
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "ключ %s: новый ключ - пропущен\n"
-#: g10/import.c:797
+#: g10/import.c:798
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "нет доступной для записи таблицы ключей: %s\n"
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr "сохраняю в `%s'\n"
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "ошибка записи таблицы ключей `%s': %s\n"
-#: g10/import.c:825
+#: g10/import.c:826
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "ключ %s: открытый ключ \"%s\" импортирован\n"
-#: g10/import.c:849
+#: g10/import.c:850
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "ключ %s: не совпадает с копией хранимой у нас\n"
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "ключ %s: не нахожу оригинальный блок ключей: %s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "ключ %s: не могу прочитать оригинальный блок ключей: %s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "ключ %s: \"%s\" 1 новый User ID\n"
-#: g10/import.c:914
+#: g10/import.c:915
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "ключ %s: \"%s\" %d новых User ID\n"
-#: g10/import.c:917
+#: g10/import.c:918
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "ключ %s: \"%s\" 1 новая подпись\n"
-#: g10/import.c:920
+#: g10/import.c:921
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "ключ %s: \"%s\" %d новых подписей\n"
-#: g10/import.c:923
+#: g10/import.c:924
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "ключ %s: \"%s\" 1 новый подключ\n"
-#: g10/import.c:926
+#: g10/import.c:927
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "ключ %s: \"%s\" %d новых подключей\n"
-#: g10/import.c:929
+#: g10/import.c:930
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "ключ %s: \"%s\" %d подпись очищена\n"
-#: g10/import.c:932
+#: g10/import.c:933
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "ключ %s: \"%s\" %d очищеных подписей\n"
-#: g10/import.c:935
+#: g10/import.c:936
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "ключ %s: \"%s\" %d User ID очищен\n"
-#: g10/import.c:938
+#: g10/import.c:939
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "ключ %s: \"%s\" %d очищенных User ID\n"
-#: g10/import.c:961
+#: g10/import.c:962
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "ключ %s: \"%s\" не изменен\n"
-#: g10/import.c:1124
+#: g10/import.c:1125
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "ключ %s: секретный ключ с недопустимым шифром %d - пропущен\n"
-#: g10/import.c:1135
+#: g10/import.c:1136
msgid "importing secret keys not allowed\n"
msgstr "импортирование секретного ключа не позволено\n"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "нет основной таблицы секретных ключей: %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, c-format
msgid "key %s: secret key imported\n"
msgstr "ключ %s: секретный ключ импортирован\n"
-#: g10/import.c:1193
+#: g10/import.c:1194
#, c-format
msgid "key %s: already in secret keyring\n"
msgstr "ключ %s: уже есть в таблице секретных ключей\n"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "ключ %s: не найден секретный ключ: %s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "ключ %s: нет открытого ключа - не могу применить сертификат отзыва\n"
-#: g10/import.c:1276
+#: g10/import.c:1277
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "ключ %s: неправильный сертификат отзыва: %s - отвергнут\n"
-#: g10/import.c:1308
+#: g10/import.c:1309
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "ключ %s: \"%s\" сертификат отзыва импортирован\n"
-#: g10/import.c:1374
+#: g10/import.c:1375
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "ключ %s: нет User ID для подписи\n"
-#: g10/import.c:1389
+#: g10/import.c:1390
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"ключ %s: неподдерживаемый алгоритм с открытым ключом у User ID \"%s\" \n"
-#: g10/import.c:1391
+#: g10/import.c:1392
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "ключ %s: неправильная самоподпись на User ID \"%s\"\n"
-#: g10/import.c:1409
+#: g10/import.c:1410
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "ключ %s: нет подключа для связывания подключей\n"
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "ключ %s: неподдерживаемый алгоритм с открытым ключом\n"
-#: g10/import.c:1422
+#: g10/import.c:1423
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "ключ %s: неправильная связь подключей\n"
-#: g10/import.c:1437
+#: g10/import.c:1438
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "ключ %s: удалено многократное связывание подключей\n"
-#: g10/import.c:1459
+#: g10/import.c:1460
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "ключ %s: нет подключа для отзывающего ключа\n"
-#: g10/import.c:1472
+#: g10/import.c:1473
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "ключ %s: неправильный отзыв подключа\n"
# test it
-#: g10/import.c:1487
+#: g10/import.c:1488
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "ключ %s: удалена многожественность подключей отзыва\n"
-#: g10/import.c:1529
+#: g10/import.c:1530
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "ключ %s: пропущен User ID \"%s\"\n"
-#: g10/import.c:1550
+#: g10/import.c:1551
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "ключ %s: пропущен подключ\n"
-#: g10/import.c:1577
+#: g10/import.c:1578
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "ключ %s: не экспортируемая подпись (класс 0x%02X) - пропущена\n"
-#: g10/import.c:1587
+#: g10/import.c:1588
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "ключ %s: сертификат отзыва в неправильном месте - пропущен\n"
-#: g10/import.c:1604
+#: g10/import.c:1605
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "ключ %s: неправильный сертификат отзыва: %s - пропущен\n"
-#: g10/import.c:1618
+#: g10/import.c:1619
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "ключ %s: подпись подключа в неправильном месте - пропущена\n"
-#: g10/import.c:1626
+#: g10/import.c:1627
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "ключ %s: неизвестный класс подписи (0x%02X) - пропущена\n"
-#: g10/import.c:1726
+#: g10/import.c:1727
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "ключ %s: обнаружено дублирование User ID - объединены\n"
-#: g10/import.c:1788
+#: g10/import.c:1789
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "ВНИМАНИЕ: ключ %s возможно отозван: запрашиваю ключ отзыва %s\n"
-#: g10/import.c:1802
+#: g10/import.c:1803
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "ВНИМАНИЕ: ключ %s возможно отозван: ключ отзыва %s не получен.\n"
-#: g10/import.c:1861
+#: g10/import.c:1862
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "ключ %s: \"%s\" добавлен сертификат отзыва\n"
-#: g10/import.c:1895
+#: g10/import.c:1896
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "ключ %s: direct key signature добавлена\n"
-#: g10/import.c:2284
+#: g10/import.c:2285
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "ПРЕДУПРЕЖДАЮ: S/N ключа не соответствует S/N ключа на карте\n"
-#: g10/import.c:2292
+#: g10/import.c:2293
msgid "NOTE: primary key is online and stored on card\n"
msgstr "ПРЕДУПРЕЖДАЮ: главный ключ готов и сохранен в карте\n"
-#: g10/import.c:2294
+#: g10/import.c:2295
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "ПРЕДУПРЕЖДАЮ: вторичный ключ готов и сохранен в карте\n"
@@ -2949,8 +2949,8 @@ msgstr "Я очень тщательно проверил этот ключ.\n"
msgid "Really sign? (y/N) "
msgstr "Действительно подписать? (y/N)"
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "не удалось подписать: %s\n"
@@ -3449,7 +3449,7 @@ msgstr ""
"ВНИМАНИЕ: Это ключ PGP2. Добавление фото ID может в некоторых версиях\n"
" PGP вызвать выбраковку ключа.\n"
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Вы уверены, что хотите добавить это? (y/N) "
@@ -3491,12 +3491,32 @@ msgstr "Ничего не удалено.\n"
msgid "invalid"
msgstr "недопустимый"
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "User ID \"%s\" уже очищен\n"
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "ключ %s: \"%s\" %d подпись очищена\n"
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "ключ %s: \"%s\" %d очищеных подписей\n"
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "User ID \"%s\" уже очищен\n"
+
+#: g10/keyedit.c:3252
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "User ID \"%s\" уже очищен\n"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3505,191 +3525,191 @@ msgstr ""
"ВНИМАНИЕ: Это ключ PGP 2.x. Добавление назначенного отзывающим ключа\n"
" может в некоторых версиях PGP вызвать выбраковку ключа.\n"
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3357
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Вы не можете добавить назначенный отзывающим ключ в PGP 2.x ключ.\n"
-#: g10/keyedit.c:3372
+#: g10/keyedit.c:3377
msgid "Enter the user ID of the designated revoker: "
msgstr "Укажите User ID ключа, назначенного отзывающим: "
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3402
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "нельзя назначить ключ PGP 2.x отзывающим\n"
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3417
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "ключ не может быть назначен отзывающим сам себя\n"
-#: g10/keyedit.c:3434
+#: g10/keyedit.c:3439
msgid "this key has already been designated as a revoker\n"
msgstr "этот ключ уже назначен отзывающим\n"
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3458
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "ВНИМАНИЕ: назначение ключа отзывающим невозможно будет отменить!\n"
-#: g10/keyedit.c:3459
+#: g10/keyedit.c:3464
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N)"
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3525
msgid "Please remove selections from the secret keys.\n"
msgstr "Снимите выделение с секретного ключа.\n"
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3531
msgid "Please select at most one subkey.\n"
msgstr "Выделите не менее одного подключа.\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
msgid "Changing expiration time for a subkey.\n"
msgstr "Смена срока действительности подключа.\n"
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
msgid "Changing expiration time for the primary key.\n"
msgstr "Смена срока действия главного ключа\n"
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3584
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Вы не можете изменить срок действия v3 ключа\n"
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3600
msgid "No corresponding signature in secret ring\n"
msgstr "Нет соответствующей подписи в связке секретных\n"
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3673
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr ""
"ВНИМАНИЕ: подписываемый подключ %s не имеет перекрестной сертификации\n"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
msgid "Please select exactly one user ID.\n"
msgstr "Выберите только один User ID.\n"
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "пропуск v3 самоподписи на User ID \"%s\"\n"
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr "Введите URL предпочтаемого сервера ключей: "
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Вы действительно хотите заменить его? (y/N)"
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4132
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Вы действительно хотите удалить его? (y/N)"
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4194
#, fuzzy
msgid "Enter the notation: "
msgstr "Примечание к подписи"
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Перезаписать (y/N)? "
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, c-format
msgid "No user ID with index %d\n"
msgstr "Нет User ID с индексом %d\n"
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4465
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Нет User ID с хешем %s\n"
# c-format
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, c-format
msgid "No subkey with index %d\n"
msgstr "Нет подключа с индексом %d\n"
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "User ID: \"%s\"\n"
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "подписано Вашим ключом %s от %s%s%s\n"
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr " (не экспортируемая)"
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Срок действительности подписи закончился %s.\n"
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Вы уверены, что хотите отозвать? (y/N) "
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4644
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4671
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Вы подписали данные User ID на ключе %s:\n"
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
msgid " (non-revocable)"
msgstr " (не отзываемая)"
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "отзыв Вашим ключом %s от %s\n"
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr "Вы отзываете следующие подписи:\n"
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
msgid "Really create the revocation certificates? (y/N) "
msgstr "Действительно создать сертификат отзыва? (y/N) "
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr "нет секретного ключа\n"
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "User ID \"%s\" уже отозван\n"
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4863
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "ВНИМАНИЕ: User ID подпись датирована %d секундами в будущем\n"
-#: g10/keyedit.c:4922
+#: g10/keyedit.c:4927
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Ключ %s уже отозван\n"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Подключ %s уже отозван\n"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Показ %s фото ID размера %ld для ключа %s (uid %d)\n"
@@ -4300,7 +4320,7 @@ msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Введите число(а), N) Следующий или Q) Выход> "
# test it
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
@@ -4334,102 +4354,102 @@ msgstr "поиск \"%s\" на %s сервере %s\n"
msgid "searching for names from %s\n"
msgstr "поиск \"%s\" на %s\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "отправляю ключ %s на %s сервер %s\n"
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, c-format
msgid "sending key %s to %s\n"
msgstr "отправка ключа %s на %s\n"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "поиск \"%s\" на %s сервере %s\n"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "поиск \"%s\" на %s\n"
# test it
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
msgid "no keyserver action!\n"
msgstr ""
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "ВНИМАНИЕ: обработчик сервера ключей от другой версии GnuPG (%s)\n"
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr "сервер ключей не прислал VERSION\n"
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr "не заданы серверы ключей (используйте --keyserver)\n"
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr "Данная сборка не поддерживает внешние вызовы для сервера ключей.\n"
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr "нет обработчика для схемы сервера ключей `%s'\n"
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "действие `%s' не поддерживается серверами ключей `%s'\n"
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, c-format
msgid "%s does not support handler version %d\n"
msgstr "%s не поддерживает версию обработчика %d\n"
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
msgid "keyserver timed out\n"
msgstr "превышено время ожидания сервера ключей\n"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
msgid "keyserver internal error\n"
msgstr "ошибка сервера ключей\n"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "ошибка связи с сервером ключей: %s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" не идентификатор ключа: пропущен\n"
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %s: %s\n"
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "обновление 1 ключа из %s\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "обновление %d ключей из %s\n"
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %s: %s\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %s: %s\n"
@@ -4839,11 +4859,11 @@ msgstr "Введите пароль\n"
msgid "cancelled by user\n"
msgstr "прервано пользователем\n"
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
msgid "can't query passphrase in batch mode\n"
msgstr "не могу получить пароль в пакетном режиме\n"
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "Введите пароль: "
@@ -4864,7 +4884,7 @@ msgstr "%u-бит %s ключ, ID %s, создан %s"
msgid " (subkey on main key ID %s)"
msgstr " (подключ на главном ключе %s)"
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "Повторите пароль: "
diff --git a/po/sk.po b/po/sk.po
index 059067f14..92456906d 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: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\n"
"PO-Revision-Date: 2004-07-20 15:52+0200\n"
"Last-Translator: Michal Majer <[email protected]>\n"
"Language-Team: Slovak <[email protected]>\n"
@@ -39,7 +39,7 @@ msgstr "zapisujem tajn� k��� do `%s'\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -75,7 +75,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:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, c-format
@@ -304,77 +304,77 @@ msgstr ""
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr "ASCII k�dovanie: %s\n"
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr "neplatn� hlavi�ka ASCII k�dovania: "
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr "ASCII hlavi�ka: "
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr "neplatn� hlavi�ka podpisu v �itate�nom form�te\n"
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr "vnoren� podpisy v �itate�nom form�tu\n"
-#: g10/armor.c:568
+#: g10/armor.c:620
#, fuzzy
msgid "unexpected armor: "
msgstr "neo�ak�van� k�dovanie ASCII:"
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr "nespr�vne ozna�enie riadku m�nusmi: "
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, 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:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr "pred�asn� koniec s�boru (�iadne CRC)\n"
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr "pred�asn� koniec s�boru (v CRC)\n"
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr "nespr�vny form�t CRC\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "Chyba CRC; %06lx - %06lx\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "pred�asn� koniec s�boru (v p�ti�ke)\n"
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr "chyba v p�ti�ke\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, 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:1167
+#: g10/armor.c:1219
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -466,7 +466,7 @@ msgstr "�iadny zodpovedaj�ci verejn� k���: %s\n"
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
@@ -742,7 +742,7 @@ msgstr "Opakujte heslo: "
msgid "PIN not correctly repeated; try again"
msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -752,13 +752,13 @@ msgstr "nemo�no otvori� `%s'\n"
msgid "--output doesn't work for this command\n"
msgstr "--output pre tento pr�kaz nefunguje\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "k��� `%s' nebol n�jden�: %s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %s\n"
@@ -871,23 +871,23 @@ msgstr ""
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s za�ifrovan� pre: %s\n"
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr "%s za�ifrovan� d�ta\n"
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"VAROVANIE: spr�va bola za�ifrovan� slab�m k���om v symetrickej �ifre.\n"
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
msgid "problem handling encrypted packet\n"
msgstr "probl�m so za�ifrovan�m paketom\n"
@@ -1019,7 +1019,7 @@ msgstr "VAROVANIE: tajn� k��� %08lX nem� jednoduch� SK kontroln� s��et\n"
msgid "WARNING: nothing exported\n"
msgstr "VAROVANIE: ni� nebolo vyexportovan�\n"
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -1027,128 +1027,128 @@ msgstr ""
"@Pr�kazy:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[s�bor]|vytvori� podpis"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "vytvori� podpis oddelen� od dokumentu"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "�ifrova� d�ta"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr "�ifrovanie len so symetrickou �ifrou"
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "de�ifrova� d�ta (implicitne)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "verifikova� podpis"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "vyp�sa� zoznam k���ov"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "vyp�sa� zoznam k���ov a podpisov"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
#, fuzzy
msgid "list and check key signatures"
msgstr "skontrolova� podpisy k���ov"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "vyp�sa� zoznam k���ov a fingerprintov"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "vyp�sa� zoznam tajn�ch k���ov"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "vytvori� nov� p�r k���ov"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "remove keys from the public keyring"
msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
msgid "remove keys from the secret keyring"
msgstr "odstr�ni� k��� zo s�boru tajn�ch k���ov"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "podp�sa� k���"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "podp�sa� k��� lok�lne"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "podp�sa� alebo modifikova� k���"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr "vytvori� revoka�n� certifik�t"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "exportova� k���e"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "exportova� k���e na server k���ov"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "importova� k���e zo servera k���ov"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "search for keys on a key server"
msgstr "vyh�ada� k���e na serveri k���ov"
-#: g10/gpg.c:411
+#: g10/gpg.c:412
msgid "update all keys from a keyserver"
msgstr "aktualizova� v�etky k���e zo servera k���ov"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "importova�/zl��i� k���e"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr "aktualizova� datab�zu d�very"
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr "|algo [s�bory]|vyp�� hash"
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1158,55 +1158,55 @@ msgstr ""
"Mo�nosti:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|MENO|�ifrova� pre MENO"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
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/gpg.c:456
+#: g10/gpg.c:457
msgid "|N|set compress level N (0 disables)"
msgstr ""
"|N|nastavi� �rove� komprim�cie N (0 - �iadna\n"
" komprim�cia)"
-#: g10/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr "pou�i� k�nonick� textov� m�d"
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "pou�i� ako v�stupn� s�bor"
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "s dodato�n�mi inform�ciami"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "nevykona� �iadne zmeny"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr "vy�iada� potvrdenie pred prep�san�m"
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr ""
-#: g10/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1215,7 +1215,7 @@ msgstr ""
"(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
"mo�nost�)\n"
-#: g10/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1235,17 +1235,17 @@ msgstr ""
" --list-keys [men�] vyp�sa� k���e\n"
" --fingerprint [men�] vyp�sa� fingerprinty\n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
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/gpg.c:778
+#: g10/gpg.c:780
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
-#: g10/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1255,7 +1255,7 @@ msgstr ""
"podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
"implicitn� oper�cie z�visia od vstupn�ch d�t\n"
-#: g10/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1263,586 +1263,586 @@ msgstr ""
"\n"
"Podporovan� algoritmy:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr "Verejn� k���e: "
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr "�ifry: "
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr "Hash: "
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
msgid "Compression: "
msgstr "Kompresia: "
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "pou�itie: gpg [mo�nosti] "
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "konfliktn� pr�kazy\n"
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, fuzzy, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "no = podpis n�jden� v defin�cii skupiny \"%s\"\n"
-#: g10/gpg.c:1259
+#: g10/gpg.c:1261
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, fuzzy, c-format
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/gpg.c:1277
+#: g10/gpg.c:1279
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
-#: g10/gpg.c:1286
+#: g10/gpg.c:1288
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
-#: g10/gpg.c:1289
+#: g10/gpg.c:1291
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
-#: g10/gpg.c:1295
+#: g10/gpg.c:1297
#, fuzzy, c-format
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/gpg.c:1298
+#: g10/gpg.c:1300
#, fuzzy, c-format
msgid ""
"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/gpg.c:1301
+#: g10/gpg.c:1303
#, fuzzy, c-format
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/gpg.c:1442
+#: g10/gpg.c:1444
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
#, fuzzy
msgid "show all notations during signature listings"
msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "uk� v ktorom s�bore k���ov je vyp�san� k���"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, 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/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "POZN�MKA: neexistuje implicitn� s�bor s mo�nos�ami `%s'\n"
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr "s�bor s mo�nos�ami `%s': %s\n"
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr "��tam mo�nosti z `%s'\n"
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "POZN�MKA: %s nie je pre norm�lne pou�itie!\n"
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, 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/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s nie je platn� znakov� sada\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s nie je platn� znakov� sada\n"
-#: g10/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "neplatn� parameter pre export\n"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: neplatn� parameter pre import\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
msgid "invalid import options\n"
msgstr "neplatn� parameter pre import\n"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
msgid "invalid export options\n"
msgstr "neplatn� parameter pre export\n"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: neplatn� parameter pre import\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
#, fuzzy
msgid "invalid list options\n"
msgstr "neplatn� parameter pre import\n"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s nie je platn� znakov� sada\n"
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s nie je platn� znakov� sada\n"
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
#, fuzzy
msgid "invalid verify options\n"
msgstr "neplatn� parameter pre export\n"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nemo�no nastavi� exec-path na %s\n"
-#: g10/gpg.c:2764
+#: g10/gpg.c:2768
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
msgid "WARNING: program may create a core file!\n"
msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
-#: g10/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROVANIE: %s prep��e %s\n"
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Nie je dovolen� pou��va� %s s %s!\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ned�va s %s zmysel!\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2865
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
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/gpg.c:2896
+#: g10/gpg.c:2900
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/gpg.c:2902
+#: g10/gpg.c:2906
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/gpg.c:2915
+#: g10/gpg.c:2919
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/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr "vybran� hashovac� algoritmus je neplatn�\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
msgid "selected certification digest algorithm is invalid\n"
msgstr "vybran� hashovac� algoritmus je neplatn�\n"
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
msgid "completes-needed must be greater than 0\n"
msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
#, 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/gpg.c:3021
+#: g10/gpg.c:3025
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/gpg.c:3023
+#: g10/gpg.c:3027
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/gpg.c:3026
+#: g10/gpg.c:3030
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/gpg.c:3030
+#: g10/gpg.c:3034
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "neplatn� m�d S2K; mus� by� 0, 1 alebo 3\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3041
msgid "invalid default preferences\n"
msgstr "neplatn� defaultn� predvo�by\n"
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
msgid "invalid personal cipher preferences\n"
msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
msgid "invalid personal digest preferences\n"
msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
msgid "invalid personal compress preferences\n"
msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s e�te nepracuje s %s\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, 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/gpg.c:3139
+#: g10/gpg.c:3143
#, 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/gpg.c:3144
+#: g10/gpg.c:3148
#, 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/gpg.c:3246
+#: g10/gpg.c:3250
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "nem��em inicializova� datab�zu d�very: %s\n"
-#: g10/gpg.c:3257
+#: g10/gpg.c:3261
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/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [meno s�boru]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [meno s�boru]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "de�ifrovanie zlyhalo: %s\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [meno s�boru]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [meno s�boru]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, 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/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--sign [meno s�boru]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [meno s�boru]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [meno s�boru]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, 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/gpg.c:3376
+#: g10/gpg.c:3380
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [meno s�boru]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [meno s�boru]"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [meno s�boru]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key id u��vate�a"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key id u��vate�a"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id u��vate�a [pr�kazy]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
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/gpg.c:3556
+#: g10/gpg.c:3560
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "nepodarilo posla� k��� na server: %s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, c-format
msgid "key export failed: %s\n"
msgstr "nepodaril sa export k���a: %s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "nepodarilo sa n�js� server: %s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "aktualiz�cia servera zlyhala: %s\n"
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
-#: g10/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "neplatn� hashovac� algoritmus `%s'\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[meno s�boru]"
-#: g10/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr "Za�nite p�sa� svoju spr�vu ...\n"
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
msgid "the given certification policy URL is invalid\n"
msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
msgid "the given signature policy URL is invalid\n"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
-#: g10/gpg.c:4193
+#: g10/gpg.c:4197
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
@@ -1869,7 +1869,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Neplatn� k��� %08lX zmenen� na platn� pomocou --always-non-selfsigned-uid\n"
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, fuzzy, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "existuje tajn� k��� pre tento verejn� k��� %08lX!\n"
@@ -2268,431 +2268,431 @@ msgstr "nepou�ite�n� tajn� k���"
msgid "remove as much as possible from key after import"
msgstr ""
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr "blok typu %d bol presko�en�\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu k���e boli doteraz spracovan�\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Celkovo spracovan�ch k���ov: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " presko�en� nov� k���e: %lu\n"
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " bez identifik�torov: %lu\n"
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr " importovan�: %lu"
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr " bez zmien: %lu\n"
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nov� id u��vate�ov: %lu\n"
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nov� podk���e: %lu\n"
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr " nov� podpisy: %lu\n"
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nov� revok�cie k���ov: %lu\n"
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr " pre��tan� tajn� k���e: %lu\n"
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " importovan� tajn� k���e: %lu\n"
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " tajn� k���e nezmenen�: %lu\n"
-#: g10/import.c:321
+#: g10/import.c:322
#, c-format
msgid " not imported: %lu\n"
msgstr " neimportovan�: %lu\n"
-#: g10/import.c:323
+#: g10/import.c:324
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " nov� podpisy: %lu\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " pre��tan� tajn� k���e: %lu\n"
-#: g10/import.c:566
+#: g10/import.c:567
#, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr ""
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
#, fuzzy
msgid " algorithms on these user IDs:\n"
msgstr "Podp�sali ste nasleduj�ce identifik�tory u��vate�a:\n"
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
-#: g10/import.c:619
+#: g10/import.c:620
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s podpis, hashovac� algoritmus %s\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
-#: g10/import.c:749
+#: g10/import.c:750
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "k��� %08lX: HKP po�kodenie podk���a opraven�\n"
# c-format
-#: g10/import.c:764
+#: g10/import.c:765
#, fuzzy, c-format
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"
-#: g10/import.c:770
+#: g10/import.c:771
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "k��� %08lX: ch�ba platn� identifik�tor u��vate�a\n"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr "m��e to by� sp�soben� ch�baj�cim podpisom k���a n�m sam�m\n"
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "k��� %08lX: verejn� k��� nen�jden�: %s\n"
-#: g10/import.c:788
+#: g10/import.c:789
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "k��� %08lX: nov� k��� - presko�en�\n"
-#: g10/import.c:797
+#: g10/import.c:798
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "nen�jden� zapisovate�n� s�bor k���ov (keyring): %s\n"
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr "zapisujem do '%s'\n"
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "chyba pri z�pise s�boru k���ov (keyring) `%s': %s\n"
-#: g10/import.c:825
+#: g10/import.c:826
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "k��� %08lX: verejn� k��� \"%s\" importovan�\n"
-#: g10/import.c:849
+#: g10/import.c:850
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "k��� %08lX: nezodpoved� na�ej k�pii\n"
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "k��� %08lX: nem��em n�js� origin�lny blok k���a: %s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "k��� %08lX: nem��em ��ta� origin�lny blok k���a: %s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "k��� %08lX: \"%s\" 1 nov� identifik�tor u��vate�a\n"
-#: g10/import.c:914
+#: g10/import.c:915
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
-#: g10/import.c:917
+#: g10/import.c:918
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "k��� %08lX: \"%s\" 1 nov� podpis\n"
-#: g10/import.c:920
+#: g10/import.c:921
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
-#: g10/import.c:923
+#: g10/import.c:924
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "k��� %08lX: \"%s\" 1 nov� podk���\n"
-#: g10/import.c:926
+#: g10/import.c:927
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "k��� %08lX: \"%s\" %d nov�ch podk���ov\n"
-#: g10/import.c:929
+#: g10/import.c:930
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
-#: g10/import.c:932
+#: g10/import.c:933
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
-#: g10/import.c:935
+#: g10/import.c:936
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
-#: g10/import.c:938
+#: g10/import.c:939
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
-#: g10/import.c:961
+#: g10/import.c:962
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "k��� %08lX: \"%s\" bez zmeny\n"
-#: g10/import.c:1124
+#: g10/import.c:1125
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a %d - presko�en�\n"
-#: g10/import.c:1135
+#: g10/import.c:1136
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "nie je nastaven� implicitn� s�bor tajn�ch k���ov %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "k��� %08lX: tajn� k��� importovan�\n"
-#: g10/import.c:1193
+#: g10/import.c:1194
#, fuzzy, c-format
msgid "key %s: already in secret keyring\n"
msgstr "k��� %08lX: je u� v s�bore tajn�ch k���ov\n"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, fuzzy, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "k��� %08lX: nebol n�jden� tajn� k���: %s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"k��� %08lX: ch�ba verejn� k��� - nem��em aplikova� revoka�n� certifik�t\n"
-#: g10/import.c:1276
+#: g10/import.c:1277
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "k��� %08lX: neplatn� revoka�n� certifik�t: %s - zamietnut�\n"
-#: g10/import.c:1308
+#: g10/import.c:1309
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "k��� %08lX: \"%s\" revoka�n� certifik�t importovan�\n"
-#: g10/import.c:1374
+#: g10/import.c:1375
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "k��� %08lX: neexistuje id u��vate�a pre podpis\n"
-#: g10/import.c:1389
+#: g10/import.c:1390
#, fuzzy, c-format
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:1391
+#: g10/import.c:1392
#, fuzzy, c-format
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"
-#: g10/import.c:1409
+#: g10/import.c:1410
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "k��� %08lX: neexistuje podk��� pre viazanie k���ov\n"
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a\n"
-#: g10/import.c:1422
+#: g10/import.c:1423
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "k��� %08lX: neplatn� v�zba podk���a\n"
-#: g10/import.c:1437
+#: g10/import.c:1438
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "k��� %08lX: zmazan� viacn�sobn� v�zba podk���a\n"
-#: g10/import.c:1459
+#: g10/import.c:1460
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "k��� %08lX: neexistuje podk��� na revok�ciu k���a\n"
-#: g10/import.c:1472
+#: g10/import.c:1473
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "k��� %08lX: neplatn� revoka�n� podk���\n"
-#: g10/import.c:1487
+#: g10/import.c:1488
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "k��� %08lX: zmazan� viacn�sobn� revok�cia podk���a\n"
-#: g10/import.c:1529
+#: g10/import.c:1530
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "k��� %08lX: identifik�tor u��vate�a presko�en� '"
-#: g10/import.c:1550
+#: g10/import.c:1551
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "k��� %08lX: podk��� presko�en�\n"
-#: g10/import.c:1577
+#: g10/import.c:1578
#, fuzzy, c-format
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:1587
+#: g10/import.c:1588
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "k��� %08lX: revoka�n� certifik�t na zlom mieste - presko�en� \n"
-#: g10/import.c:1604
+#: g10/import.c:1605
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "k��� %08lX: neplatn� revoka�n� certifik�t: %s - presko�en�\n"
-#: g10/import.c:1618
+#: g10/import.c:1619
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "k��� %08lX: podpis subk���a na zlom mieste - presko�en� \n"
-#: g10/import.c:1626
+#: g10/import.c:1627
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "k��� %08lX: neo�ak�van� podpisov� trieda (0x%02X) - presko�en�\n"
-#: g10/import.c:1726
+#: g10/import.c:1727
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "k��� %08lX: zisten� duplikovan� identifik�tor u��vate�a - zl��en�\n"
-#: g10/import.c:1788
+#: g10/import.c:1789
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"VAROVANIE: k��� %08lX m��e by� revokovan�: sk��am z�ska� revoka�n� k��� %"
"08lX\n"
-#: g10/import.c:1802
+#: g10/import.c:1803
#, 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:1861
+#: g10/import.c:1862
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "k��� %08lX: pridan� revoka�n� certifik�t \"%s\"\n"
-#: g10/import.c:1895
+#: g10/import.c:1896
#, 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/import.c:2284
+#: g10/import.c:2285
#, fuzzy
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "verejn� k��� nes�hlas� s tajn�m!\n"
-#: g10/import.c:2292
+#: g10/import.c:2293
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
-#: g10/import.c:2294
+#: g10/import.c:2295
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
@@ -3021,8 +3021,8 @@ msgstr ""
msgid "Really sign? (y/N) "
msgstr "Skuto�ne podp�sa�? "
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "podpisovanie zlyhalo: %s\n"
@@ -3551,7 +3551,7 @@ 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Ste si ist�, �e ho chcete st�le prida�? (a/N) "
@@ -3594,12 +3594,32 @@ msgstr "Ni� nebolo zmaznan�.\n"
msgid "invalid"
msgstr "neplatn� sp�sob reprezent�cie v ASCII"
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "U��vate�sk� ID \"%s\" je revokovan�."
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "U��vate�sk� ID \"%s\" je revokovan�."
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "U��vate�sk� ID \"%s\" je revokovan�."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
+
+#: g10/keyedit.c:3252
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3608,196 +3628,196 @@ 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:3352
+#: g10/keyedit.c:3357
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:3372
+#: g10/keyedit.c:3377
msgid "Enter the user ID of the designated revoker: "
msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3402
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:3412
+#: g10/keyedit.c:3417
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:3434
+#: g10/keyedit.c:3439
#, 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:3453
+#: g10/keyedit.c:3458
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:3459
+#: g10/keyedit.c:3464
#, fuzzy
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:3520
+#: g10/keyedit.c:3525
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:3526
+#: g10/keyedit.c:3531
#, fuzzy
msgid "Please select at most one subkey.\n"
msgstr "Pros�m, vyberte najviac jeden sekund�rny k���.\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Men�m dobu platnosti sekund�rneho k���a.\n"
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
msgid "Changing expiration time for the primary key.\n"
msgstr "Men�m dobu platnosti prim�rneho k���a.\n"
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3584
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:3595
+#: g10/keyedit.c:3600
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:3668
+#: g10/keyedit.c:3673
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "VAROVANIE: podpisovac� podk��� %08lX nie je kr��ovo certifikovan�\n"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
msgid "Please select exactly one user ID.\n"
msgstr "Pros�m, vyberte pr�ve jedno id u��vate�a.\n"
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, 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:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr ""
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
#, 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:4127
+#: g10/keyedit.c:4132
#, 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:4189
+#: g10/keyedit.c:4194
#, fuzzy
msgid "Enter the notation: "
msgstr "Podpisov� not�cia: "
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Prep�sa� (a/N)? "
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, c-format
msgid "No user ID with index %d\n"
msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4465
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "id u��vate�a: \""
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " podp�san� %08lX v %s%s%s\n"
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr " (nexeportovate�n�)"
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Platnos� podpisu vypr�� %s.\n"
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
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:4639
+#: g10/keyedit.c:4644
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? (a/N)"
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4671
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Podp�sali ste nasleduj�ce identifik�tory u��vate�a:\n"
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
#, fuzzy
msgid " (non-revocable)"
msgstr " (nexeportovate�n�)"
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revokovan� %08lX v %s\n"
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr "Chyst�te sa revokova� tieto podpisy:\n"
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
msgid "Really create the revocation certificates? (y/N) "
msgstr "Skuto�ne vytvori� revoka�n� certifik�ty? (a/N) "
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr "neexistuje tajn� k���\n"
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4863
#, 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:4922
+#: g10/keyedit.c:4927
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@ -4420,7 +4440,7 @@ msgstr "disable"
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "neplatn� parameter pre export\n"
@@ -4455,106 +4475,106 @@ msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
msgid "searching for names from %s\n"
msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"podp�san� Va��m k���om %08lX v %s\n"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
#, fuzzy
msgid "no keyserver action!\n"
msgstr "neplatn� parameter pre export\n"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
#, fuzzy
msgid "keyserver timed out\n"
msgstr "chyba servera k���ov"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
#, fuzzy
msgid "keyserver internal error\n"
msgstr "chyba servera k���ov"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "po�adujem k��� %08lX z %s\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "po�adujem k��� %08lX z %s\n"
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
@@ -4967,12 +4987,12 @@ msgstr "Vlo�i� heslo\n"
msgid "cancelled by user\n"
msgstr "zru�en� u��vate�om\n"
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
#, fuzzy
msgid "can't query passphrase in batch mode\n"
msgstr "v d�vkovom re�ime sa nem��em p�ta� na heslo\n"
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "Vlo�te heslo: "
@@ -4996,7 +5016,7 @@ msgstr "d�ka %u bitov, typ %s, ID %08lX, vytvoren� %s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "Opakujte heslo: "
@@ -6458,18 +6478,6 @@ msgstr "(pravdepodobne ste na t�to �lohu pou�ili nespr�vny program)\n"
#~ msgstr "nemo�no spusti� %s \"%s\": %s\n"
#, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "U��vate�sk� ID \"%s\" je revokovan�."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "U��vate�sk� ID \"%s\" je revokovan�."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "U��vate�sk� ID \"%s\" je revokovan�."
-
-#, fuzzy
#~ msgid "No user IDs are removable.\n"
#~ msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
diff --git a/po/sv.po b/po/sv.po
index da5b2d6f3..7cb472cf1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -23,7 +23,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.6\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\n"
"PO-Revision-Date: 2004-12-01 17:49+0100\n"
"Last-Translator: Per Tunedal <[email protected]>\n"
"Language-Team: Swedish <[email protected]>\n"
@@ -58,7 +58,7 @@ msgstr "skriver hemlig nyckel till \"%s\"\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -94,7 +94,7 @@ msgstr "kan inte läsa \"%s\": %s\n"
msgid "note: random_seed file not updated\n"
msgstr "Obs: random_seed uppdaterades inte\n"
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, c-format
@@ -326,80 +326,80 @@ msgstr ""
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr ""
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr "ASCII-skal: %s\n"
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr "felaktig rubrikrad i ASCII-skalet: "
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr "rad i ASCII-skalet: "
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr "felaktig rubrikrad i klartextsignatur\n"
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr "flera klartextsignaturer går in i varandra\n"
-#: g10/armor.c:568
+#: g10/armor.c:620
#, fuzzy
msgid "unexpected armor: "
msgstr "oväntat ASCII-skal:"
# rader i klartexten som inleds med bindestreck får ett extra bindestreck vid klartextsignatur (för att lättare hitta "---- Begin ..."
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr "felaktig rad som börjar med bindestreck: "
# överhoppad eller hoppades över?
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "hoppade över felaktigt radix64-tecken %02x \n"
# CRC Cyclic Redundancy Checksum används för att upptäcka fel i ascii-skalet. Används allmänt, trots att det inte höjer säkerheten.
-#: g10/armor.c:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr "för tidigt filslut (ingen CRC-summa)\n"
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr "för tidigt filslut (i CRC-summan)\n"
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr "felformaterad CRC-summa\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC-fel; %06lx - %06lx\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "för tidigt filslut (i den avslutande raden)\n"
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr "fel i avslutande rad\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr "hittade ingen giltig OpenPGP-data.\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "felaktigt ASCII-skal: raden är längre än %d tecken\n"
-#: g10/armor.c:1167
+#: g10/armor.c:1219
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -492,7 +492,7 @@ msgstr "ingen tillhörande öppen nyckel: %s\n"
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr "fel vid läsning av \"%s\": %s\n"
@@ -767,7 +767,7 @@ msgid "PIN not correctly repeated; try again"
msgstr "lösenmeningen upprepades inte korrekt; försök igen."
# se förra kommentaren
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -777,13 +777,13 @@ msgstr "kan inte öppna \"%s\"\n"
msgid "--output doesn't work for this command\n"
msgstr "--output kan inte användas för detta kommando\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "hittade inte nyckeln `%s': %s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %s\n"
@@ -900,25 +900,25 @@ msgstr "du kan inte använda %s när du är i %s läge\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s krypterad för: \"%s\"\n"
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr "%s krypterad data\n"
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "krypterad med en okänd algoritm %d\n"
# I vissa algoritmer kan svaga nycklar förekomma. Dessa ska inte användas.
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr ""
"VARNING: meddelandet krypterades med en svag nyckel\n"
"i den symmetriska krypteringen.\n"
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
msgid "problem handling encrypted packet\n"
msgstr "problem vid hanteringen av krypterat paket\n"
@@ -1053,7 +1053,7 @@ msgstr "VARNING: hemliga nyckeln %08lX har ingen enkel SK-kontrollsumma\n"
msgid "WARNING: nothing exported\n"
msgstr "VARNING: exporterade ingenting\n"
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -1061,130 +1061,130 @@ msgstr ""
"@Kommandon:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[fil]|skapa en signatur"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[fil]|skapa en klartext-signatur"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "skapa signatur i en separat fil"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "kryptera data"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr "endast symmetrisk kryptering"
# gnupg dekrypterar data om inget kommando anges dvs. kommandot "decrypt" behöver inte användas.
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "dekryptera data (standard)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "verifiera en signatur"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "visa en lista på nycklar"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "visa en lista på nycklar och signaturer"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
#, fuzzy
msgid "list and check key signatures"
msgstr "verifiera nyckelsignaturer"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "visa en lista på nycklar och fingeravtryck"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "visa en lista på hemliga nycklar"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "generera ett nytt nyckelpar"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "remove keys from the public keyring"
msgstr "ta bort nycklar från den öppna nyckelringen"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
msgid "remove keys from the secret keyring"
msgstr "ta bort nycklar från den hemliga nyckelringen"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "signera en nyckel"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "signera en nyckel lokalt"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "signera eller redigera en nyckel"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr "generera ett spärrcertifikat"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "exportera nycklar"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "exportera nycklar till en nyckelserver"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "importera nycklar från en nyckelserver"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "search for keys on a key server"
msgstr "sök efter nycklar hos en nyckelserver"
-#: g10/gpg.c:411
+#: g10/gpg.c:412
msgid "update all keys from a keyserver"
msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "importera/slå ihop nycklar"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr ""
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr ""
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr ""
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr "uppdatera tillitsdatabasen"
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr "|algo [filer]|skriv ut kontrollsummor"
# Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1194,53 +1194,53 @@ msgstr ""
"Flaggor:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr "skapa utdata med ett ascii-skal"
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|NAMN|kryptera för NAMN"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
msgid "use this user-id to sign or decrypt"
msgstr "använd denna användaridentitet för att signera eller dekryptera"
-#: g10/gpg.c:456
+#: g10/gpg.c:457
msgid "|N|set compress level N (0 disables)"
msgstr "|N|sätt kompressionsnivån till N (0 för att stänga av kompression)"
-#: g10/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr "använd \"ursprunglig text\"-läget"
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "använd som fil för utdata"
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "utförlig"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "gör inga ändringar"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr "Fråga före ersättning"
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr ""
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr ""
# inställningar istället för flaggor?
# Nej, här är det bruksanvisningen för kommandoraden.
-#: g10/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1248,7 +1248,7 @@ msgstr ""
"@\n"
"(Se manualsidan för en komplett lista på alla kommandon och flaggor)\n"
-#: g10/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1268,18 +1268,18 @@ msgstr ""
"--list-keys [namn] visa nycklar\n"
"--fingerprint [namn] visa fingeravtryck\n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
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/gpg.c:778
+#: g10/gpg.c:780
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
# Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: g10/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1289,7 +1289,7 @@ msgstr ""
"signera, kontrollera, kryptera eller dekryptera\n"
"vilken operation som utförs beror på programmets indata\n"
-#: g10/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1297,591 +1297,591 @@ msgstr ""
"\n"
"Stödda algoritmer:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr "öppen nyckel: "
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr "Chiffer: "
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr "Kontrollsumma: "
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
msgid "Compression: "
msgstr "Komprimering: "
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "användning: gpg [flaggor] "
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "motstridiga kommandon\n"
# Vad betyder detta?
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, fuzzy, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
-#: g10/gpg.c:1259
+#: g10/gpg.c:1261
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "VARNING: %s osäker ägare till %s\n"
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "VARNING: %s osäker ägare till %s\n"
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "VARNING: %s osäker ägare till %s\n"
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n"
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n"
-#: g10/gpg.c:1277
+#: g10/gpg.c:1279
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n"
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "VARNING: osäkert att infoga katalogägarskap till %s \"%s\"\n"
-#: g10/gpg.c:1286
+#: g10/gpg.c:1288
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "VARNING: osäkert att infoga katalogägarskap till %s \"%s\"\n"
-#: g10/gpg.c:1289
+#: g10/gpg.c:1291
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "VARNING: osäkert att infoga katalogägarskap till %s \"%s\"\n"
-#: g10/gpg.c:1295
+#: g10/gpg.c:1297
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "VARNING: osäkert att infoga katalogägarskap till %s \"%s\"\n"
-#: g10/gpg.c:1298
+#: g10/gpg.c:1300
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "VARNING: osäkert att infoga katalogägarskap till %s \"%s\"\n"
-#: g10/gpg.c:1301
+#: g10/gpg.c:1303
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "VARNING: osäkert att infoga katalogägarskap till %s \"%s\"\n"
-#: g10/gpg.c:1442
+#: g10/gpg.c:1444
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "okänt configurationspost \"%s\"\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "visa vilken nyckelring den listade nyckeln hör till"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
-#: g10/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "OBS: inställningsfilen \"%s\" saknas\n"
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr "inställningsfil \"%s\": %s\n"
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr "läser inställningar från \"%s\"\n"
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "OBS: %s är inte för normal användning!\n"
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, fuzzy, c-format
msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr "chiffertillägget \"%s\" laddades inte pga osäkra behörigheter\n"
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s är ingen giltig teckentabell\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s är ingen giltig teckentabell\n"
-#: g10/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "kunde inte tolka nyckelserver-URI\n"
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s: felaktiga exportinställningar %d\n"
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "felaktiga exportinställningar\n"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s: felaktiga importinställningar %d\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
msgid "invalid import options\n"
msgstr "felaktiga importinställningar\n"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s: felaktiga exportinställningar %d\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
msgid "invalid export options\n"
msgstr "felaktiga exportinställningar\n"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s: felaktiga importinställningar %d\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
#, fuzzy
msgid "invalid list options\n"
msgstr "felaktiga importinställningar\n"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s är ingen giltig teckentabell\n"
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s är ingen giltig teckentabell\n"
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s: felaktiga exportinställningar %d\n"
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
#, fuzzy
msgid "invalid verify options\n"
msgstr "felaktiga exportinställningar\n"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "kunde inte sätta exec-sökvägen till %s\n"
-#: g10/gpg.c:2764
+#: g10/gpg.c:2768
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s: felaktiga exportinställningar %d\n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr ""
# Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
msgid "WARNING: program may create a core file!\n"
msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
-#: g10/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VARNING: %s gäller istället för %s\n"
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s är inte tillåten tillsammans med %s!\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, 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/gpg.c:2861
+#: g10/gpg.c:2865
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "kunde inte få tillgång till GPG-Agent i denna session\n"
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "skriver hemlig nyckel till \"%s\"\n"
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"du kan bara göra signaturer i en separat fil eller klartextsignaturer\n"
"i --pgp2-läge\n"
-#: g10/gpg.c:2896
+#: g10/gpg.c:2900
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "du kan inte signera och kryptera samtidigt i --pgp2-läge\n"
-#: g10/gpg.c:2902
+#: g10/gpg.c:2906
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) i --pgp2-läge\n"
# IDEA-algoritmen är patenterat i flera länder och finns därför inte med i GnuPG som standard.
-#: g10/gpg.c:2915
+#: g10/gpg.c:2919
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
"för att kryptera meddelanden i --pgp2-läge krävs IDEA-insticksprogrammet\n"
-#: g10/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr "den valda krypteringsalgoritmen är felaktig\n"
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr "den valda kontrollsummealgoritmen är felaktig\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "den valda krypteringsalgoritmen är felaktig\n"
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
msgid "selected certification digest algorithm is invalid\n"
msgstr "den valda kontrollsummealgoritmen är felaktig\n"
# antalet betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
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"
# antalet delvis betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr "variabeln \"marginals-needed\" måste vara större än 1\n"
# Hur djupt GnuPG ska leta i Web-of-trust.
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
#, 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"
# Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:3021
+#: g10/gpg.c:3025
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr ""
"felaktigt standardvärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
# Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:3023
+#: g10/gpg.c:3027
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr ""
"felaktigt minimivärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
# S2K har med krypteringen av hemliga nyckeln att göra
-#: g10/gpg.c:3026
+#: g10/gpg.c:3030
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
-#: g10/gpg.c:3030
+#: g10/gpg.c:3034
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "felaktigt S2K-läge; måste vara 0, 1 eller 3\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3041
msgid "invalid default preferences\n"
msgstr "felaktiga standardinställningar\n"
# Du kan ange de algoritmer du föredrar i prioritetsordning. Då avgör inte enbart standard (symmetrisk kryptering) eller mottagarens preferenser (kryptering till öppen nyckel).
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
msgid "invalid personal cipher preferences\n"
msgstr "felaktig inställning av vilka krypteringsalgoritmer du föredrar\n"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
msgid "invalid personal digest preferences\n"
msgstr "felaktig inställning av vilka checksummealgoritmer du föredrar\n"
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
msgid "invalid personal compress preferences\n"
msgstr "felaktig inställning av vilka kompressionsalgoritmer du föredrar\n"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s fungerar ännu inte med %s\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, fuzzy, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "du kan inte använda chifferalgoritmen \"%s\" när du är i %s läge\n"
-#: g10/gpg.c:3139
+#: g10/gpg.c:3143
#, fuzzy, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "du kan inte använda sammandragsalgoritmen \"%s\" när du är i %s läge\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3148
#, fuzzy, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr ""
"du kan inte använda komprimeringsalgoritmen \"%s\" när du är i %s läge\n"
-#: g10/gpg.c:3246
+#: g10/gpg.c:3250
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
-#: g10/gpg.c:3257
+#: g10/gpg.c:3261
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"VARNING: Du har valt mottagare (-r) trots att symmetrisk kryptering valts\n"
-#: g10/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [filnamn]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [filnamn]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "dekrypteringen misslyckades: %s\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [filnamn]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [filnamn]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, 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/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--sign [filnamn]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnamn]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [filnamn]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, 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/gpg.c:3376
+#: g10/gpg.c:3380
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filnamn]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [filnamn]"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [filnamn]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key användaridentitet"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key användaridentitet"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key användaridentitet [kommandon]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [användaridentitet] [nyckelring]"
-#: g10/gpg.c:3556
+#: g10/gpg.c:3560
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "Sändning till nyckelservern misslyckades: %s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "Hämtning från nyckelservern misslyckades: %s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, c-format
msgid "key export failed: %s\n"
msgstr "Export av nyckeln misslyckades: %s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Sökning på nyckelservern misslyckades: %s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Uppdatering av nyckeln från en nyckelserver misslyckades: %s\n"
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "misslyckades med att skapa ASCII-skal: %s\n"
-#: g10/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "felaktig kontrollsummealgoritm `%s'\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[filnamn]"
-#: g10/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr "Skriv ditt meddelande här ...\n"
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
msgid "the given certification policy URL is invalid\n"
msgstr "den angivna URL som beskriver certifikationspolicy är felaktig\n"
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
msgid "the given signature policy URL is invalid\n"
msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
-#: g10/gpg.c:4193
+#: g10/gpg.c:4197
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
@@ -1906,7 +1906,7 @@ msgstr ""
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "Ogiltig nyckel %08lX tvingat giltig med --allow-non-selfsigned-uid\n"
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, fuzzy, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr ""
@@ -2324,391 +2324,391 @@ msgstr "oanvändbar hemlig nyckel"
msgid "remove as much as possible from key after import"
msgstr ""
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr "hoppar över block av typen %d\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "har behandlat %lu nycklar hittills\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr " Totalt antal behandlade enheter: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " överhoppade nya nycklar: %lu\n"
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " utan användaridentiteter: %lu\n"
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr " importerade: %lu"
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr " oförändrade: %lu\n"
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nya användaridentiteter: %lu\n"
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nya undernycklar: %lu\n"
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr " nya signaturer: %lu\n"
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nya spärrar av nycklar: %lu\n"
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr " antal lästa hemliga nycklar: %lu\n"
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "antal importerade hemliga nycklar: %lu\n"
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "antal oförändrade hemliga nycklar: %lu\n"
-#: g10/import.c:321
+#: g10/import.c:322
#, c-format
msgid " not imported: %lu\n"
msgstr " inte importerade: %lu\n"
-#: g10/import.c:323
+#: g10/import.c:324
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " nya signaturer: %lu\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " antal lästa hemliga nycklar: %lu\n"
-#: g10/import.c:566
+#: g10/import.c:567
#, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr ""
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
#, fuzzy
msgid " algorithms on these user IDs:\n"
msgstr "Du har signerat följande användaridentiteter:\n"
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
-#: g10/import.c:619
+#: g10/import.c:620
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s signatur, sammandragsalgoritm %s\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "nyckel %08lX: ingen användaridentitet\n"
# Undernyckeln är skadad på HKP-servern. Vanligt fel vid många undernycklar.
-#: g10/import.c:749
+#: g10/import.c:750
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "nyckeln %08lX: HKP-skadad undernyckel har reparerats!\n"
# vad innebär fnutten i slutet?
-#: g10/import.c:764
+#: g10/import.c:765
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr ""
"nyckel %08lX: accepterade användaridentitet ID '%s' som saknar egensignatur\n"
-#: g10/import.c:770
+#: g10/import.c:771
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "nyckel %08lX: inga giltiga användaridentiteter\n"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr "detta kan bero på att det saknas en egensignatur\n"
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "nyckel %08lX: hittade ingen öppen nyckel: %s\n"
-#: g10/import.c:788
+#: g10/import.c:789
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "nyckel %08lX: ny nyckel - hoppade över den\n"
-#: g10/import.c:797
+#: g10/import.c:798
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr "skriver till \"%s\"\n"
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
# fixme: I appended the %s -wk
-#: g10/import.c:825
+#: g10/import.c:826
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "nyckel %08lX: importerade öppen nyckel \"%s\"\n"
-#: g10/import.c:849
+#: g10/import.c:850
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "nyckel %08lX: matchar inte vår lokala kopia\n"
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "nyckel %08lX: kan inte hitta det ursprungliga nyckelblocket: %s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "nyckel %08lX: kan inte läsa det ursprungliga nyckelblocket %s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "nyckel %08lX: \"%s\" 1 ny användaridentitet\n"
-#: g10/import.c:914
+#: g10/import.c:915
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "nyckel %08lX: \"%s\" %d nya användar-IDn\n"
-#: g10/import.c:917
+#: g10/import.c:918
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "nyckel %08lX: \"%s\" 1 ny signatur\n"
-#: g10/import.c:920
+#: g10/import.c:921
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "nyckel %08lX: \"%s\" %d nya signaturer\n"
-#: g10/import.c:923
+#: g10/import.c:924
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "nyckel %08lX: \"%s\" 1 ny undernyckel\n"
-#: g10/import.c:926
+#: g10/import.c:927
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "nyckel %08lX: \"%s\" %d nya undernycklar\n"
-#: g10/import.c:929
+#: g10/import.c:930
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "nyckel %08lX: \"%s\" %d nya signaturer\n"
-#: g10/import.c:932
+#: g10/import.c:933
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "nyckel %08lX: \"%s\" %d nya signaturer\n"
-#: g10/import.c:935
+#: g10/import.c:936
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "nyckel %08lX: \"%s\" %d nya användar-IDn\n"
-#: g10/import.c:938
+#: g10/import.c:939
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "nyckel %08lX: \"%s\" %d nya användar-IDn\n"
-#: g10/import.c:961
+#: g10/import.c:962
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "nyckel %08lX: \"%s\" inte ändrad\n"
-#: g10/import.c:1124
+#: g10/import.c:1125
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr ""
"nyckel %08lX: hemlig nyckel med ogiltig krypteringsalgoritm %d - hoppade "
"över den\n"
-#: g10/import.c:1135
+#: g10/import.c:1136
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "skriver hemlig nyckel till \"%s\"\n"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "ingen hemlig nyckelring angiven som standard: %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "nyckel %08lX: den hemliga nyckeln är importerad\n"
-#: g10/import.c:1193
+#: g10/import.c:1194
#, fuzzy, c-format
msgid "key %s: already in secret keyring\n"
msgstr "nyckel %08lX: finns redan i den hemliga nyckelringen\n"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, fuzzy, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "nyckel %08lX: hittade inte den hemliga nyckeln: %s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"nyckel %08lX: öppen nyckel saknas - kan inte spärra nyckeln med "
"spärrcertifikatet\n"
-#: g10/import.c:1276
+#: g10/import.c:1277
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "nyckel %08lX: ogiltigt spärrcertifikat: %s - avvisat\n"
-#: g10/import.c:1308
+#: g10/import.c:1309
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "nyckel %08lX: \"%s\" spärrcertifikat importerat\n"
-#: g10/import.c:1374
+#: g10/import.c:1375
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "nyckel %08lX: ingen användaridentitet för signaturen\n"
# fixme: I appended the %s -wk
-#: g10/import.c:1389
+#: g10/import.c:1390
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"nyckel %08lX: algoritmen för öppna nycklar stöds inte för användar-ID \"%s"
"\"\n"
-#: g10/import.c:1391
+#: g10/import.c:1392
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "nyckel %08lX: ogiltig egensignatur på användar-id \"%s\"\n"
-#: g10/import.c:1409
+#: g10/import.c:1410
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "nyckel %08lX: ingen undernyckel för nyckelbindning\n"
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "nyckel %08lX: algoritmen för öppna nycklar stöds inte\n"
-#: g10/import.c:1422
+#: g10/import.c:1423
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "nyckel %08lX: ogiltig undernyckelbindning\n"
-#: g10/import.c:1437
+#: g10/import.c:1438
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "nyckel %08lX: tog bort multipla bindningar av undernyckel\n"
-#: g10/import.c:1459
+#: g10/import.c:1460
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "nyckel %08lX: ingen undernyckel för spärr av nyckeln\n"
-#: g10/import.c:1472
+#: g10/import.c:1473
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "nyckel %08lX: ogiltig spärr av undernyckel\n"
-#: g10/import.c:1487
+#: g10/import.c:1488
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "nyckel %08lX: tog bort multipla spärrar av undernyckel\n"
-#: g10/import.c:1529
+#: g10/import.c:1530
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "nyckel %08lX: hoppade över användaridentitet '"
-#: g10/import.c:1550
+#: g10/import.c:1551
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "nyckel %08lX: hoppade över undernyckel\n"
-#: g10/import.c:1577
+#: g10/import.c:1578
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr ""
"nyckel %08lX: icke exporterbar signatur (klass %02x) - hoppade över den\n"
-#: g10/import.c:1587
+#: g10/import.c:1588
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr ""
"nyckel %08lX: spärrcertifikat på fel plats - hoppade över certifikatet\n"
# nyckeln eller certifikatet??
-#: g10/import.c:1604
+#: g10/import.c:1605
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "nyckel %08lX: ogiltigt spärrcertifikat: %s - hoppade över det\n"
-#: g10/import.c:1618
+#: g10/import.c:1619
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr ""
@@ -2716,49 +2716,49 @@ msgstr ""
"signaturen\n"
# nyckeln eller klassen?
-#: g10/import.c:1626
+#: g10/import.c:1627
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr ""
"nyckel %08lX: oväntad signaturklass (0x%02X) - hoppade över signaturen\n"
-#: g10/import.c:1726
+#: g10/import.c:1727
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr ""
"nyckel %08lX: användaridentitet hittades flera gånger - slog ihop till en\n"
-#: g10/import.c:1788
+#: g10/import.c:1789
#, fuzzy, c-format
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:1802
+#: g10/import.c:1803
#, 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:1861
+#: g10/import.c:1862
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "nyckel %08lX: \"%s\" spärrcertifikat importerat\n"
-#: g10/import.c:1895
+#: g10/import.c:1896
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "nyckel %08lX: lagt till direkt nyckelsignatur\n"
-#: g10/import.c:2284
+#: g10/import.c:2285
#, fuzzy
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "den öppna nyckel passar inte ihop med den hemliga nyckeln!\n"
-#: g10/import.c:2292
+#: g10/import.c:2293
#, fuzzy
msgid "NOTE: primary key is online and stored on card\n"
msgstr "hoppade över: hemlig nyckel finns redan\n"
-#: g10/import.c:2294
+#: g10/import.c:2295
#, fuzzy
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "hoppade över: hemlig nyckel finns redan\n"
@@ -3092,8 +3092,8 @@ msgstr ""
msgid "Really sign? (y/N) "
msgstr "Vill du verkligen signera? "
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "signeringen misslyckades: %s\n"
@@ -3630,7 +3630,7 @@ msgstr ""
"vissa versioner\n"
" av PGP avvisa denna nyckel.\n"
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Vill du verkligen fortfarande lägga till den? (j/N) "
@@ -3674,12 +3674,32 @@ msgstr "Ingenting raderat.\n"
msgid "invalid"
msgstr "felaktigt skal"
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "Användar-ID \"%s\" är spärrat."
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "Användar-ID \"%s\" är spärrat."
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "Användar-ID \"%s\" är spärrat."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "Användar-ID \"%s\" är redan spärrad\n"
+
+#: g10/keyedit.c:3252
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Användar-ID \"%s\" är redan spärrad\n"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3688,33 +3708,33 @@ 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:3352
+#: g10/keyedit.c:3357
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:3372
+#: g10/keyedit.c:3377
msgid "Enter the user ID of the designated revoker: "
msgstr "Ange användar-ID för spärrnyckeln: "
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3402
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:3412
+#: g10/keyedit.c:3417
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:3434
+#: g10/keyedit.c:3439
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "VARNING: Denna nyckel har spärrats med sin spärrnyckel!\n"
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3458
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "VARNING: det går aldrig att ändra om du utser en spärrnyckel!\n"
# designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
-#: g10/keyedit.c:3459
+#: g10/keyedit.c:3464
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3722,173 +3742,173 @@ msgstr ""
"Är du verkligen säker på att du vill utse denna nyckel till spärrnyckel? (j/"
"N): "
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3525
msgid "Please remove selections from the secret keys.\n"
msgstr "Tag bort markeringar från de hemliga nycklarna.\n"
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3531
#, fuzzy
msgid "Please select at most one subkey.\n"
msgstr "Välj som högst en undernyckel.\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Ändrar giltighetstid för en undernyckel.\n"
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
msgid "Changing expiration time for the primary key.\n"
msgstr "Ändrar giltighetstid för huvudnyckeln.\n"
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3584
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:3595
+#: g10/keyedit.c:3600
msgid "No corresponding signature in secret ring\n"
msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
# Vad betyder det?
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3673
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "VARNING: Signeringsundernyckeln %08lX är inte korscertifierad\n"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
msgid "Please select exactly one user ID.\n"
msgstr "Du måste välja bara en användaridentitet.\n"
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "hoppar över v3 egensignatur på användar-id \"%s\"\n"
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr ""
# Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Vill du verkligen använda det (j/N)?"
# Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4132
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Vill du verkligen använda det (j/N)?"
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4194
#, fuzzy
msgid "Enter the notation: "
msgstr "Signaturnotering: "
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Skriv över (j/N)? "
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, c-format
msgid "No user ID with index %d\n"
msgstr "Ingen användaridentitet med index %d\n"
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4465
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Ingen användaridentitet med index %d\n"
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Ingen användaridentitet med index %d\n"
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "användaridentitet: \""
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr ""
"\"\n"
"signerad med din nyckel %08lX %s\n"
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr " (icke exporterbar)"
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Denna signatur gick ut den %s.\n"
# nyckel? signatur?
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Vill du verkligen spärra denna nyckel? (j/N)"
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4644
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Vill du skapa ett spärrcertifikat för denna signatur? (j/N)"
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4671
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Du har signerat följande användaridentiteter:\n"
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
#, fuzzy
msgid " (non-revocable)"
msgstr " (icke exporterbar)"
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " spärrad av %08lX %s\n"
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr "Du står i begrepp att återkalla dessa signaturer:\n"
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
msgid "Really create the revocation certificates? (y/N) "
msgstr "Vill du verkligen skapa spärrcertifikatet? (y/N) "
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr "ingen hemlig nyckel\n"
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "Användar-ID \"%s\" är redan spärrad\n"
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4863
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"VARNING: en signatur på ett användar-ID är daterad %d sekunder in i "
"framtiden\n"
-#: g10/keyedit.c:4922
+#: g10/keyedit.c:4927
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "Användar-ID \"%s\" är redan spärrad\n"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Användar-ID \"%s\" är redan spärrad\n"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Visar %s foto-ID med storleken %ld för nyckeln 0x%08lX (uid %d)\n"
@@ -4517,7 +4537,7 @@ msgstr "disable"
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr ""
@@ -4552,104 +4572,104 @@ msgstr "söker \"%s\" från HKP-server %s\n"
msgid "searching for names from %s\n"
msgstr "söker \"%s\" från HKP-server %s\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, fuzzy, c-format
msgid "sending key %s to %s server %s\n"
msgstr "söker \"%s\" från HKP-server %s\n"
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr "begär nyckel %08lX från %s\n"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, fuzzy, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "söker \"%s\" från HKP-server %s\n"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, fuzzy, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "söker \"%s\" från HKP-server %s\n"
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
#, fuzzy
msgid "no keyserver action!\n"
msgstr "nyckelserverfel"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr ""
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr ""
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr ""
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr ""
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, c-format
msgid "%s does not support handler version %d\n"
msgstr ""
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
#, fuzzy
msgid "keyserver timed out\n"
msgstr "nyckelserverfel"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
#, fuzzy
msgid "keyserver internal error\n"
msgstr "nyckelserverfel"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, fuzzy, c-format
msgid "keyserver communications error: %s\n"
msgstr "Hämtning från nyckelservern misslyckades: %s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "VARNING: kan inte ta bort tempfil (%s) `%s': %s\n"
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, fuzzy, c-format
msgid "refreshing 1 key from %s\n"
msgstr "begär nyckel %08lX från %s\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, fuzzy, c-format
msgid "refreshing %d keys from %s\n"
msgstr "begär nyckel %08lX från %s\n"
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "VARNING: kan inte ta bort tempfil (%s) `%s': %s\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "VARNING: kan inte ta bort tempfil (%s) `%s': %s\n"
@@ -5066,12 +5086,12 @@ msgstr "Ange lösenmening\n"
msgid "cancelled by user\n"
msgstr "avbruten av användaren\n"
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
#, fuzzy
msgid "can't query passphrase in batch mode\n"
msgstr "kan inte fråga efter lösenmening i batch-läge\n"
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "Ange lösenmening: "
@@ -5095,7 +5115,7 @@ msgstr "%u-bits %s-nyckel, ID %08lX, skapad %s"
msgid " (subkey on main key ID %s)"
msgstr ""
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "Repetera lösenmeningen: "
@@ -6607,18 +6627,6 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
#~ msgstr "Kunde inte köra %s \"%s\": %s\n"
#, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "Användar-ID \"%s\" är spärrat."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "Användar-ID \"%s\" är spärrat."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "Användar-ID \"%s\" är spärrat."
-
-#, fuzzy
#~ msgid "No user IDs are removable.\n"
#~ msgstr "Användar-ID \"%s\" är redan spärrad\n"
diff --git a/po/tr.po b/po/tr.po
index 459868025..a4f36e1e7 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.1\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\n"
"PO-Revision-Date: 2005-03-16 07:30+0300\n"
"Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
"Language-Team: Turkish <[email protected]>\n"
@@ -41,7 +41,7 @@ msgstr "gizli anahtarı `%s'e yazıyor\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -77,7 +77,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:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, c-format
@@ -303,75 +303,75 @@ msgstr ""
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr "zırh: %s\n"
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr "zırh başlığı geçersiz: "
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr "zırh başlığı: "
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr "açıkça okunabilen imza başlığı geçersiz\n"
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr "açıkça okunabilen imzalar dahil edildi\n"
-#: g10/armor.c:568
+#: g10/armor.c:620
msgid "unexpected armor: "
msgstr "beklenmeyen zırh: "
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr "araçizgisi escape'lı satır geçersiz: "
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "geçersiz radix64 karakteri %02X atlandı\n"
-#: g10/armor.c:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr "dosya sonu belirsiz (CRC yok)\n"
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr "dosya sonu belirsiz (CRC içinde)\n"
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr "CRC bozulmuş\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC hatası; %06lX - %06lX\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
msgid "premature eof (in trailer)\n"
msgstr "dosya sonu belirsiz (kuyruk içinde)\n"
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr "kuyruk satırında hata\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr "geçerli OpenPGP verisi yok\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, 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:1167
+#: g10/armor.c:1219
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@ -457,7 +457,7 @@ msgstr "genel anahtarın alınacağı URL: "
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Hata: URL çok uzun (sınır: %d karakter).\n"
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr "\"%s\" okunurken hata: %s\n"
@@ -715,7 +715,7 @@ msgstr "Bu PIN'i tekrarlayın: "
msgid "PIN not correctly repeated; try again"
msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -725,13 +725,13 @@ msgstr "`%s' açılamadı\n"
msgid "--output doesn't work for this command\n"
msgstr "--output seçeneği bu komutla çalışmaz\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "anahtar \"%s\" yok: %s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %s\n"
@@ -844,22 +844,22 @@ msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s \"%s\" için şifrelendi\n"
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr "%s şifreli veri\n"
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "bilinmeyen algoritma %d ile şifrelenmiş\n"
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr "UYARI: ileti simetrik şifre içindeki zayıf bir anahtarla şifrelendi.\n"
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
msgid "problem handling encrypted packet\n"
msgstr "şifreli paketin elde edilmesinde sorun var\n"
@@ -987,7 +987,7 @@ msgstr "UYARI: gizli anahtar %s basit bir SK sağlamasına sahip değil\n"
msgid "WARNING: nothing exported\n"
msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -995,127 +995,127 @@ msgstr ""
"@Komutlar:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[dosya]|bir imza yapar"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "bağımsız bir imza yapar"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "veriyi şifreler"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr "sadece simetrik şifre ile şifreler"
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "veri şifresini açar (öntanımlı)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "bir imzayı doğrular"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "anahtarları listeler"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "anahtarları ve imzaları listeler"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "list and check key signatures"
msgstr "anahtar imzalarını listeler ve sınar"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "anahtarları ve parmak izlerini listeler"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "gizli anahtarları listeler"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "yeni bir anahtar çifti üretir"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "remove keys from the public keyring"
msgstr "anahtarları genel anahtar zincirinden siler"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
msgid "remove keys from the secret keyring"
msgstr "anahtarları gizli anahtar zincirinden siler"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "bir anahtarı imzalar"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "bir anahtarı yerel olarak imzalar"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "bir anahtarı düzenler ve imzalar"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr "bir yürürlükten kaldırma sertifikası üretir"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "anahtarları gönderir"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "anahtarları bir anahtar sunucusuna gönderir"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "anahtarları bir anahtar sunucusundan indirir"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "search for keys on a key server"
msgstr "bir anahtar sunucusunda anahtarları arar"
-#: g10/gpg.c:411
+#: g10/gpg.c:412
msgid "update all keys from a keyserver"
msgstr "anahtarları bir anahtar sunucusundan günceller"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "anahtarları indirir/katıştırır"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr "kart durumunu basar"
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr "kart üzerindeki veriyi değiştirir"
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr "bir kartın PIN'ini değiştirir"
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr "güvence veritabanını günceller"
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1125,51 +1125,51 @@ msgstr ""
"Seçenekler:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr "ascii zırhlı çıktı oluşturur"
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|İSİM|İSİM için şifreleme yapar"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
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/gpg.c:456
+#: g10/gpg.c:457
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/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr "kurallı metin kipini kullanır"
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "çıktı dosyası olarak kullanılır"
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "çok detaylı"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "hiçbir değişiklik yapmaz"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr "üzerine yazmadan önce sorar"
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr "kesin OpenPGP davranışı etkin olur"
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr "PGP 2.x uyumlu iletiler üretilir"
-#: g10/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1177,7 +1177,7 @@ msgstr ""
"@\n"
"(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
-#: g10/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1197,17 +1197,17 @@ msgstr ""
" --list-keys [isimler] anahtarları listeler\n"
" --fingerprint [isimler] parmak izlerini gösterir\n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"Yazılım hatalarını lütfen <[email protected]> adresine,\n"
"çeviri hatalarını ise <[email protected]> adresine bildiriniz.\n"
-#: g10/gpg.c:778
+#: g10/gpg.c:780
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
-#: g10/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1217,7 +1217,7 @@ msgstr ""
"imzalama, kontrol, şifreleme veya çözme\n"
"öntanımlı işlem girilen veriye bağımlıdır\n"
-#: g10/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1225,567 +1225,567 @@ msgstr ""
"\n"
"Desteklenen algoritmalar:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr "GenAnah: "
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr "Şifre: "
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr "Hash: "
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
msgid "Compression: "
msgstr "Sıkıştırma: "
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "kullanımı: gpg [seçenekler] "
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "çelişen komutlar\n"
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "grup tanımı '%s' içinde = işareti yok\n"
-#: g10/gpg.c:1259
+#: g10/gpg.c:1261
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "UYARI: '%s' evdizininde güvensiz iyelik\n"
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz iyelik\n"
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "UYARI: '%s' eklentisinde güvensiz iyelik\n"
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "UYARI: UYARI: '%s' evdizininde güvensiz izinler\n"
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz izinler\n"
-#: g10/gpg.c:1277
+#: g10/gpg.c:1279
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "UYARI: '%s' eklentisinde güvensiz izinler\n"
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "UYARI: '%s' evdizinindeki ilgili dizinin iyeliği güvensiz\n"
-#: g10/gpg.c:1286
+#: g10/gpg.c:1288
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin iyeliği güvensiz\n"
-#: g10/gpg.c:1289
+#: g10/gpg.c:1291
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "UYARI: '%s' eklentisini içeren dizinin iyeliği güvensiz\n"
-#: g10/gpg.c:1295
+#: g10/gpg.c:1297
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "UYARI: '%s' evdizinindeki ilgili dizinin izinleri güvensiz\n"
-#: g10/gpg.c:1298
+#: g10/gpg.c:1300
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin izinleri güvensiz\n"
-#: g10/gpg.c:1301
+#: g10/gpg.c:1303
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "UYARI: '%s' eklentisini içeren dizinin izinleri güvensiz\n"
-#: g10/gpg.c:1442
+#: g10/gpg.c:1444
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "listedeki bir anahtarın hangi anahtar zincirinde olduğunu gösterir"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, 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/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr "seçenek dosyası \"%s\": %s\n"
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr "\"%s\"den seçenekler okunuyor\n"
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "BİLGİ: %s normal kullanım için değil!\n"
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, c-format
msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr "şifre eklentisi '%s' güvensiz izinlerden dolayı yüklenmedi\n"
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "'%s' geçerli bir karakter kümesi değil\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "'%s' geçerli bir karakter kümesi değil\n"
-#: g10/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
msgid "could not parse keyserver URL\n"
msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
msgid "invalid keyserver options\n"
msgstr "anahtar sunucusu seçenekleri geçersiz\n"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
msgid "invalid import options\n"
msgstr "içselleştirme seçenekleri geçersiz\n"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
msgid "invalid export options\n"
msgstr "dışsallaştırma seçenekleri geçersiz\n"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: liste seçenekleri geçersiz\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
msgid "invalid list options\n"
msgstr "liste seçenekleri geçersiz\n"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
#, fuzzy
msgid "show all notations during signature verification"
msgstr "'%s' geçerli bir karakter kümesi değil\n"
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "'%s' geçerli bir karakter kümesi değil\n"
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
msgid "invalid verify options\n"
msgstr "doğrulama seçenekleri geçersiz\n"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
-#: g10/gpg.c:2764
+#: g10/gpg.c:2768
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
msgid "WARNING: program may create a core file!\n"
msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
-#: g10/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "UYARI: %s %s'i aşıyor\n"
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ile %s birlikte kullanılmaz!\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s, %s ile etkisiz olur!\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2865
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "gpg-agent bu oturumda kullanılamaz\n"
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "%s olmasından dolayı güvensiz bellekle çalıştırılmayacak\n"
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "--pgp2 kipindeyken sadece ayrık veya sade imzalar yapabilirsiniz\n"
-#: g10/gpg.c:2896
+#: g10/gpg.c:2900
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/gpg.c:2902
+#: g10/gpg.c:2906
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/gpg.c:2915
+#: g10/gpg.c:2919
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
-#: g10/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr "seçilen şifre algoritması geçersiz\n"
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr "seçilen özümleme algoritması geçersiz\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
msgid "selected compression algorithm is invalid\n"
msgstr "seçilen şifre algoritması geçersiz\n"
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
msgid "selected certification digest algorithm is invalid\n"
msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
msgid "completes-needed must be greater than 0\n"
msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
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/gpg.c:3021
+#: g10/gpg.c:3025
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/gpg.c:3023
+#: g10/gpg.c:3027
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "asgari sertifika seviyesi geçersiz; 1, 2, ya da 3 olabilir\n"
-#: g10/gpg.c:3026
+#: g10/gpg.c:3030
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
-#: g10/gpg.c:3030
+#: g10/gpg.c:3034
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3041
msgid "invalid default preferences\n"
msgstr "öntanımlı tercihler geçersiz\n"
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
msgid "invalid personal cipher preferences\n"
msgstr "kişisel şifre tercihleri geçersiz\n"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
msgid "invalid personal digest preferences\n"
msgstr "kişisel özümleme tercihleri geçersiz\n"
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
msgid "invalid personal compress preferences\n"
msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s, %s ile henüz çalışmıyor\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
-#: g10/gpg.c:3139
+#: g10/gpg.c:3143
#, 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ılamaz\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3148
#, 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ılamaz\n"
-#: g10/gpg.c:3246
+#: g10/gpg.c:3250
#, 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/gpg.c:3257
+#: g10/gpg.c:3261
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/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [dosyaismi]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [dosyaismi]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "`%s' için simetrik şifreleme başarısız: %s\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [dosyaismi]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [dosyaismi]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "--s2k-mode 0 ile --symmetric --encrypt kullanamazsınız\n"
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "%s kipindeyken --symmetric --encrypt kullanamazsınız\n"
-#: g10/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--sign [dosyaismi]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [dosyaismi]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [dosyaismi]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "--s2k-mode 0 ile --symmetric --sign --encrypt kullanamazsınız\n"
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "%s kipindeyken --symmetric --sign --encrypt kullanamazsınız.\n"
-#: g10/gpg.c:3376
+#: g10/gpg.c:3380
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [DOSYA]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [dosyaismi]"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [dosyaismi]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key kullanıcı-kimliği"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key kullanıcı-kimliği"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key kullanıcı-kimliği [komutlar]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [kullanıcı-kimliği] [anahtar-zinciri]"
-#: g10/gpg.c:3556
+#: g10/gpg.c:3560
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "anahtar sunucusuna gönderim başarısızlığa uğradı: %s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "anahtar sunucusundan alım başarısızlığa uğradı: %s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, c-format
msgid "key export failed: %s\n"
msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "anahtar sunucusunda arama başarısız: %s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "zırhın kaldırılması başarısız: %s\n"
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "zırhlama başarısız: %s\n"
-#: g10/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "`%s' hash algoritması geçersiz\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[dosyaismi]"
-#: g10/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr "İletinizi yazın ...\n"
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
msgid "the given certification policy URL is invalid\n"
msgstr "belirtilen sertifika güvence adresi geçersiz\n"
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
msgid "the given signature policy URL is invalid\n"
msgstr "belirtilen imza güvence adresi geçersiz\n"
-#: g10/gpg.c:4193
+#: g10/gpg.c:4197
msgid "the given preferred keyserver URL is invalid\n"
msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
@@ -1809,7 +1809,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Geçersiz %s anahtarı --allow-non-selfsigned-uid kullanılarak geçerli oldu\n"
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr ""
@@ -2206,434 +2206,434 @@ msgstr "gizli anahtar kullanımdışı"
msgid "remove as much as possible from key after import"
msgstr ""
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr "%d. tür blok atlandı\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, c-format
msgid "%lu keys processed so far\n"
msgstr "şu ana kadar %lu anahtar işlendi\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr "İşlenmiş toplam miktar: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " yeni anahtarlar atlandı: %lu\n"
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " kullanıcı kimliksiz: %lu\n"
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr " alınan: %lu"
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr " değişmedi: %lu\n"
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr " yeni kullanıcı kimliği: %lu\n"
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr " yeni yardımcı anahtarlar: %lu\n"
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr " yeni imzalar: %lu\n"
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr " yeni anahtar iptalleri: %lu\n"
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr " gizli anahtarlar okundu: %lu\n"
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " gizli anahtarlar indirildi: %lu\n"
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " gizli anahtarlar değişmedi: %lu\n"
-#: g10/import.c:321
+#: g10/import.c:322
#, c-format
msgid " not imported: %lu\n"
msgstr " alınamadı: %lu\n"
-#: g10/import.c:323
+#: g10/import.c:324
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " gizli anahtarlar okundu: %lu\n"
-#: g10/import.c:566
+#: g10/import.c:567
#, fuzzy, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr "UYARI: anahtar %s kullanılabilir olmayan tercihler içeriyor\n"
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
#, fuzzy
msgid " algorithms on these user IDs:\n"
msgstr "Bu kullanıcı kimlikler için algoritmalar:\n"
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": şifreleme algoritması %s için tercih edilir\n"
-#: g10/import.c:619
+#: g10/import.c:620
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": özümleme algoritması %s için tercih edilir\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
" \"%s\": sıkıştırma algoritması %s için tercih edilir\n"
"\n"
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "tercihlerinizi güncellemenizi ve\n"
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"olası algoritma uyuşmazlığı sorunlarından kaçınmak için bu anahtarı\n"
"tekrar dağıtmanızı şiddetle öneririz.\n"
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
"tercihlerinizi böyle güncelleyemezsiniz: gpg --edit-key %s updpref save\n"
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, c-format
msgid "key %s: no user ID\n"
msgstr "anahtar %s: kullanıcı kimliği yok\n"
-#: g10/import.c:749
+#: g10/import.c:750
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "anahtar %s: PKS yardımcı anahtar bozulması giderildi\n"
-#: g10/import.c:764
+#: g10/import.c:765
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "anahtar %s: öz-imzalı olmayan kullanıcı kimliği \"%s\" kabul edildi\n"
-#: g10/import.c:770
+#: g10/import.c:771
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "anahtar %s: geçerli kullanıcı kimliği yok\n"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr "bu kayıp bir öz-imza yüzünden meydana gelebilir\n"
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "anahtar %s: genel anahtar yok: %s\n"
-#: g10/import.c:788
+#: g10/import.c:789
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "anahtar %s: yeni anahtar - atlandı\n"
-#: g10/import.c:797
+#: g10/import.c:798
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr "\"%s\"e yazıyor\n"
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "\"%s\" anahtar zincirine yazarken hata oluştu: %s\n"
-#: g10/import.c:825
+#: g10/import.c:826
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "anahtar %s: genel anahtar \"%s\" alındı\n"
-#: g10/import.c:849
+#: g10/import.c:850
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "anahtar %s: bizim kopyamızla eşleşmiyor\n"
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "anahtar %s: özgün anahtar bloku bulunamadı: %s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "anahtar %s: özgün anahtar bloku okunamadı: %s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "anahtar %s: \"%s\" 1 yeni kullanıcı kimliği\n"
-#: g10/import.c:914
+#: g10/import.c:915
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
-#: g10/import.c:917
+#: g10/import.c:918
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "anahtar %s: \"%s\" 1 yeni imza\n"
-#: g10/import.c:920
+#: g10/import.c:921
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "anahtar %s: \"%s\" %d yeni imza\n"
-#: g10/import.c:923
+#: g10/import.c:924
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "anahtar %s: %s 1 yeni yardımcı anahtar\n"
-#: g10/import.c:926
+#: g10/import.c:927
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "anahtar %s: \"%s\" %d yeni yardımcı anahtar\n"
-#: g10/import.c:929
+#: g10/import.c:930
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "anahtar %s: \"%s\" %d yeni imza\n"
-#: g10/import.c:932
+#: g10/import.c:933
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "anahtar %s: \"%s\" %d yeni imza\n"
-#: g10/import.c:935
+#: g10/import.c:936
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
-#: g10/import.c:938
+#: g10/import.c:939
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
-#: g10/import.c:961
+#: g10/import.c:962
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "anahtar %s: \"%s\" değişmedi\n"
-#: g10/import.c:1124
+#: g10/import.c:1125
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "anahtar %s: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
-#: g10/import.c:1135
+#: g10/import.c:1136
msgid "importing secret keys not allowed\n"
msgstr "gizli anahtarı alımına izin verilmez\n"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "öntanımlı gizli anahtar zinciri yok: %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, c-format
msgid "key %s: secret key imported\n"
msgstr "anahtar %s: gizli anahtar alındı\n"
-#: g10/import.c:1193
+#: g10/import.c:1194
#, c-format
msgid "key %s: already in secret keyring\n"
msgstr "anahtar %s: zaten gizli anahtar zincirinde\n"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "anahtar %s: gizli anahtar yok: %s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"anahtar %s: genel anahtar değil - yürürlükten kaldırma sertifikası "
"uygulanamaz\n"
-#: g10/import.c:1276
+#: g10/import.c:1277
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr ""
"anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
-#: g10/import.c:1308
+#: g10/import.c:1309
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası alındı\n"
-#: g10/import.c:1374
+#: g10/import.c:1375
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "anahtar %s: imza için kullanıcı kimliği yok\n"
-#: g10/import.c:1389
+#: g10/import.c:1390
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"anahtar %s: genel anahtar algoritması, kullanıcı kimliği \"%s\" için "
"desteklenmiyor\n"
-#: g10/import.c:1391
+#: g10/import.c:1392
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "anahtar %s: kullanıcı kimliği \"%s\" için öz-imza geçersiz\n"
-#: g10/import.c:1409
+#: g10/import.c:1410
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "anahtar %s: anahtarı garantilemek için yardımcı anahtar yok\n"
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
-#: g10/import.c:1422
+#: g10/import.c:1423
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "anahtar %s: yardımcı anahtar garantileme geçersiz\n"
-#: g10/import.c:1437
+#: g10/import.c:1438
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "anahtar %s: çok sayıda yardımcı anahtar bağlantısı silindi\n"
-#: g10/import.c:1459
+#: g10/import.c:1460
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "anahtar %s: anahtarı yürürlükten kaldırılacak yardımcı anahtar yok\n"
-#: g10/import.c:1472
+#: g10/import.c:1473
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "anahtar %s: yardımcı anahtar yürürlükten kaldırması geçersiz\n"
-#: g10/import.c:1487
+#: g10/import.c:1488
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr ""
"anahtar %s: çok sayıda yardımcı anahtar yürürlükten kaldırması silindi\n"
-#: g10/import.c:1529
+#: g10/import.c:1530
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "anahtar %s: kullanıcı kimliği \"%s\" atlandı\n"
-#: g10/import.c:1550
+#: g10/import.c:1551
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "anahtar %s: yardımcı anahtar atlandı\n"
-#: g10/import.c:1577
+#: g10/import.c:1578
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "anahtar %s: imza gönderilebilir değil (0x%02X sınıfı) - atlandı\n"
-#: g10/import.c:1587
+#: g10/import.c:1588
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "anahtar %s: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
-#: g10/import.c:1604
+#: g10/import.c:1605
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
-#: g10/import.c:1618
+#: g10/import.c:1619
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "anahtar %s: yardımcı anahtar imzası yanlış yerde - atlandı\n"
-#: g10/import.c:1626
+#: g10/import.c:1627
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "anahtar %s: umulmayan imza sınıfı (0x%02X) - atlandı\n"
-#: g10/import.c:1726
+#: g10/import.c:1727
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "anahtar %s: çift kullanıcı kimliği saptandı - birleştirildi\n"
-#: g10/import.c:1788
+#: g10/import.c:1789
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"UYARI: anahtar %s yürürlükten kaldırılmış olmalı: yürürlükten kaldırma "
"anahtarı %s alınıyor\n"
-#: g10/import.c:1802
+#: g10/import.c:1803
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"UYARI: anahtar %s yürürlükten kaldırılmış olabilir: yürürlükten kaldırma "
"anahtarı %s mevcut değil.\n"
-#: g10/import.c:1861
+#: g10/import.c:1862
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası eklendi\n"
-#: g10/import.c:1895
+#: g10/import.c:1896
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
-#: g10/import.c:2284
+#: g10/import.c:2285
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "BİLGİ: bir anahtarın seri numarası kartlardan biriyle uyuşmuyor\n"
-#: g10/import.c:2292
+#: g10/import.c:2293
msgid "NOTE: primary key is online and stored on card\n"
msgstr "BİLGİ: asıl anahtar kart üzerinde saklı ve kullanılabilir\n"
-#: g10/import.c:2294
+#: g10/import.c:2295
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "BİLGİ: ikincil anahtar kart üzerinde saklı ve kullanılabilir\n"
@@ -2935,8 +2935,8 @@ msgstr "Bu anahtarı çok dikkatle sınadım.\n"
msgid "Really sign? (y/N) "
msgstr "Gerçekten imzalayacak mısınız? (e/H) "
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "imzalama başarısız: %s\n"
@@ -3456,7 +3456,7 @@ 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:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Onu yine de eklemek istiyor musunuz? (e/H) "
@@ -3499,12 +3499,32 @@ msgstr "Hiçbir şey silinmedi.\n"
msgid "invalid"
msgstr "geçersiz zırh"
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
+
+#: g10/keyedit.c:3252
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3514,202 +3534,202 @@ msgstr ""
" eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
" ile sonuçlanabilir.\n"
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3357
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:3372
+#: g10/keyedit.c:3377
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:3397
+#: g10/keyedit.c:3402
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:3412
+#: g10/keyedit.c:3417
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:3434
+#: g10/keyedit.c:3439
msgid "this key has already been designated as a revoker\n"
msgstr "bu anahtar zaten onu üreten tarafından yürürlükten kaldırılmıştı\n"
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3458
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:3459
+#: g10/keyedit.c:3464
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 ya da y/N) "
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3525
msgid "Please remove selections from the secret keys.\n"
msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3531
msgid "Please select at most one subkey.\n"
msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
msgid "Changing expiration time for a subkey.\n"
msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
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:3579
+#: g10/keyedit.c:3584
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:3595
+#: g10/keyedit.c:3600
msgid "No corresponding signature in secret ring\n"
msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3673
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "UYARI: yardımcı imzalama anahtarı %s çapraz sertifikalı değil\n"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
msgid "Please select exactly one user ID.\n"
msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, 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:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr "Tercih ettiğiniz sunucunun adresini girin: "
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Onu değiştirmek istediğinizden emin misiniz? (e/H ya da y/N) "
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4132
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Onu silmek istediğinizden emin misiniz? (e/H ya da y/N) "
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4194
#, fuzzy
msgid "Enter the notation: "
msgstr "imza niteleyici: "
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Üzerine yazılsın mı? (e/H ya da y/N) "
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, c-format
msgid "No user ID with index %d\n"
msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4465
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, c-format
msgid "No subkey with index %d\n"
msgstr "%d indisli bir yardımcı anahtar yok\n"
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "Kullanıcı kimliği: \"%s\"\n"
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "%s anahtarınızla %s%s%s de imzalandı\n"
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr " (dışarda geçersiz)"
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
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:4639
+#: g10/keyedit.c:4644
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:4666
+#: g10/keyedit.c:4671
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Bu kullanıcı kimliklerini %s anahtarı üzerinde imzalamışsınız:\n"
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
msgid " (non-revocable)"
msgstr " (yürülükten kaldırılmaz)"
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "%s tarafından %s de yürürlükten kaldırılmış\n"
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
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:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr "gizli anahtar yok\n"
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4863
#, 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:4922
+#: g10/keyedit.c:4927
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Yardımcı anahtar %s zaten yürürlükten kaldırılmış.\n"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@ -4323,7 +4343,7 @@ msgstr "iptal edildi"
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Sayıyı/sayıları girin veya S)onraki ya da Ç)ık >"
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "anahtar sunucu protokolü geçersiz (bizimki %d!=eylemci %d)\n"
@@ -4357,101 +4377,101 @@ msgstr "%3$s sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
msgid "searching for names from %s\n"
msgstr "%2$s adresinde \"%1$s\" aranıyor\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "anahtar %1$s, %3$s sunucusunun %2$s adresine gönderiliyor\n"
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, c-format
msgid "sending key %s to %s\n"
msgstr "%s anahtarı %s adresine gönderiliyor\n"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "%3$s sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "%2$s adresinde \"%1$s\" aranıyor\n"
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
msgid "no keyserver action!\n"
msgstr "bir anahtar sunucusu eylemi yok!\n"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "UYARI: GnuPG'nin başka bir sürümünün anahtar sunucusu eylemcisi (%s)\n"
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr "anahtar sunucusu VERSION göndermiyor\n"
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr "bilinen bir anahtar sunucusu yok (--keyserver seçeneğini kullanın)\n"
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr "harici anahtar sunucusu çağrıları bu kurulumda desteklenmiyor\n"
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr "`%s' anahtar sunucusu şeması için eylemci yok\n"
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "`%s' eylemi `%s' anahtar sunucusu şeması ile desteklenmiyor\n"
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, fuzzy, c-format
msgid "%s does not support handler version %d\n"
msgstr "gpgkeys_%s %d sürümü eylemciyi desteklemiyor\n"
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
msgid "keyserver timed out\n"
msgstr "anahtar sunucusu zamanaşımına uğradı\n"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
msgid "keyserver internal error\n"
msgstr "anahtar sunucusu iç hatası\n"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "anahtar sunucusuyla iletişim hatası: %s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" bir anahtar kimliği değil: atlanıyor\n"
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "1 anahtar %s adresinden tazeleniyor\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "%d anahtar %s adresinden tazeleniyor\n"
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
@@ -4858,11 +4878,11 @@ msgstr "Anahtar parolasını giriniz\n"
msgid "cancelled by user\n"
msgstr "kullanıcı tarafından durduruldu\n"
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
msgid "can't query passphrase in batch mode\n"
msgstr "betik kipinde parola sorgulanamaz\n"
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "Anahtar parolasını girin: "
@@ -4885,7 +4905,7 @@ msgstr "%u bitlik %s anahtarı, %s kimliği ile %s tarihinde üretilmiş"
msgid " (subkey on main key ID %s)"
msgstr " (asıl anahtar kimliği %s üzerinde yardımcı anahtar)"
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "Tekrar: "
@@ -6336,18 +6356,6 @@ msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
#~ msgstr " '%s' çalıştırılamıyor: %s\n"
#, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
-
-#, fuzzy
#~ msgid "No user IDs are removable.\n"
#~ msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2477e3815..d6733162e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.4\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\n"
"PO-Revision-Date: 2006-07-02 10:58+0800\n"
"Last-Translator: Meng Jie <[email protected]>\n"
"Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -45,7 +45,7 @@ msgstr "等待‘%s’上的锁\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -81,7 +81,7 @@ msgstr "无法读取‘%s’:%s\n"
msgid "note: random_seed file not updated\n"
msgstr "注意:随机数种子文件未被更新\n"
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, c-format
@@ -305,75 +305,75 @@ msgstr "目前禁止通过此命令验证管理员 PIN\n"
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "不能存取 %s――无效的 OpenPGP 卡?\n"
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr "ASCII 封装:%s\n"
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr "无效的 ASCII 封装头:"
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr "ASCII 封装头:"
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr "无效的明文签名头\n"
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr "多层明文签名\n"
-#: g10/armor.c:568
+#: g10/armor.c:620
msgid "unexpected armor: "
msgstr "与预期不符的 ASCII 封装:"
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr "以连字符开头的行格式错误:"
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "跳过无效的 64 进制字符 %02x\n"
-#: g10/armor.c:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr "文件先于预期结束(没有 CRC 部分)\n"
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr "文件先于预期结束(CRC 部分未结束)\n"
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr "异常的 CRC\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC 错误:%06lx - %06lx\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
msgid "premature eof (in trailer)\n"
msgstr "文件先于预期结束(于结尾处)\n"
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr "结尾行有问题\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr "找不到有效的 OpenPGP 数据。\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "无效的 ASCII 封装:一行超过 %d 字符\n"
-#: g10/armor.c:1167
+#: g10/armor.c:1219
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr "封装里出现括上的可打印字符――可能是有缺陷的信件传输程序造成的\n"
@@ -457,7 +457,7 @@ msgstr "获取公钥的 URL:"
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "错误:URL 太长(至多 %d 个字符)\n"
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr "读取‘%s’时出错:%s\n"
@@ -713,7 +713,7 @@ msgstr "再次输入此 PIN:"
msgid "PIN not correctly repeated; try again"
msgstr "PIN 再次输入时与首次输入不符;请再试一次"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -723,13 +723,13 @@ msgstr "无法打开‘%s’\n"
msgid "--output doesn't work for this command\n"
msgstr "--output 在这个命令中不起作用\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "密钥‘%s’找不到:%s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %s\n"
@@ -835,22 +835,22 @@ msgstr "您不该将 %s 用于 %s 模式中\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s 已经加密给:“%s”\n"
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr "%s 加密过的数据\n"
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "以未知的算法 %d 加密\n"
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr "警告:报文被使用对称加密算法的弱密钥加密。\n"
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
msgid "problem handling encrypted packet\n"
msgstr "处理加密包有问题\n"
@@ -972,7 +972,7 @@ msgstr "警告:私钥 %s 不存在简单 SK 检验和\n"
msgid "WARNING: nothing exported\n"
msgstr "警告:没有导出任何东西\n"
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -980,127 +980,127 @@ msgstr ""
"@指令:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[文件名]|生成一份签名"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[文件名]|生成一份明文签名"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "生成一份分离的签名"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "加密数据"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr "仅使用对称加密"
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "解密数据(默认)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "验证签名"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "列出密钥"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "列出密钥和签名"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "list and check key signatures"
msgstr "列出并检查密钥签名"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "列出密钥和指纹"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "列出私钥"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "生成一副新的密钥对"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "remove keys from the public keyring"
msgstr "从公钥钥匙环里删除密钥"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
msgid "remove keys from the secret keyring"
msgstr "从私钥钥匙环里删除密钥"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "为某把密钥添加签名"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "为某把密钥添加本地签名"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "编辑某把密钥或为其添加签名"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr "生成一份吊销证书"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "导出密钥"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "把密钥导出到某个公钥服务器上"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "从公钥服务器上导入密钥"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "search for keys on a key server"
msgstr "在公钥服务器上搜寻密钥"
-#: g10/gpg.c:411
+#: g10/gpg.c:412
msgid "update all keys from a keyserver"
msgstr "从公钥服务器更新所有的本地密钥"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "导入/合并密钥"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr "打印卡状态"
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr "更改卡上的数据"
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr "更改卡的 PIN"
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr "更新信任度数据库"
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1110,51 +1110,51 @@ msgstr ""
"选项:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr "输出经 ASCII 封装"
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|某甲|为收件者“某甲”加密"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
msgid "use this user-id to sign or decrypt"
msgstr "使用这个用户标识来签名或解密"
-#: g10/gpg.c:456
+#: g10/gpg.c:457
msgid "|N|set compress level N (0 disables)"
msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
-#: g10/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr "使用标准的文本模式"
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "指定输出文件"
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "详细模式"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "不做任何改变"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr "覆盖前先询问"
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr "行为严格遵循 OpenPGP 定义"
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr "生成与 PGP 2.x 兼容的报文"
-#: g10/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1162,7 +1162,7 @@ msgstr ""
"@\n"
"(请参考在线说明以获得所有命令和选项的完整清单)\n"
-#: g10/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1182,17 +1182,17 @@ msgstr ""
" --list-keys [某甲] 显示密钥\n"
" --fingerprint [某甲] 显示指纹\n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"请向 <[email protected]> 报告程序缺陷。\n"
"请向 <[email protected]> 反映简体中文翻译的问题。\n"
-#: g10/gpg.c:778
+#: g10/gpg.c:780
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
-#: g10/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1202,7 +1202,7 @@ msgstr ""
"签名、检查、加密或解密\n"
"默认的操作依输入数据而定\n"
-#: g10/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1210,559 +1210,559 @@ msgstr ""
"\n"
"支持的算法:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr "公钥:"
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr "对称加密:"
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr "散列:"
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
msgid "Compression: "
msgstr "压缩:"
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "用法:gpg [选项] "
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "冲突的指令\n"
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "在‘%s’组定义里找不到等号(=)\n"
-#: g10/gpg.c:1259
+#: g10/gpg.c:1261
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "警告:用户目录‘%s’所有权不安全\n"
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’所有权不安全\n"
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "警告:扩展模块‘%s’所有权不安全\n"
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "警告:用户目录‘%s’权限不安全\n"
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’权限不安全\n"
-#: g10/gpg.c:1277
+#: g10/gpg.c:1279
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "警告:扩展模块‘%s’权限不安全\n"
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "警告:用户目录‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1286
+#: g10/gpg.c:1288
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1289
+#: g10/gpg.c:1291
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "警告:扩展模块‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1295
+#: g10/gpg.c:1297
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "警告:用户目录‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1298
+#: g10/gpg.c:1300
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1301
+#: g10/gpg.c:1303
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "警告:扩展模块‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1442
+#: g10/gpg.c:1444
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "未知的配置项‘%s’\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr "列出密钥时显示用户标识"
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr "列出签名时显示策略 URL"
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
msgid "show all notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr "列出签名时显示用户提供的注记"
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
msgid "show preferred keyserver URLs during signature listings"
msgstr "列出密钥时显示首选公钥服务器 URL"
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr "列出密钥时显示用户标识的有效性"
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr "列出密钥时显示已吊销或已过期的用户标识"
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr "列出密钥时显示已吊销或已过期的子钥"
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
msgid "show the keyring name in key listings"
msgstr "列出密钥时显示钥匙环的名称"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
msgid "show expiration dates during signature listings"
msgstr "列出签名时显示过期日期"
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "注意:旧式的默认配置文件‘%s’已被忽略\n"
-#: g10/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "注意:没有默认配置文件‘%s’\n"
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr "配置文件‘%s’:%s\n"
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr "从‘%s’读取选项\n"
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "注意:一般情况下不会用到 %s!\n"
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, c-format
msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n"
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "‘%s’不是一个有效的签名过期日期\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "‘%s’不是一个有效的字符集\n"
-#: g10/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
msgid "could not parse keyserver URL\n"
msgstr "无法解析公钥服务器 URL\n"
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d:无效的公钥服务器选项\n"
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
msgid "invalid keyserver options\n"
msgstr "无效的公钥服务器选项\n"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d:无效的导入选项\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
msgid "invalid import options\n"
msgstr "无效的导入选项\n"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d:无效的导出选项\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
msgid "invalid export options\n"
msgstr "无效的导出选项\n"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d:无效的列表选项\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
msgid "invalid list options\n"
msgstr "无效的列表选项\n"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr "验证签名时显示照片标识"
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr "验证签名时显示策略 URL"
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
msgid "show all notations during signature verification"
msgstr "验证签名时显示所有注记"
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr "验证签名时显示 IETF 标准注记"
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr "验证签名时显示用户提供的注记"
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
msgid "show preferred keyserver URLs during signature verification"
msgstr "验证签名时显示首选公钥服务器 URL"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
msgid "show user ID validity during signature verification"
msgstr "验证签名时显示用户标识的有效性"
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr "使用 PKA 数据验证签名的有效性"
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr "提升带有有效 PKA 数据的签名的信任度"
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d:无效的校验选项\n"
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
msgid "invalid verify options\n"
msgstr "无效的校验选项\n"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "无法把运行路径设成 %s\n"
-#: g10/gpg.c:2764
+#: g10/gpg.c:2768
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d:无效的 auto-key-locate 清单\n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr "无效的 auto-key-locate 清单\n"
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
msgid "WARNING: program may create a core file!\n"
msgstr "警告:程序可能会创建核心内存转储!\n"
-#: g10/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告:%s 会使得 %s 失效\n"
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不可与 %s 并用\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 与 %s 并用无意义!\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2865
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "注意:%s 本版本中不可用\n"
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "不会在内存不安全的情况下运行,原因是 %s\n"
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n"
-#: g10/gpg.c:2896
+#: g10/gpg.c:2900
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "您在 --pgp2 模式下时,不能同时签名和加密\n"
-#: g10/gpg.c:2902
+#: g10/gpg.c:2906
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "启用 --pgp2 时您应该只使用文件,而非管道\n"
-#: g10/gpg.c:2915
+#: g10/gpg.c:2919
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
-#: g10/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr "所选的对称加密算法无效\n"
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr "所选的散列算法无效\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
msgid "selected compression algorithm is invalid\n"
msgstr "所选的压缩算法无效\n"
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
msgid "selected certification digest algorithm is invalid\n"
msgstr "所选的证书散列算法无效\n"
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
msgid "completes-needed must be greater than 0\n"
msgstr "需要的完全可信签名数一定要大于 0\n"
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr "需要的勉强可信签名数一定要大于 1\n"
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "最大验证深度一定要介于 1 和 255 之间\n"
-#: g10/gpg.c:3021
+#: g10/gpg.c:3025
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "无效的默认验证级别;一定要是 0,1,2 或 3\n"
-#: g10/gpg.c:3023
+#: g10/gpg.c:3027
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "无效的最小验证级别;一定要是 1,2 或 3\n"
-#: g10/gpg.c:3026
+#: g10/gpg.c:3030
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "注意:强烈不建议使用简单的 S2K 模式(0)\n"
-#: g10/gpg.c:3030
+#: g10/gpg.c:3034
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "无效的 S2K 模式;必须是 0,1 或 3\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3041
msgid "invalid default preferences\n"
msgstr "无效的默认首选项\n"
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
msgid "invalid personal cipher preferences\n"
msgstr "无效的个人对称加密算法首选项\n"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
msgid "invalid personal digest preferences\n"
msgstr "无效的个人散列算法首选项\n"
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
msgid "invalid personal compress preferences\n"
msgstr "无效的个人压缩算法首选项\n"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 尚不能和 %s 并用\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
-#: g10/gpg.c:3139
+#: g10/gpg.c:3143
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3148
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
-#: g10/gpg.c:3246
+#: g10/gpg.c:3250
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "初始化信任度数据库失败:%s\n"
-#: g10/gpg.c:3257
+#: g10/gpg.c:3261
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告:给定了收件人(-r)但并未使用公钥加密\n"
-#: g10/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [文件名]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [文件名]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "对称加密‘%s’失败:%s\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [文件名]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [文件名]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
-#: g10/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--sign [文件名]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [文件名]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [文件名]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
-#: g10/gpg.c:3376
+#: g10/gpg.c:3380
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [文件名]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [文件名]"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [文件名]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key 用户标识"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key 用户标识"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key 用户标识 [指令]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [用户标识] [钥匙环]"
-#: g10/gpg.c:3556
+#: g10/gpg.c:3560
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "上传至公钥服务器失败:%s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "从公钥服务器接收失败:%s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, c-format
msgid "key export failed: %s\n"
msgstr "导出密钥失败:%s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "搜寻公钥服务器失败:%s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "从公钥服务器更新失败:%s\n"
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解开 ASCII 封装失败:%s\n"
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "进行 ASCII 封装失败:%s\n"
-#: g10/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "无效的‘%s’散列算法\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[文件名]"
-#: g10/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr "请开始键入您的报文……\n"
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
msgid "the given certification policy URL is invalid\n"
msgstr "给定的的验证策略 URL 无效\n"
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
msgid "the given signature policy URL is invalid\n"
msgstr "给定的签名策略 URL 无效\n"
-#: g10/gpg.c:4193
+#: g10/gpg.c:4197
msgid "the given preferred keyserver URL is invalid\n"
msgstr "给定的首选公钥服务器 URL 无效\n"
@@ -1785,7 +1785,7 @@ msgstr "自动获取‘%s’,通过 %s\n"
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "公钥 %s 没有相对应的私钥――忽略\n"
@@ -2163,356 +2163,356 @@ msgstr "导入后清除密钥中无用的部分"
msgid "remove as much as possible from key after import"
msgstr "导入后尽可能清除密钥中的可选部分"
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr "跳过 %d 样式的区块\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, c-format
msgid "%lu keys processed so far\n"
msgstr "目前已处理 %lu 把密钥\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr "合计被处理的数量:%lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " 已跳过的新密钥:%lu\n"
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " 遗失用户标识:%lu\n"
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr " 已导入:%lu"
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr " 未改变:%lu\n"
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr " 新用户标识:%lu\n"
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr " 新的子钥:%lu\n"
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr " 新的签名:%lu\n"
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr " 新的密钥吊销:%lu\n"
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr " 读取的私钥:%lu\n"
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " 导入的私钥:%lu\n"
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " 未改变的私钥:%lu\n"
-#: g10/import.c:321
+#: g10/import.c:322
#, c-format
msgid " not imported: %lu\n"
msgstr " 未被导入:%lu\n"
-#: g10/import.c:323
+#: g10/import.c:324
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " 清除的签名:%lu\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " 清除的用户标识:%lu\n"
-#: g10/import.c:566
+#: g10/import.c:567
#, fuzzy, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr "警告:密钥 %s 下列用户标识的首选项中包含不可用的算法:\n"
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
#, fuzzy
msgid " algorithms on these user IDs:\n"
msgstr " 新用户标识:%lu\n"
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " “%s”:对称加密算法 %s 对应首选项\n"
-#: g10/import.c:619
+#: g10/import.c:620
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " “%s”:散列算法 %s 对应首选项\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " “%s”:压缩算法 %s 对应首选项\n"
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "强烈建议您更新您的首选项并重新分发这把密钥,\n"
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr "以避免可能的算法不匹配问题\n"
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "您可以这样更新您的首选项:gpg --edit-key %s updpref save\n"
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, c-format
msgid "key %s: no user ID\n"
msgstr "密钥 %s:没有用户标识\n"
-#: g10/import.c:749
+#: g10/import.c:750
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "密钥 %s:PKS 子钥破损已修复\n"
-#: g10/import.c:764
+#: g10/import.c:765
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "密钥 %s:已接受不含自身签名的用户标识“%s”\n"
-#: g10/import.c:770
+#: g10/import.c:771
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "密钥 %s:没有有效的用户标识\n"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr "这可能由于遗失自身签名所致\n"
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "密钥 %s:找不到公钥:%s\n"
-#: g10/import.c:788
+#: g10/import.c:789
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "密钥 %s:新密钥――已跳过\n"
-#: g10/import.c:797
+#: g10/import.c:798
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "找不到可写的钥匙环:%s\n"
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr "正在写入‘%s’\n"
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "写入钥匙环‘%s’时出错: %s\n"
-#: g10/import.c:825
+#: g10/import.c:826
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "密钥 %s:公钥“%s”已导入\n"
-#: g10/import.c:849
+#: g10/import.c:850
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "密钥 %s:与我们的副本不吻合\n"
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "密钥 %s:无法定位原始的密钥区块:%s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "密钥 %s:无法读取原始的密钥区块: %s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "密钥 %s:“%s”一个新的用户标识\n"
-#: g10/import.c:914
+#: g10/import.c:915
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "密钥 %s:“%s”%d 个新的用户标识\n"
-#: g10/import.c:917
+#: g10/import.c:918
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "密钥 %s:“%s”1 个新的签名\n"
-#: g10/import.c:920
+#: g10/import.c:921
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "密钥 %s:“%s”%d 个新的签名\n"
-#: g10/import.c:923
+#: g10/import.c:924
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "密钥 %s:“%s”1 个新的子钥\n"
-#: g10/import.c:926
+#: g10/import.c:927
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "密钥 %s:“%s”%d 个新的子钥\n"
-#: g10/import.c:929
+#: g10/import.c:930
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "密钥 %s:“%s”%d 个签名被清除\n"
-#: g10/import.c:932
+#: g10/import.c:933
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "密钥 %s:“%s”%d 个签名被清除\n"
-#: g10/import.c:935
+#: g10/import.c:936
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "密钥 %s:“%s”%d 个用户标识被清除\n"
-#: g10/import.c:938
+#: g10/import.c:939
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "密钥 %s:“%s”%d 个用户标识被清除\n"
-#: g10/import.c:961
+#: g10/import.c:962
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "密钥 %s:“%s”未改变\n"
-#: g10/import.c:1124
+#: g10/import.c:1125
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "密钥 %s:私钥使用了无效的加密算法 %d――已跳过\n"
-#: g10/import.c:1135
+#: g10/import.c:1136
msgid "importing secret keys not allowed\n"
msgstr "不允许导入私钥\n"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "没有默认的私钥钥匙环: %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, c-format
msgid "key %s: secret key imported\n"
msgstr "密钥 %s:私钥已导入\n"
-#: g10/import.c:1193
+#: g10/import.c:1194
#, c-format
msgid "key %s: already in secret keyring\n"
msgstr "密钥 %s:已在私钥钥匙环中\n"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "密钥 %s:找不到私钥:%s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "密钥 %s:没有公钥――无法应用吊销证书\n"
-#: g10/import.c:1276
+#: g10/import.c:1277
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "密钥 %s:无效的吊销证书:%s――已拒绝\n"
-#: g10/import.c:1308
+#: g10/import.c:1309
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "密钥 %s:“%s”吊销证书已被导入\n"
-#: g10/import.c:1374
+#: g10/import.c:1375
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "密钥 %s:签名没有用户标识\n"
-#: g10/import.c:1389
+#: g10/import.c:1390
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "密钥 %s:用户标识“%s”使用了不支持的公钥算法\n"
-#: g10/import.c:1391
+#: g10/import.c:1392
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "密钥 %s:用户标识“%s”自身签名无效\n"
-#: g10/import.c:1409
+#: g10/import.c:1410
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "密钥 %s:没有可供绑定的子钥\n"
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "密钥 %s:不支持的公钥算法\n"
-#: g10/import.c:1422
+#: g10/import.c:1423
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "密钥 %s:无效的子钥绑定\n"
-#: g10/import.c:1437
+#: g10/import.c:1438
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "密钥 %s:已删除多重子钥绑定\n"
-#: g10/import.c:1459
+#: g10/import.c:1460
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "密钥 %s:没有用于密钥吊销的子钥\n"
-#: g10/import.c:1472
+#: g10/import.c:1473
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "密钥 %s:无效的子钥吊销\n"
-#: g10/import.c:1487
+#: g10/import.c:1488
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "密钥 %s:已删除多重子钥吊销\n"
-#: g10/import.c:1529
+#: g10/import.c:1530
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "密钥 %s:已跳过用户标识“%s”\n"
-#: g10/import.c:1550
+#: g10/import.c:1551
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "密钥 %s:已跳过子钥\n"
@@ -2521,65 +2521,65 @@ msgstr "密钥 %s:已跳过子钥\n"
# * to import non-exportable signature when we have the
# * the secret key used to create this signature - it
# * seems that this makes sense
-#: g10/import.c:1577
+#: g10/import.c:1578
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "密钥 %s:不可导出的签名(验证级别 0x%02X)――已跳过\n"
-#: g10/import.c:1587
+#: g10/import.c:1588
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "密钥 %s:吊销证书位置错误――已跳过\n"
-#: g10/import.c:1604
+#: g10/import.c:1605
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "密钥 %s:无效的吊销证书:%s――已跳过\n"
-#: g10/import.c:1618
+#: g10/import.c:1619
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "密钥 %s:子钥签名位置错误――已跳过\n"
-#: g10/import.c:1626
+#: g10/import.c:1627
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "密钥 %s:与预期不符的签名验证级别(0x%02X)――已跳过\n"
-#: g10/import.c:1726
+#: g10/import.c:1727
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "密钥 %s:检测到重复的用户标识――已合并\n"
-#: g10/import.c:1788
+#: g10/import.c:1789
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "警告:密钥 %s 可能已被吊销:正在取回吊销密钥 %s\n"
-#: g10/import.c:1802
+#: g10/import.c:1803
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "警告:密钥 %s 可能已被吊销:吊销密钥 %s 不存在。\n"
-#: g10/import.c:1861
+#: g10/import.c:1862
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "密钥 %s:已新增吊销证书“%s”\n"
-#: g10/import.c:1895
+#: g10/import.c:1896
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "密钥 %s:已新增直接密钥签名\n"
-#: g10/import.c:2284
+#: g10/import.c:2285
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "注意:密钥的序列号与卡的不符\n"
-#: g10/import.c:2292
+#: g10/import.c:2293
msgid "NOTE: primary key is online and stored on card\n"
msgstr "注意:主钥在线,存储在卡上\n"
-#: g10/import.c:2294
+#: g10/import.c:2295
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "注意:子钥在线,存储在卡上\n"
@@ -2870,8 +2870,8 @@ msgstr "我非常小心地检查过这把密钥。\n"
msgid "Really sign? (y/N) "
msgstr "真的要签名吗?(y/N)"
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "签名时失败: %s\n"
@@ -3356,7 +3356,7 @@ msgstr ""
"警告:这是一把 PGP2 样式的密钥。\n"
" 增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
msgid "Are you sure you still want to add it? (y/N) "
msgstr "您确定仍然想要增加吗?(y/N)"
@@ -3398,12 +3398,32 @@ msgstr "没有东西被删除。\n"
msgid "invalid"
msgstr "无效"
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "用户标识“%s”:无用部分已清除\n"
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "密钥 %s:“%s”%d 个签名被清除\n"
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "密钥 %s:“%s”%d 个签名被清除\n"
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "用户标识“%s”:无用部分已清除\n"
+
+#: g10/keyedit.c:3252
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "用户标识“%s”:无用部分已清除\n"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3412,193 +3432,193 @@ msgstr ""
"警告:这是一把 PGP2 样式的密钥。\n"
" 增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3357
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
-#: g10/keyedit.c:3372
+#: g10/keyedit.c:3377
msgid "Enter the user ID of the designated revoker: "
msgstr "输入指定吊销者的用户标识:"
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3402
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:3412
+#: g10/keyedit.c:3417
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "您不能将某把密钥设为它自己的指定吊销者\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:3434
+#: g10/keyedit.c:3439
msgid "this key has already been designated as a revoker\n"
msgstr "这把密钥已被指定为一个吊销者\n"
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3458
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "警告:将某把密钥指派为指定吊销者的操作无法撤销!\n"
-#: g10/keyedit.c:3459
+#: g10/keyedit.c:3464
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "您确定要将这把密钥设为指定吊销者吗?(y/N):"
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3525
msgid "Please remove selections from the secret keys.\n"
msgstr "请从私钥中删除选择。\n"
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3531
msgid "Please select at most one subkey.\n"
msgstr "请至多选择一个子钥。\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
msgid "Changing expiration time for a subkey.\n"
msgstr "将要变更子钥的使用期限。\n"
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
msgid "Changing expiration time for the primary key.\n"
msgstr "将要变更主钥的使用期限。\n"
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3584
msgid "You can't change the expiration date of a v3 key\n"
msgstr "您不能变更 v3 密钥的使用期限\n"
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3600
msgid "No corresponding signature in secret ring\n"
msgstr "在私钥环里没有相应的签名\n"
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3673
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "签名的子钥 %s 已经交叉验证\n"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr "子钥 %s 不签名,因此不需要交叉验证\n"
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
msgid "Please select exactly one user ID.\n"
msgstr "请精确地选择一个用户标识。\n"
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "跳过用户标识“%s”的 v3 自身签名\n"
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr "输入您首选的公钥服务器的 URL:"
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
msgid "Are you sure you want to replace it? (y/N) "
msgstr "您确定要替换它吗?(y/N)"
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4132
msgid "Are you sure you want to delete it? (y/N) "
msgstr "您确定要删除它吗?(y/N)"
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4194
msgid "Enter the notation: "
msgstr "输入注记:"
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
msgid "Proceed? (y/N) "
msgstr "继续?(y/N)"
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, c-format
msgid "No user ID with index %d\n"
msgstr "没有索引为 %d 的用户标识\n"
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4465
#, c-format
msgid "No user ID with hash %s\n"
msgstr "没有散列值为 %s 的用户标识\n"
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, c-format
msgid "No subkey with index %d\n"
msgstr "没有索引为 %d 的子钥\n"
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "用户标识:“%s”\n"
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "由您的密钥 %s 于 %s%s%s 签名\n"
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr " (不可导出)"
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, c-format
msgid "This signature expired on %s.\n"
msgstr "这份签名已在 %s 过期。\n"
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "您确定您仍然想要吊销它吗?(y/N)"
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4644
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "要为这份签名生成一份吊销证书吗?(y/N)"
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4671
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "您已经为这些密钥 %s 上的这些用户标识添加签名:\n"
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
msgid " (non-revocable)"
msgstr " (不可吊销)"
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "由您的密钥 %s 于 %s 吊销\n"
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr "您正在吊销这些签名:\n"
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
msgid "Really create the revocation certificates? (y/N) "
msgstr "真的要生成吊销证书吗?(y/N)"
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr "没有私钥\n"
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "用户标识“%s”已经被吊销。\n"
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4863
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "警告:有一份用户标识签名的日期标记为 %d 秒后的未来\n"
-#: g10/keyedit.c:4922
+#: g10/keyedit.c:4927
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "密钥 %s 已被吊销。\n"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "子钥 %s 已被吊销。\n"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "正在显示 %s 照片标识(大小为 %ld,属于密钥 %s,用户标识 %d)\n"
@@ -4201,7 +4221,7 @@ msgstr "已禁用"
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "输入数字以选择,输入 N 翻页,输入 Q 退出 >"
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
@@ -4235,101 +4255,101 @@ msgstr "在 %s 服务器 %s 上搜索名字\n"
msgid "searching for names from %s\n"
msgstr "在 %s 上搜索名字\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "将密钥‘%s’上传到 %s 服务器 %s\n"
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, c-format
msgid "sending key %s to %s\n"
msgstr "将密钥‘%s’上传到 %s\n"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "搜索“%s”,在 %s 服务器 %s 上\n"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "搜索“%s”,在 %s 上\n"
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
msgid "no keyserver action!\n"
msgstr "公钥服务器无动作!\n"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "警告:处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n"
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr "公钥服务器未发送 VERSION\n"
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr "这一编译版本不支持外部调用公钥服务器\n"
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr "没有处理‘%s’公钥服务器的程序\n"
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n"
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, c-format
msgid "%s does not support handler version %d\n"
msgstr "%s 不支持对版本 %d 的处理\n"
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
msgid "keyserver timed out\n"
msgstr "公钥服务器超时\n"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
msgid "keyserver internal error\n"
msgstr "公钥服务器内部错误\n"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "公钥服务器通讯错误:%s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "“%s”不是一个用户标识:跳过\n"
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "警告:无法更新密钥 %s,通过 %s:%s\n"
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "1 个密钥正从 %s 得到更新\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "%d 个密钥正从 %s 得到更新\n"
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "警告:无法获取 URI %s:%s\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "不能解析 URI %s\n"
@@ -4729,11 +4749,11 @@ msgstr "请输入密码\n"
msgid "cancelled by user\n"
msgstr "用户取消\n"
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
msgid "can't query passphrase in batch mode\n"
msgstr "在批处理模式中无法查询密码\n"
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "请输入密码:"
@@ -4754,7 +4774,7 @@ msgstr "%u 位的 %s 密钥,钥匙号 %s,建立于 %s"
msgid " (subkey on main key ID %s)"
msgstr " (主钥 %s 的子钥)"
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "请再输入一次密码:"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 806c87021..5fdd3e607 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.2\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-29 16:04+0100\n"
+"POT-Creation-Date: 2006-12-04 15:05+0100\n"
"PO-Revision-Date: 2005-07-29 09:49+0800\n"
"Last-Translator: Jedi <[email protected]>\n"
"Language-Team: Chinese (traditional) <[email protected]>\n"
@@ -43,7 +43,7 @@ msgstr "正在將私鑰寫至 `%s'\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1007 g10/gpg.c:3499 g10/import.c:195 g10/keygen.c:2385
+#: g10/gpg.c:1009 g10/gpg.c:3503 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:348
#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114
#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -79,7 +79,7 @@ msgstr "無法讀取 `%s': %s\n"
msgid "note: random_seed file not updated\n"
msgstr "請注意: random_seed 檔案未被更新\n"
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1006 g10/keygen.c:2864
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1008 g10/keygen.c:2864
#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:269
#: g10/openfile.c:363 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536
#, c-format
@@ -303,75 +303,75 @@ msgstr "管理者個人識別碼 (PIN) 之驗證目前在此指令中被禁止�
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
-#: g10/armor.c:320
+#: g10/armor.c:372
#, c-format
msgid "armor: %s\n"
msgstr "封裝: %s\n"
-#: g10/armor.c:359
+#: g10/armor.c:411
msgid "invalid armor header: "
msgstr "無效的封裝檔頭: "
-#: g10/armor.c:370
+#: g10/armor.c:422
msgid "armor header: "
msgstr "封裝檔頭: "
-#: g10/armor.c:381
+#: g10/armor.c:433
msgid "invalid clearsig header\n"
msgstr "無效的明文簽章檔頭\n"
-#: g10/armor.c:433
+#: g10/armor.c:485
msgid "nested clear text signatures\n"
msgstr "多層明文簽章\n"
-#: g10/armor.c:568
+#: g10/armor.c:620
msgid "unexpected armor: "
msgstr "未預期的封裝: "
-#: g10/armor.c:580
+#: g10/armor.c:632
msgid "invalid dash escaped line: "
msgstr "無效的破折號逸出列: "
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:786 g10/armor.c:1396
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "無效的 64 進位字符 %02x 被跳過了\n"
-#: g10/armor.c:777
+#: g10/armor.c:829
msgid "premature eof (no CRC)\n"
msgstr "檔案未預期的結束 (沒有 CRC 的部分)\n"
-#: g10/armor.c:811
+#: g10/armor.c:863
msgid "premature eof (in CRC)\n"
msgstr "檔案未預期的結束 (CRC 的部分未結束)\n"
-#: g10/armor.c:819
+#: g10/armor.c:871
msgid "malformed CRC\n"
msgstr "CRC 被變造過\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:875 g10/armor.c:1433
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC 錯誤; %06lX - %06lX\n"
-#: g10/armor.c:843
+#: g10/armor.c:895
msgid "premature eof (in trailer)\n"
msgstr "檔案未預期的結束 (於結尾處)\n"
-#: g10/armor.c:847
+#: g10/armor.c:899
msgid "error in trailer line\n"
msgstr "結尾列有問題\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1210
msgid "no valid OpenPGP data found.\n"
msgstr "找不到有效的 OpenPGP 資料.\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1215
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "無效的封裝: 列長超出 %d 字符\n"
-#: g10/armor.c:1167
+#: g10/armor.c:1219
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr "封裝裡出現被引號括住的可列印字符 - 可能是有瑕疵的送信程式造成的\n"
@@ -455,7 +455,7 @@ msgstr "取回公鑰的 URL: "
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "錯誤: URL 太長 (上限是 %d 個字元).\n"
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:281
#, c-format
msgid "error reading `%s': %s\n"
msgstr "讀取 `%s' 時發生錯誤: %s\n"
@@ -711,7 +711,7 @@ msgstr "請再次輸入個人識別碼 (PIN): "
msgid "PIN not correctly repeated; try again"
msgstr "個人識別碼 (PIN) 再次輸入時沒有正確重複; 請再試一次"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3864 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3868 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -721,13 +721,13 @@ msgstr "無法開啟 `%s'\n"
msgid "--output doesn't work for this command\n"
msgstr "--output 在這個命令中沒有作用\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3392 g10/keyserver.c:1705
#: g10/revoke.c:228
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "金鑰 \"%s\" 找不到: %s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2350 g10/keyserver.c:1719
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %s\n"
@@ -833,22 +833,22 @@ msgstr "妳不能夠將 %s 用於 %s 模式中\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s 已經加密給: \"%s\"\n"
-#: g10/encr-data.c:68 g10/mainproc.c:293
+#: g10/encr-data.c:91 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr "%s 加密過的資料\n"
-#: g10/encr-data.c:70 g10/mainproc.c:297
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "以未知的演算法 %d 加密過\n"
-#: g10/encr-data.c:94
+#: g10/encr-data.c:117
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr "警告: 訊息被以對稱式編密法的弱金鑰加密了.\n"
-#: g10/encr-data.c:105
+#: g10/encr-data.c:128
msgid "problem handling encrypted packet\n"
msgstr "處理加密的封包有問題\n"
@@ -974,7 +974,7 @@ msgstr "警告: 私鑰 %s 並沒有任的何單一 SK 加總檢查\n"
msgid "WARNING: nothing exported\n"
msgstr "警告: 沒有匯出任何東西\n"
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid ""
"@Commands:\n"
" "
@@ -982,127 +982,127 @@ msgstr ""
"@指令:\n"
" "
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "|[file]|make a signature"
msgstr "|[檔案]|建立一份簽章"
-#: g10/gpg.c:380
+#: g10/gpg.c:381
msgid "|[file]|make a clear text signature"
msgstr "|[檔案]|建立一份明文簽章"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "make a detached signature"
msgstr "建立一份分離式簽章"
-#: g10/gpg.c:382
+#: g10/gpg.c:383
msgid "encrypt data"
msgstr "加密資料"
-#: g10/gpg.c:384
+#: g10/gpg.c:385
msgid "encryption only with symmetric cipher"
msgstr "僅使用對稱式編密法來加密"
-#: g10/gpg.c:386
+#: g10/gpg.c:387
msgid "decrypt data (default)"
msgstr "資料解密 (預設)"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "verify a signature"
msgstr "驗證某份簽章"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list keys"
msgstr "列出金鑰"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "列出金鑰和簽章"
-#: g10/gpg.c:393
+#: g10/gpg.c:394
msgid "list and check key signatures"
msgstr "列出並檢查金鑰簽章"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "list keys and fingerprints"
msgstr "列出金鑰和指紋"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "list secret keys"
msgstr "列出私鑰"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "generate a new key pair"
msgstr "產生一份新的金鑰對"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "remove keys from the public keyring"
msgstr "從公鑰鑰匙圈裡移去金鑰"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
msgid "remove keys from the secret keyring"
msgstr "從私鑰鑰匙圈裡移去金鑰"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "sign a key"
msgstr "簽署某把金鑰"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "sign a key locally"
msgstr "僅在本地簽署某把金鑰"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "sign or edit a key"
msgstr "簽署或編輯某把金鑰"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "generate a revocation certificate"
msgstr "產生一份撤銷憑證"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
msgid "export keys"
msgstr "匯出金鑰"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "export keys to a key server"
msgstr "把金鑰匯出至某個金鑰伺服器上"
-#: g10/gpg.c:407
+#: g10/gpg.c:408
msgid "import keys from a key server"
msgstr "從某個金鑰伺服器上匯入金鑰"
-#: g10/gpg.c:409
+#: g10/gpg.c:410
msgid "search for keys on a key server"
msgstr "在某個金鑰伺服器上搜尋金鑰"
-#: g10/gpg.c:411
+#: g10/gpg.c:412
msgid "update all keys from a keyserver"
msgstr "從某個金鑰伺服器上更新所有的金鑰"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "import/merge keys"
msgstr "匯入/合併金鑰"
-#: g10/gpg.c:418
+#: g10/gpg.c:419
msgid "print the card status"
msgstr "列印卡片狀態"
-#: g10/gpg.c:419
+#: g10/gpg.c:420
msgid "change data on a card"
msgstr "變更卡片上的資料"
-#: g10/gpg.c:420
+#: g10/gpg.c:421
msgid "change a card's PIN"
msgstr "變更某張卡片的個人識別碼 (PIN)"
-#: g10/gpg.c:429
+#: g10/gpg.c:430
msgid "update the trust database"
msgstr "更新信任資料庫"
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "|algo [files]|print message digests"
msgstr "|演算法 [檔案]|印出訊息摘要"
-#: g10/gpg.c:440 g10/gpgv.c:71
+#: g10/gpg.c:441 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1112,51 +1112,51 @@ msgstr ""
"選項:\n"
" "
-#: g10/gpg.c:442
+#: g10/gpg.c:443
msgid "create ascii armored output"
msgstr "建立以 ASCII 封裝過的輸出"
-#: g10/gpg.c:444
+#: g10/gpg.c:445
msgid "|NAME|encrypt for NAME"
msgstr "|名字|以「名字」作為加密對象"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
msgid "use this user-id to sign or decrypt"
msgstr "使用這個使用者 ID 來簽署或解密"
-#: g10/gpg.c:456
+#: g10/gpg.c:457
msgid "|N|set compress level N (0 disables)"
msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
-#: g10/gpg.c:461
+#: g10/gpg.c:462
msgid "use canonical text mode"
msgstr "使用標準的文字模式"
-#: g10/gpg.c:475
+#: g10/gpg.c:476
msgid "use as output file"
msgstr "當作輸出檔案來使用"
-#: g10/gpg.c:477 g10/gpgv.c:73
+#: g10/gpg.c:478 g10/gpgv.c:73
msgid "verbose"
msgstr "囉唆模式"
-#: g10/gpg.c:488
+#: g10/gpg.c:489
msgid "do not make any changes"
msgstr "不要做任何改變"
-#: g10/gpg.c:489
+#: g10/gpg.c:490
msgid "prompt before overwriting"
msgstr "覆寫前先詢問"
-#: g10/gpg.c:530
+#: g10/gpg.c:531
msgid "use strict OpenPGP behavior"
msgstr "使用嚴謹的 OpenPGP 行為"
-#: g10/gpg.c:531
+#: g10/gpg.c:532
msgid "generate PGP 2.x compatible messages"
msgstr "產生 PGP 2.x 相容性訊息"
-#: g10/gpg.c:560
+#: g10/gpg.c:561
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1164,7 +1164,7 @@ msgstr ""
"@\n"
"(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
-#: g10/gpg.c:563
+#: g10/gpg.c:564
msgid ""
"@\n"
"Examples:\n"
@@ -1184,15 +1184,15 @@ msgstr ""
" --list-keys [名字] 顯示金鑰\n"
" --fingerprint [名字] 顯示指紋\n"
-#: g10/gpg.c:761 g10/gpgv.c:98
+#: g10/gpg.c:763 g10/gpgv.c:98
msgid "Please report bugs to <[email protected]>.\n"
msgstr "請向 <[email protected]> 回報程式瑕疵.\n"
-#: g10/gpg.c:778
+#: g10/gpg.c:780
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
-#: g10/gpg.c:781
+#: g10/gpg.c:783
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1202,7 +1202,7 @@ msgstr ""
"簽署, 檢查, 加密或解密\n"
"預設的操作會依輸入資料而定\n"
-#: g10/gpg.c:792
+#: g10/gpg.c:794
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1210,566 +1210,566 @@ msgstr ""
"\n"
"已被支援的演算法:\n"
-#: g10/gpg.c:795
+#: g10/gpg.c:797
msgid "Pubkey: "
msgstr "公鑰: "
-#: g10/gpg.c:801 g10/keyedit.c:2310
+#: g10/gpg.c:803 g10/keyedit.c:2310
msgid "Cipher: "
msgstr "編密法: "
-#: g10/gpg.c:807
+#: g10/gpg.c:809
msgid "Hash: "
msgstr "雜湊: "
-#: g10/gpg.c:813 g10/keyedit.c:2356
+#: g10/gpg.c:815 g10/keyedit.c:2356
msgid "Compression: "
msgstr "壓縮: "
-#: g10/gpg.c:896
+#: g10/gpg.c:898
msgid "usage: gpg [options] "
msgstr "用法: gpg [選項] "
-#: g10/gpg.c:1044
+#: g10/gpg.c:1046
msgid "conflicting commands\n"
msgstr "指令彼此矛盾\n"
-#: g10/gpg.c:1062
+#: g10/gpg.c:1064
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "在群組定義 `%s' 裡找不到 = 記號\n"
-#: g10/gpg.c:1259
+#: g10/gpg.c:1261
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "警告: 家目錄 `%s' 的所有權並不安全\n"
-#: g10/gpg.c:1262
+#: g10/gpg.c:1264
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "警告: 組態檔案 `%s' 的所有權並不安全\n"
-#: g10/gpg.c:1265
+#: g10/gpg.c:1267
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "警告: 延伸模組 `%s' 的所有權並不安全\n"
-#: g10/gpg.c:1271
+#: g10/gpg.c:1273
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "警告: 家目錄 `%s' 的權限並不安全\n"
-#: g10/gpg.c:1274
+#: g10/gpg.c:1276
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "警告: 組態檔案 `%s' 的權限並不安全\n"
-#: g10/gpg.c:1277
+#: g10/gpg.c:1279
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "警告: 延伸模組 `%s' 的權限並不安全\n"
-#: g10/gpg.c:1283
+#: g10/gpg.c:1285
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "警告: 家目錄 `%s' 的封入目錄所有權並不安全\n"
-#: g10/gpg.c:1286
+#: g10/gpg.c:1288
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "警告: 組態檔案 `%s' 的封入目錄所有權並不安全\n"
-#: g10/gpg.c:1289
+#: g10/gpg.c:1291
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "警告: 延伸模組 `%s' 的封入目錄所有權並不安全\n"
-#: g10/gpg.c:1295
+#: g10/gpg.c:1297
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "警告: 家目錄 `%s' 的封入目錄權限並不安全\n"
-#: g10/gpg.c:1298
+#: g10/gpg.c:1300
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "警告: 組態檔案 `%s' 的封入目錄權限並不安全\n"
-#: g10/gpg.c:1301
+#: g10/gpg.c:1303
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "警告: 延伸模組 `%s' 的封入目錄權限並不安全\n"
-#: g10/gpg.c:1442
+#: g10/gpg.c:1444
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "未知的組態項目 `%s'\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1537
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1539
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1541
#, fuzzy
msgid "show all notations during signature listings"
msgstr "在私鑰圈裡沒有一致的簽章\n"
-#: g10/gpg.c:1541
+#: g10/gpg.c:1543
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1547
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1547
+#: g10/gpg.c:1549
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "給定的偏好金鑰伺服器 URL 無效\n"
-#: g10/gpg.c:1549
+#: g10/gpg.c:1551
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1551
+#: g10/gpg.c:1553
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1553
+#: g10/gpg.c:1555
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1555
+#: g10/gpg.c:1557
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "在私鑰清單和公鑰清單間切換"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1559
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "在私鑰圈裡沒有一致的簽章\n"
-#: g10/gpg.c:1951
+#: g10/gpg.c:1954
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "請注意: 舊有的預設選項檔 `%s' 已被忽略\n"
-#: g10/gpg.c:1993
+#: g10/gpg.c:1996
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "請注意: 沒有預設選項檔 `%s'\n"
-#: g10/gpg.c:1997
+#: g10/gpg.c:2000
#, c-format
msgid "option file `%s': %s\n"
msgstr "選項檔 `%s': %s\n"
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
#, c-format
msgid "reading options from `%s'\n"
msgstr "從 `%s' 讀取選項\n"
-#: g10/gpg.c:2220 g10/gpg.c:2849 g10/gpg.c:2868
+#: g10/gpg.c:2223 g10/gpg.c:2853 g10/gpg.c:2872
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "請注意: 一般情況下不會用到 %s!\n"
-#: g10/gpg.c:2233
+#: g10/gpg.c:2236
#, c-format
msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr "編密法延伸模組 `%s' 因為權限不安全而未被載入\n"
-#: g10/gpg.c:2399 g10/gpg.c:2411
+#: g10/gpg.c:2402 g10/gpg.c:2414
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "`%s' 不是一個有效的簽章使用期限\n"
-#: g10/gpg.c:2487
+#: g10/gpg.c:2491
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "`%s' 不是一個有效的字元集\n"
-#: g10/gpg.c:2511 g10/gpg.c:2698 g10/keyedit.c:4064
+#: g10/gpg.c:2515 g10/gpg.c:2702 g10/keyedit.c:4069
msgid "could not parse keyserver URL\n"
msgstr "無法剖析金鑰伺服器 URI\n"
-#: g10/gpg.c:2523
+#: g10/gpg.c:2527
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: 無效的金鑰伺服器選項\n"
-#: g10/gpg.c:2526
+#: g10/gpg.c:2530
msgid "invalid keyserver options\n"
msgstr "無效的金鑰伺服器選項\n"
-#: g10/gpg.c:2533
+#: g10/gpg.c:2537
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: 無效的匯入選項\n"
-#: g10/gpg.c:2536
+#: g10/gpg.c:2540
msgid "invalid import options\n"
msgstr "無效的匯入選項\n"
-#: g10/gpg.c:2543
+#: g10/gpg.c:2547
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: 無效的匯出選項\n"
-#: g10/gpg.c:2546
+#: g10/gpg.c:2550
msgid "invalid export options\n"
msgstr "無效的匯出選項\n"
-#: g10/gpg.c:2553
+#: g10/gpg.c:2557
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: 無效的清單選項\n"
-#: g10/gpg.c:2556
+#: g10/gpg.c:2560
msgid "invalid list options\n"
msgstr "無效的清單選項\n"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2568
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2566
+#: g10/gpg.c:2570
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2568
+#: g10/gpg.c:2572
#, fuzzy
msgid "show all notations during signature verification"
msgstr "`%s' 不是一個有效的簽章使用期限\n"
-#: g10/gpg.c:2570
+#: g10/gpg.c:2574
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2574
+#: g10/gpg.c:2578
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2576
+#: g10/gpg.c:2580
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "給定的偏好金鑰伺服器 URL 無效\n"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2582
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "`%s' 不是一個有效的簽章使用期限\n"
-#: g10/gpg.c:2580
+#: g10/gpg.c:2584
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2582
+#: g10/gpg.c:2586
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2591
+#: g10/gpg.c:2595
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: 無效的驗證選項\n"
-#: g10/gpg.c:2594
+#: g10/gpg.c:2598
msgid "invalid verify options\n"
msgstr "無效的驗證選項\n"
-#: g10/gpg.c:2601
+#: g10/gpg.c:2605
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "無法把執行檔路徑設成 %s\n"
-#: g10/gpg.c:2764
+#: g10/gpg.c:2768
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: 無效的驗證選項\n"
-#: g10/gpg.c:2767
+#: g10/gpg.c:2771
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2838
+#: g10/gpg.c:2842
msgid "WARNING: program may create a core file!\n"
msgstr "警告: 程式可能會傾印出核心檔!\n"
-#: g10/gpg.c:2842
+#: g10/gpg.c:2846
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告: %s 會使得 %s 失效\n"
-#: g10/gpg.c:2851
+#: g10/gpg.c:2855
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不被允許跟 %s 併用\n"
-#: g10/gpg.c:2854
+#: g10/gpg.c:2858
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 跟 %s 放在一起沒有意義!\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2865
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "注意: %s 在本版中無法使用\n"
-#: g10/gpg.c:2876
+#: g10/gpg.c:2880
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
-#: g10/gpg.c:2890
+#: g10/gpg.c:2894
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "妳祇有在 --pgp2 模式下纔能做出分離式或明文簽章\n"
-#: g10/gpg.c:2896
+#: g10/gpg.c:2900
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "妳在 --pgp2 模式下時, 不能同時簽署和加密\n"
-#: g10/gpg.c:2902
+#: g10/gpg.c:2906
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "啟用 --pgp2 時妳祇應該使用檔案, 而非管道\n"
-#: g10/gpg.c:2915
+#: g10/gpg.c:2919
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
-#: g10/gpg.c:2982 g10/gpg.c:3006
+#: g10/gpg.c:2986 g10/gpg.c:3010
msgid "selected cipher algorithm is invalid\n"
msgstr "所選的編密演算法無效\n"
-#: g10/gpg.c:2988 g10/gpg.c:3012
+#: g10/gpg.c:2992 g10/gpg.c:3016
msgid "selected digest algorithm is invalid\n"
msgstr "所選的摘要演算法無效\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:2998
msgid "selected compression algorithm is invalid\n"
msgstr "所選的壓縮演算法無效\n"
-#: g10/gpg.c:3000
+#: g10/gpg.c:3004
msgid "selected certification digest algorithm is invalid\n"
msgstr "所選的憑證摘要演算法無效\n"
-#: g10/gpg.c:3015
+#: g10/gpg.c:3019
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed 一定要大於 0\n"
-#: g10/gpg.c:3017
+#: g10/gpg.c:3021
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed 一定要大於 1\n"
-#: g10/gpg.c:3019
+#: g10/gpg.c:3023
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
-#: g10/gpg.c:3021
+#: g10/gpg.c:3025
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "無效的 default-cert-level; 一定要是 0, 1, 2 或 3\n"
-#: g10/gpg.c:3023
+#: g10/gpg.c:3027
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
-#: g10/gpg.c:3026
+#: g10/gpg.c:3030
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "請注意: 強烈不建議使用單純的 S2K 模式 (0)\n"
-#: g10/gpg.c:3030
+#: g10/gpg.c:3034
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3041
msgid "invalid default preferences\n"
msgstr "無效的預設偏好\n"
-#: g10/gpg.c:3046
+#: g10/gpg.c:3050
msgid "invalid personal cipher preferences\n"
msgstr "無效的個人編密法偏好\n"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3054
msgid "invalid personal digest preferences\n"
msgstr "無效的個人摘要偏好\n"
-#: g10/gpg.c:3054
+#: g10/gpg.c:3058
msgid "invalid personal compress preferences\n"
msgstr "無效的個人壓縮偏好\n"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3091
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 還沒辦法跟 %s 一起運作\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3138
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "妳不該將編密演算法 `%s' 用於 %s 模式中\n"
-#: g10/gpg.c:3139
+#: g10/gpg.c:3143
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "妳不該將摘要演算法 `%s' 用於 %s 模式中\n"
-#: g10/gpg.c:3144
+#: g10/gpg.c:3148
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "妳不該將壓縮演算法 `%s' 用於 %s 模式中\n"
-#: g10/gpg.c:3246
+#: g10/gpg.c:3250
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "信任資料庫啟始失敗: %s\n"
-#: g10/gpg.c:3257
+#: g10/gpg.c:3261
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
-#: g10/gpg.c:3268
+#: g10/gpg.c:3272
msgid "--store [filename]"
msgstr "--store [檔名]"
-#: g10/gpg.c:3275
+#: g10/gpg.c:3279
msgid "--symmetric [filename]"
msgstr "--symmetric [檔名]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3281
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "`%s' 的對稱式加密失敗: %s\n"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3291
msgid "--encrypt [filename]"
msgstr "--encrypt [檔名]"
-#: g10/gpg.c:3300
+#: g10/gpg.c:3304
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [檔名]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3306
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
-#: g10/gpg.c:3305
+#: g10/gpg.c:3309
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "妳不能在 %s 模式中使用 --symmetric --encrypt\n"
-#: g10/gpg.c:3323
+#: g10/gpg.c:3327
msgid "--sign [filename]"
msgstr "--sign [檔名]"
-#: g10/gpg.c:3336
+#: g10/gpg.c:3340
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [檔名]"
-#: g10/gpg.c:3351
+#: g10/gpg.c:3355
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [檔名]"
-#: g10/gpg.c:3353
+#: g10/gpg.c:3357
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
-#: g10/gpg.c:3356
+#: g10/gpg.c:3360
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "妳不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
-#: g10/gpg.c:3376
+#: g10/gpg.c:3380
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [檔名]"
-#: g10/gpg.c:3385
+#: g10/gpg.c:3389
msgid "--clearsign [filename]"
msgstr "--clearsign [檔名]"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3414
msgid "--decrypt [filename]"
msgstr "--decrypt [檔名]"
-#: g10/gpg.c:3418
+#: g10/gpg.c:3422
msgid "--sign-key user-id"
msgstr "--sign-key 使用者ID"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3426
msgid "--lsign-key user-id"
msgstr "--lsign-key 使用者ID"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3447
msgid "--edit-key user-id [commands]"
msgstr "--edit-key 使用者ID [指令]"
-#: g10/gpg.c:3514
+#: g10/gpg.c:3518
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [使用者ID] [鑰匙圈]"
-#: g10/gpg.c:3556
+#: g10/gpg.c:3560
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "送至金鑰伺服器時失敗: %s\n"
-#: g10/gpg.c:3558
+#: g10/gpg.c:3562
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "從金鑰伺服器接收時失敗: %s\n"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3564
#, c-format
msgid "key export failed: %s\n"
msgstr "金鑰匯出時失敗: %s\n"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3575
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "從金鑰伺服器中搜尋時失敗: %s\n"
-#: g10/gpg.c:3581
+#: g10/gpg.c:3585
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "從金鑰伺服器更新時失敗: %s\n"
-#: g10/gpg.c:3632
+#: g10/gpg.c:3636
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解開封裝失敗: %s\n"
-#: g10/gpg.c:3640
+#: g10/gpg.c:3644
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "進行封裝失敗: %s\n"
-#: g10/gpg.c:3727
+#: g10/gpg.c:3731
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "無效的 `%s' 雜湊演算法\n"
-#: g10/gpg.c:3850
+#: g10/gpg.c:3854
msgid "[filename]"
msgstr "[檔名]"
-#: g10/gpg.c:3854
+#: g10/gpg.c:3858
msgid "Go ahead and type your message ...\n"
msgstr "請開始鍵入妳的訊息 ...\n"
-#: g10/gpg.c:4158
+#: g10/gpg.c:4162
msgid "the given certification policy URL is invalid\n"
msgstr "給定的的憑證原則 URL 無效\n"
-#: g10/gpg.c:4160
+#: g10/gpg.c:4164
msgid "the given signature policy URL is invalid\n"
msgstr "給定的簽章原則 URL 無效\n"
-#: g10/gpg.c:4193
+#: g10/gpg.c:4197
msgid "the given preferred keyserver URL is invalid\n"
msgstr "給定的偏好金鑰伺服器 URL 無效\n"
@@ -1792,7 +1792,7 @@ msgstr ""
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380 g10/keyedit.c:3712
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "公鑰 %s 沒有相對應的私鑰 - 正在忽略\n"
@@ -2185,356 +2185,356 @@ msgstr "從金鑰中清除無法使用的部分"
msgid "remove as much as possible from key after import"
msgstr ""
-#: g10/import.c:266
+#: g10/import.c:267
#, c-format
msgid "skipping block of type %d\n"
msgstr "正在跳過 %d 型態的區塊\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, c-format
msgid "%lu keys processed so far\n"
msgstr "已有 %lu 把金鑰被處理了\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid "Total number processed: %lu\n"
msgstr "總共被處理的數量: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " 已跳過的新金鑰: %lu\n"
-#: g10/import.c:297
+#: g10/import.c:298
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " 沒有使用者的 ID: %lu\n"
-#: g10/import.c:299
+#: g10/import.c:300
#, c-format
msgid " imported: %lu"
msgstr " 已匯入: %lu"
-#: g10/import.c:305
+#: g10/import.c:306
#, c-format
msgid " unchanged: %lu\n"
msgstr " 未改變的: %lu\n"
-#: g10/import.c:307
+#: g10/import.c:308
#, c-format
msgid " new user IDs: %lu\n"
msgstr " 新的使用者 ID: %lu\n"
-#: g10/import.c:309
+#: g10/import.c:310
#, c-format
msgid " new subkeys: %lu\n"
msgstr " 新的子鑰: %lu\n"
-#: g10/import.c:311
+#: g10/import.c:312
#, c-format
msgid " new signatures: %lu\n"
msgstr " 新的簽章: %lu\n"
-#: g10/import.c:313
+#: g10/import.c:314
#, c-format
msgid " new key revocations: %lu\n"
msgstr " 新的金鑰撤銷: %lu\n"
-#: g10/import.c:315
+#: g10/import.c:316
#, c-format
msgid " secret keys read: %lu\n"
msgstr " 被讀取的私鑰: %lu\n"
-#: g10/import.c:317
+#: g10/import.c:318
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " 已匯入的私鑰: %lu\n"
-#: g10/import.c:319
+#: g10/import.c:320
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " 未改變的私鑰: %lu\n"
-#: g10/import.c:321
+#: g10/import.c:322
#, c-format
msgid " not imported: %lu\n"
msgstr " 未被匯入: %lu\n"
-#: g10/import.c:323
+#: g10/import.c:324
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " 已被清除掉的簽章: %lu\n"
-#: g10/import.c:325
+#: g10/import.c:326
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " 已被清除掉的使用者 ID: %lu\n"
-#: g10/import.c:566
+#: g10/import.c:567
#, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr "警告: 金鑰 %s 含有不可用的偏好設定\n"
#. TRANSLATORS: This string is belongs to the previous one. They are
#. only split up to allow printing of a common prefix.
-#: g10/import.c:570
+#: g10/import.c:571
#, fuzzy
msgid " algorithms on these user IDs:\n"
msgstr "這些使用者 ID 上的演算法:\n"
-#: g10/import.c:607
+#: g10/import.c:608
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": 編密演算法 %s 的偏好設定\n"
-#: g10/import.c:619
+#: g10/import.c:620
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": 摘要演算法 %s 的偏好設定\n"
-#: g10/import.c:631
+#: g10/import.c:632
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": 壓縮演算法 %s 的偏好設定\n"
-#: g10/import.c:644
+#: g10/import.c:645
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "我們強烈建議妳更新妳的偏好設定, 並\n"
-#: g10/import.c:646
+#: g10/import.c:647
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr "重新散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
-#: g10/import.c:670
+#: g10/import.c:671
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "妳可以像這樣更新妳的偏好設定: gpg --edit-key %s updpref save\n"
-#: g10/import.c:720 g10/import.c:1118
+#: g10/import.c:721 g10/import.c:1119
#, c-format
msgid "key %s: no user ID\n"
msgstr "金鑰 %s: 沒有使用者 ID\n"
-#: g10/import.c:749
+#: g10/import.c:750
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "金鑰 %s: PKS 子鑰的訛誤已被修復\n"
-#: g10/import.c:764
+#: g10/import.c:765
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "金鑰 %s: 非自我簽署的使用者 ID \"%s\" 已被接受\n"
-#: g10/import.c:770
+#: g10/import.c:771
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
-#: g10/import.c:772
+#: g10/import.c:773
msgid "this may be caused by a missing self-signature\n"
msgstr "這可能是由於遺失自我簽章所導致的後果\n"
-#: g10/import.c:782 g10/import.c:1240
+#: g10/import.c:783 g10/import.c:1241
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "金鑰 %s: 找不到公鑰: %s\n"
-#: g10/import.c:788
+#: g10/import.c:789
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
-#: g10/import.c:797
+#: g10/import.c:798
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "找不到可寫的鑰匙圈: %s\n"
-#: g10/import.c:802 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
+#: g10/import.c:803 g10/openfile.c:273 g10/sign.c:831 g10/sign.c:1135
#, c-format
msgid "writing to `%s'\n"
msgstr "正在寫到 `%s'\n"
-#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301
-#: g10/import.c:2363 g10/import.c:2385
+#: g10/import.c:807 g10/import.c:902 g10/import.c:1159 g10/import.c:1302
+#: g10/import.c:2364 g10/import.c:2386
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "寫到鑰匙圈 `%s' 時發生錯誤: %s\n"
-#: g10/import.c:825
+#: g10/import.c:826
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "金鑰 %s: 公鑰 \"%s\" 已被匯入\n"
-#: g10/import.c:849
+#: g10/import.c:850
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "金鑰 %s: 跟我們的副本不吻合\n"
-#: g10/import.c:866 g10/import.c:1258
+#: g10/import.c:867 g10/import.c:1259
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "金鑰 %s: 無法定位原始的金鑰區塊: %s\n"
-#: g10/import.c:874 g10/import.c:1265
+#: g10/import.c:875 g10/import.c:1266
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
-#: g10/import.c:911
+#: g10/import.c:912
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
-#: g10/import.c:914
+#: g10/import.c:915
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
-#: g10/import.c:917
+#: g10/import.c:918
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "金鑰 %s: \"%s\" 1 個新的簽章\n"
-#: g10/import.c:920
+#: g10/import.c:921
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "金鑰 %s: \"%s\" %d 個新的簽章\n"
-#: g10/import.c:923
+#: g10/import.c:924
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "金鑰 %s: \"%s\" 1 個新的子鑰\n"
-#: g10/import.c:926
+#: g10/import.c:927
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "金鑰 %s: \"%s\" %d 個新的子鑰\n"
-#: g10/import.c:929
+#: g10/import.c:930
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
-#: g10/import.c:932
+#: g10/import.c:933
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
-#: g10/import.c:935
+#: g10/import.c:936
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "金鑰 %s: \"%s\" 已清除掉 %d 個使用者 ID\n"
-#: g10/import.c:938
+#: g10/import.c:939
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "金鑰 %s: \"%s\" 已清除掉 %d 個使用者 ID\n"
-#: g10/import.c:961
+#: g10/import.c:962
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "金鑰 %s: \"%s\" 沒有被改變\n"
-#: g10/import.c:1124
+#: g10/import.c:1125
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "金鑰 %s: 私鑰使用了無效的編密法 %d - 已跳過\n"
-#: g10/import.c:1135
+#: g10/import.c:1136
msgid "importing secret keys not allowed\n"
msgstr "未被允許匯入私鑰\n"
-#: g10/import.c:1152 g10/import.c:2378
+#: g10/import.c:1153 g10/import.c:2379
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "沒有預設的私鑰鑰匙圈: %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, c-format
msgid "key %s: secret key imported\n"
msgstr "金鑰 %s: 私鑰被匯入了\n"
-#: g10/import.c:1193
+#: g10/import.c:1194
#, c-format
msgid "key %s: already in secret keyring\n"
msgstr "金鑰 %s: 已經在私鑰鑰匙圈中了\n"
-#: g10/import.c:1203
+#: g10/import.c:1204
#, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "金鑰 %s: 找不到私鑰: %s\n"
-#: g10/import.c:1233
+#: g10/import.c:1234
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
-#: g10/import.c:1276
+#: g10/import.c:1277
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
-#: g10/import.c:1308
+#: g10/import.c:1309
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "金鑰 %s: \"%s\" 撤銷憑證已被匯入\n"
-#: g10/import.c:1374
+#: g10/import.c:1375
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
-#: g10/import.c:1389
+#: g10/import.c:1390
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "金鑰 %s: 使用者 ID \"%s\" 使用了未被支援的公鑰演算法\n"
-#: g10/import.c:1391
+#: g10/import.c:1392
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "金鑰 %s: 使用者 ID \"%s\" 有無效的自我簽章\n"
-#: g10/import.c:1409
+#: g10/import.c:1410
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "金鑰 %s: 沒有子鑰可供附帶\n"
-#: g10/import.c:1420 g10/import.c:1470
+#: g10/import.c:1421 g10/import.c:1471
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "金鑰 %s: 未被支援的公鑰演算法\n"
-#: g10/import.c:1422
+#: g10/import.c:1423
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "金鑰 %s: 無效的附帶子鑰\n"
-#: g10/import.c:1437
+#: g10/import.c:1438
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "金鑰 %s: 多重附帶子鑰已被移除\n"
-#: g10/import.c:1459
+#: g10/import.c:1460
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "金鑰 %s: 沒有子鑰可供金鑰撤銷\n"
-#: g10/import.c:1472
+#: g10/import.c:1473
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "金鑰 %s: 無效的子鑰撤銷\n"
-#: g10/import.c:1487
+#: g10/import.c:1488
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "金鑰 %s: 多重子鑰撤銷已移除\n"
-#: g10/import.c:1529
+#: g10/import.c:1530
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳過\n"
-#: g10/import.c:1550
+#: g10/import.c:1551
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "金鑰 %s: 子鑰已跳過\n"
@@ -2543,65 +2543,65 @@ msgstr "金鑰 %s: 子鑰已跳過\n"
# * to import non-exportable signature when we have the
# * the secret key used to create this signature - it
# * seems that this makes sense
-#: g10/import.c:1577
+#: g10/import.c:1578
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "金鑰 %s: 不可匯出的簽章 (等級 0x%02X) - 已跳過\n"
-#: g10/import.c:1587
+#: g10/import.c:1588
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳過\n"
-#: g10/import.c:1604
+#: g10/import.c:1605
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳過\n"
-#: g10/import.c:1618
+#: g10/import.c:1619
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
-#: g10/import.c:1626
+#: g10/import.c:1627
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
-#: g10/import.c:1726
+#: g10/import.c:1727
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
-#: g10/import.c:1788
+#: g10/import.c:1789
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
-#: g10/import.c:1802
+#: g10/import.c:1803
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
-#: g10/import.c:1861
+#: g10/import.c:1862
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
-#: g10/import.c:1895
+#: g10/import.c:1896
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
-#: g10/import.c:2284
+#: g10/import.c:2285
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "請注意: 某份金鑰的序號 (S/N) 與卡片的序號並不吻合\n"
-#: g10/import.c:2292
+#: g10/import.c:2293
msgid "NOTE: primary key is online and stored on card\n"
msgstr "請注意: 主鑰在線上且已存放於卡片上了\n"
-#: g10/import.c:2294
+#: g10/import.c:2295
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "請注意: 次鑰在線上且已存放於卡片上了\n"
@@ -2896,8 +2896,8 @@ msgstr "我非常小心地檢查過這把金鑰了.\n"
msgid "Really sign? (y/N) "
msgstr "真的要簽署嗎? (y/N)"
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:352
+#: g10/keyedit.c:1067 g10/keyedit.c:4788 g10/keyedit.c:4879 g10/keyedit.c:4943
+#: g10/keyedit.c:5004 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "簽署時失敗了: %s\n"
@@ -3393,7 +3393,7 @@ msgstr ""
"警告: 這是一把 PGP2 型態的金鑰.\n"
" 增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016 g10/keyedit.c:3351
msgid "Are you sure you still want to add it? (y/N) "
msgstr "妳確定仍然想要增加嗎? (y/N) "
@@ -3435,12 +3435,32 @@ msgstr "沒有東西被刪除.\n"
msgid "invalid"
msgstr "無效"
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3235
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "使用者 ID \"%s\": 已經是乾淨的了.\n"
+
+#: g10/keyedit.c:3242
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
+
+#: g10/keyedit.c:3243
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "使用者 ID \"%s\": 已經是乾淨的了.\n"
+
+#: g10/keyedit.c:3252
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "使用者 ID \"%s\": 已經是乾淨的了.\n"
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3346
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3449,192 +3469,192 @@ msgstr ""
"警告: 這是一把 PGP2 型態的金鑰.\n"
" 增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
-#: g10/keyedit.c:3352
+#: g10/keyedit.c:3357
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "妳不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
-#: g10/keyedit.c:3372
+#: g10/keyedit.c:3377
msgid "Enter the user ID of the designated revoker: "
msgstr "輸入指定撤銷者的使用者 ID: "
-#: g10/keyedit.c:3397
+#: g10/keyedit.c:3402
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:3412
+#: g10/keyedit.c:3417
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "妳不能指派某把金鑰為它自己的指定撤銷者\n"
-#: g10/keyedit.c:3434
+#: g10/keyedit.c:3439
msgid "this key has already been designated as a revoker\n"
msgstr "這把金鑰已被指定為撤銷者了\n"
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3458
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
-#: g10/keyedit.c:3459
+#: g10/keyedit.c:3464
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "妳確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3525
msgid "Please remove selections from the secret keys.\n"
msgstr "請從私鑰中移除選擇.\n"
-#: g10/keyedit.c:3526
+#: g10/keyedit.c:3531
msgid "Please select at most one subkey.\n"
msgstr "請至多選擇一把次鑰.\n"
-#: g10/keyedit.c:3530
+#: g10/keyedit.c:3535
msgid "Changing expiration time for a subkey.\n"
msgstr "正在變更某把次鑰的使用期限.\n"
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3538
msgid "Changing expiration time for the primary key.\n"
msgstr "正在變更主鑰的使用期限.\n"
-#: g10/keyedit.c:3579
+#: g10/keyedit.c:3584
msgid "You can't change the expiration date of a v3 key\n"
msgstr "妳不能變更 v3 金鑰的使用期限\n"
-#: g10/keyedit.c:3595
+#: g10/keyedit.c:3600
msgid "No corresponding signature in secret ring\n"
msgstr "在私鑰圈裡沒有一致的簽章\n"
-#: g10/keyedit.c:3668
+#: g10/keyedit.c:3673
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "警告: 正要簽署的子鑰 %s 未經交叉認證\n"
-#: g10/keyedit.c:3674
+#: g10/keyedit.c:3679
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
-#: g10/keyedit.c:3836
+#: g10/keyedit.c:3841
msgid "Please select exactly one user ID.\n"
msgstr "請精確地選擇一個使用者 ID.\n"
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3880 g10/keyedit.c:3990 g10/keyedit.c:4110 g10/keyedit.c:4251
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
-#: g10/keyedit.c:4046
+#: g10/keyedit.c:4051
msgid "Enter your preferred keyserver URL: "
msgstr "請輸入妳的偏好金鑰伺服器 URL: "
-#: g10/keyedit.c:4126
+#: g10/keyedit.c:4131
msgid "Are you sure you want to replace it? (y/N) "
msgstr "妳確定要取代它嗎? (y/N) "
-#: g10/keyedit.c:4127
+#: g10/keyedit.c:4132
msgid "Are you sure you want to delete it? (y/N) "
msgstr "妳確定要刪除它嗎? (y/N) "
-#: g10/keyedit.c:4189
+#: g10/keyedit.c:4194
#, fuzzy
msgid "Enter the notation: "
msgstr "簽章標記: "
-#: g10/keyedit.c:4338
+#: g10/keyedit.c:4343
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "是否覆寫? (y/N) "
-#: g10/keyedit.c:4402
+#: g10/keyedit.c:4407
#, c-format
msgid "No user ID with index %d\n"
msgstr "索引 %d 沒有對應到使用者 ID\n"
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4465
#, c-format
msgid "No user ID with hash %s\n"
msgstr "雜湊 %s 沒有對應到使用者 ID\n"
-#: g10/keyedit.c:4487
+#: g10/keyedit.c:4492
#, c-format
msgid "No subkey with index %d\n"
msgstr "索引 %d 沒有對應到次鑰\n"
-#: g10/keyedit.c:4622
+#: g10/keyedit.c:4627
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "使用者 ID: \"%s\"\n"
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "已被妳的金鑰 %s 於 %s%s%s 簽署了\n"
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4632 g10/keyedit.c:4696 g10/keyedit.c:4739
msgid " (non-exportable)"
msgstr " (不可匯出)"
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4636
#, c-format
msgid "This signature expired on %s.\n"
msgstr "這份簽署已經在 %s 過期了.\n"
-#: g10/keyedit.c:4635
+#: g10/keyedit.c:4640
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "妳確定妳仍然想要撤銷它嗎? (y/N) "
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4644
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
-#: g10/keyedit.c:4666
+#: g10/keyedit.c:4671
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "妳已經簽署了金鑰 %s 上的這些使用者 ID:\n"
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4697
msgid " (non-revocable)"
msgstr " (不可撤銷)"
-#: g10/keyedit.c:4699
+#: g10/keyedit.c:4704
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "被妳的金鑰 %s 於 %s 所撤銷了\n"
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4726
msgid "You are about to revoke these signatures:\n"
msgstr "妳正在撤銷這些簽章:\n"
-#: g10/keyedit.c:4741
+#: g10/keyedit.c:4746
msgid "Really create the revocation certificates? (y/N) "
msgstr "真的要建立撤銷憑證嗎? (y/N) "
-#: g10/keyedit.c:4771
+#: g10/keyedit.c:4776
msgid "no secret key\n"
msgstr "沒有私鑰\n"
-#: g10/keyedit.c:4841
+#: g10/keyedit.c:4846
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "使用者 ID \"%s\" 已經被撤銷了\n"
-#: g10/keyedit.c:4858
+#: g10/keyedit.c:4863
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "警告: 有一份使用者 ID 簽章的日期標記為 %d 秒後的未來\n"
-#: g10/keyedit.c:4922
+#: g10/keyedit.c:4927
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "金鑰 %s 已經被撤銷了.\n"
-#: g10/keyedit.c:4984
+#: g10/keyedit.c:4989
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "次鑰 %s 已經被撤銷了.\n"
-#: g10/keyedit.c:5079
+#: g10/keyedit.c:5084
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
@@ -4238,7 +4258,7 @@ msgstr "已禁用"
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "請輸入數字, N)ext, 或 Q)uit > "
-#: g10/keyserver.c:808 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1426
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "無效的金鑰伺服器協定 (我們用 %d != 經手程式 %d)\n"
@@ -4272,101 +4292,101 @@ msgstr "正在搜尋 \"%s\" 於 %s 伺服器 %s\n"
msgid "searching for names from %s\n"
msgstr "正在搜尋 \"%s\" 於 %s\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1329
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "遞送金鑰 %s 至 %s 伺服器 %s\n"
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1333
#, c-format
msgid "sending key %s to %s\n"
msgstr "遞送金鑰 %s 至 %s\n"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1376
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "正在搜尋 \"%s\" 於 %s 伺服器 %s\n"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1379
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "正在搜尋 \"%s\" 於 %s\n"
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1386 g10/keyserver.c:1482
msgid "no keyserver action!\n"
msgstr "沒有金鑰伺服器動作!\n"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1434
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "警告: 金鑰伺服器經手程式 (handler) 係來自不同版本的 GnuPG (%s)\n"
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
msgid "keyserver did not send VERSION\n"
msgstr "金鑰伺服器並未送出版本 (VERSION)\n"
-#: g10/keyserver.c:1504 g10/keyserver.c:2032
+#: g10/keyserver.c:1505 g10/keyserver.c:2033
msgid "no keyserver known (use option --keyserver)\n"
msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1511
msgid "external keyserver calls are not supported in this build\n"
msgstr "本版並不支援外部金鑰伺服器叫用\n"
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1523
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr "沒有金鑰伺服器方案 (scheme) `%s' 的經手程式 (handler)\n"
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1528
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "動作 `%s' 並未被金鑰伺服器方案 (scheme) `%s' 所支援\n"
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1536
#, c-format
msgid "%s does not support handler version %d\n"
msgstr "%s 並不支援經手程式 (handler) 版本 %d\n"
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1543
msgid "keyserver timed out\n"
msgstr "金鑰伺服器逾時\n"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1548
msgid "keyserver internal error\n"
msgstr "金鑰伺服器內部出錯\n"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "金鑰伺服器通訊出錯: %s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1582 g10/keyserver.c:1616
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" 並非金鑰 ID: 正跳過\n"
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1875
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1897
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "正從 %s 更新 1 份金鑰\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1899
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "正在更新 %d 份金鑰自 %s\n"
-#: g10/keyserver.c:1954
+#: g10/keyserver.c:1955
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
-#: g10/keyserver.c:1960
+#: g10/keyserver.c:1961
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
@@ -4768,11 +4788,11 @@ msgstr "請輸入密語\n"
msgid "cancelled by user\n"
msgstr "由使用者取消了\n"
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805 g10/passphrase.c:974
msgid "can't query passphrase in batch mode\n"
msgstr "無法在批次模式中查詢密語\n"
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812 g10/passphrase.c:979
msgid "Enter passphrase: "
msgstr "請輸入密語: "
@@ -4795,7 +4815,7 @@ msgstr "%u 位元長的 %s 金鑰, ID %s, 建立於 %s"
msgid " (subkey on main key ID %s)"
msgstr " (在主鑰 ID %s 上的子鑰)"
-#: g10/passphrase.c:977
+#: g10/passphrase.c:987
msgid "Repeat passphrase: "
msgstr "請再輸入一次密語: "
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index ae87f3a0d..a27ca1c0d 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-04 Werner Koch <[email protected]>
+
+ * mk-gpg-texi: Removed.
+
2006-10-02 Werner Koch <[email protected]>
* w32installer.nsi: Don't uninstall winpt if the installer comes
diff --git a/scripts/distfiles b/scripts/distfiles
index 39c3a9146..ddf15cd79 100644
--- a/scripts/distfiles
+++ b/scripts/distfiles
@@ -2,6 +2,6 @@ mkdiff
build-w32
gnupg.spec.in
autogen.sh
-mk-gpg-texi
mk-w32-dist
w32installer.nsi
+
diff --git a/scripts/mdate-sh b/scripts/mdate-sh
new file mode 100755
index 000000000..b610b47a6
--- /dev/null
+++ b/scripts/mdate-sh
@@ -0,0 +1,133 @@
+#!/bin/sh
+# Get modification time of a file or directory and pretty-print it.
+# Copyright (C) 1995, 1996, 1997, 2003 Free Software Foundation, Inc.
+# written by Ulrich Drepper <[email protected]>, June 1995
+#
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Prevent date giving response in another language.
+LANG=C
+export LANG
+LC_ALL=C
+export LC_ALL
+LC_TIME=C
+export LC_TIME
+
+save_arg1="$1"
+
+# Find out how to get the extended ls output of a file or directory.
+if ls -L /dev/null 1>/dev/null 2>&1; then
+ ls_command='ls -L -l -d'
+else
+ ls_command='ls -l -d'
+fi
+
+# A `ls -l' line looks as follows on OS/2.
+# drwxrwx--- 0 Aug 11 2001 foo
+# This differs from Unix, which adds ownership information.
+# drwxrwx--- 2 root root 4096 Aug 11 2001 foo
+#
+# To find the date, we split the line on spaces and iterate on words
+# until we find a month. This cannot work with files whose owner is a
+# user named `Jan', or `Feb', etc. However, it's unlikely that `/'
+# will be owned by a user whose name is a month. So we first look at
+# the extended ls output of the root directory to decide how many
+# words should be skipped to get the date.
+
+# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below.
+set - x`$ls_command /`
+
+# Find which argument is the month.
+month=
+command=
+until test $month
+do
+ shift
+ # Add another shift to the command.
+ command="$command shift;"
+ case $1 in
+ Jan) month=January; nummonth=1;;
+ Feb) month=February; nummonth=2;;
+ Mar) month=March; nummonth=3;;
+ Apr) month=April; nummonth=4;;
+ May) month=May; nummonth=5;;
+ Jun) month=June; nummonth=6;;
+ Jul) month=July; nummonth=7;;
+ Aug) month=August; nummonth=8;;
+ Sep) month=September; nummonth=9;;
+ Oct) month=October; nummonth=10;;
+ Nov) month=November; nummonth=11;;
+ Dec) month=December; nummonth=12;;
+ esac
+done
+
+# Get the extended ls output of the file or directory.
+set - x`eval "$ls_command \"\$save_arg1\""`
+
+# Remove all preceding arguments
+eval $command
+
+# Get the month. Next argument is day, followed by the year or time.
+case $1 in
+ Jan) month=January; nummonth=1;;
+ Feb) month=February; nummonth=2;;
+ Mar) month=March; nummonth=3;;
+ Apr) month=April; nummonth=4;;
+ May) month=May; nummonth=5;;
+ Jun) month=June; nummonth=6;;
+ Jul) month=July; nummonth=7;;
+ Aug) month=August; nummonth=8;;
+ Sep) month=September; nummonth=9;;
+ Oct) month=October; nummonth=10;;
+ Nov) month=November; nummonth=11;;
+ Dec) month=December; nummonth=12;;
+esac
+
+day=$2
+
+# Here we have to deal with the problem that the ls output gives either
+# the time of day or the year.
+case $3 in
+ *:*) set `date`; eval year=\$$#
+ case $2 in
+ Jan) nummonthtod=1;;
+ Feb) nummonthtod=2;;
+ Mar) nummonthtod=3;;
+ Apr) nummonthtod=4;;
+ May) nummonthtod=5;;
+ Jun) nummonthtod=6;;
+ Jul) nummonthtod=7;;
+ Aug) nummonthtod=8;;
+ Sep) nummonthtod=9;;
+ Oct) nummonthtod=10;;
+ Nov) nummonthtod=11;;
+ Dec) nummonthtod=12;;
+ esac
+ # For the first six month of the year the time notation can also
+ # be used for files modified in the last year.
+ if (expr $nummonth \> $nummonthtod) > /dev/null;
+ then
+ year=`expr $year - 1`
+ fi;;
+ *) year=$3;;
+esac
+
+# The result.
+echo $day $month $year
diff --git a/scripts/mk-gpg-texi b/scripts/mk-gpg-texi
deleted file mode 100755
index e269b5493..000000000
--- a/scripts/mk-gpg-texi
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-# Helper to create the texinfo versions from gpg.sgml
-#
-# Copyright (C) 2002, 2004 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
-# modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-set -e
-
-for file in gpg gpgv; do
- sgml2xml -x lower ${file}.sgml >${file}.xml
-# docbook2texi ${file}.xml | sed 's,--,---,' | (
- docbook2x-texi --to-stdout ${file}.xml | \
- sed '/^@setfilename/,/^@end direntry/d' | (
- case "$file" in
- *gpgv)
- sed '/\\input texinfo/a \
-@setfilename gpgv.info\
-@dircategory GnuPG\
-@direntry\
-* gpgv: (gpgv). GnuPG signature verification tool.\
-@end direntry
-'
- ;;
-
- gpg)
- sed '/\\input texinfo/a \
-@setfilename gpg.info\
-@dircategory GnuPG\
-@direntry\
-* gpg: (gpg). GnuPG encryption and signing tool.\
-@end direntry
-'
- ;;
-
- *)
- cat
- ;;
- esac
- ) >${file}.texi
-
-done
-
-
-
-
diff --git a/scripts/texinfo.tex b/scripts/texinfo.tex
new file mode 100644
index 000000000..e9293f3b9
--- /dev/null
+++ b/scripts/texinfo.tex
@@ -0,0 +1,6773 @@
+% texinfo.tex -- TeX macros to handle Texinfo files.
+%
+% Load plain if necessary, i.e., if running under initex.
+\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
+%
+\def\texinfoversion{2003-05-04.08}
+%
+% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
+% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+%
+% This texinfo.tex file is free software; you can redistribute it and/or
+% modify it under the terms of the GNU General Public License as
+% published by the Free Software Foundation; either version 2, or (at
+% your option) any later version.
+%
+% This texinfo.tex file is distributed in the hope that it will be
+% useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+% of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+% General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this texinfo.tex file; see the file COPYING. If not, write
+% to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+% Boston, MA 02111-1307, USA.
+%
+% In other words, you are welcome to use, share and improve this program.
+% You are forbidden to forbid anyone else to use, share and improve
+% what you give them. Help stamp out software-hoarding!
+%
+% Please try the latest version of texinfo.tex before submitting bug
+% reports; you can get the latest version from:
+% ftp://ftp.gnu.org/gnu/texinfo/texinfo.tex
+% (and all GNU mirrors, see http://www.gnu.org/order/ftp.html)
+% ftp://tug.org/tex/texinfo.tex
+% (and all CTAN mirrors, see http://www.ctan.org),
+% and /home/gd/gnu/doc/texinfo.tex on the GNU machines.
+%
+% The GNU Texinfo home page is http://www.gnu.org/software/texinfo.
+%
+% The texinfo.tex in any given Texinfo distribution could well be out
+% of date, so if that's what you're using, please check.
+%
+% Send bug reports to [email protected]. Please include including a
+% complete document in each bug report with which we can reproduce the
+% problem. Patches are, of course, greatly appreciated.
+%
+% To process a Texinfo manual with TeX, it's most reliable to use the
+% texi2dvi shell script that comes with the distribution. For a simple
+% manual foo.texi, however, you can get away with this:
+% tex foo.texi
+% texindex foo.??
+% tex foo.texi
+% tex foo.texi
+% dvips foo.dvi -o # or whatever; this makes foo.ps.
+% The extra TeX runs get the cross-reference information correct.
+% Sometimes one run after texindex suffices, and sometimes you need more
+% than two; texi2dvi does it as many times as necessary.
+%
+% It is possible to adapt texinfo.tex for other languages, to some
+% extent. You can get the existing language-specific files from the
+% full Texinfo distribution.
+
+\message{Loading texinfo [version \texinfoversion]:}
+
+% If in a .fmt file, print the version number
+% and turn on active characters that we couldn't do earlier because
+% they might have appeared in the input file name.
+\everyjob{\message{[Texinfo version \texinfoversion]}%
+ \catcode`+=\active \catcode`\_=\active}
+
+\message{Basics,}
+\chardef\other=12
+
+% We never want plain's \outer definition of \+ in Texinfo.
+% For @tex, we can use \tabalign.
+\let\+ = \relax
+
+% Save some plain tex macros whose names we will redefine.
+\let\ptexb=\b
+\let\ptexbullet=\bullet
+\let\ptexc=\c
+\let\ptexcomma=\,
+\let\ptexdot=\.
+\let\ptexdots=\dots
+\let\ptexend=\end
+\let\ptexequiv=\equiv
+\let\ptexexclam=\!
+\let\ptexgtr=>
+\let\ptexhat=^
+\let\ptexi=\i
+\let\ptexindent=\indent
+\let\ptexlbrace=\{
+\let\ptexless=<
+\let\ptexplus=+
+\let\ptexrbrace=\}
+\let\ptexslash=\/
+\let\ptexstar=\*
+\let\ptext=\t
+
+% If this character appears in an error message or help string, it
+% starts a new line in the output.
+\newlinechar = `^^J
+
+% Set up fixed words for English if not already set.
+\ifx\putwordAppendix\undefined \gdef\putwordAppendix{Appendix}\fi
+\ifx\putwordChapter\undefined \gdef\putwordChapter{Chapter}\fi
+\ifx\putwordfile\undefined \gdef\putwordfile{file}\fi
+\ifx\putwordin\undefined \gdef\putwordin{in}\fi
+\ifx\putwordIndexIsEmpty\undefined \gdef\putwordIndexIsEmpty{(Index is empty)}\fi
+\ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi
+\ifx\putwordInfo\undefined \gdef\putwordInfo{Info}\fi
+\ifx\putwordInstanceVariableof\undefined \gdef\putwordInstanceVariableof{Instance Variable of}\fi
+\ifx\putwordMethodon\undefined \gdef\putwordMethodon{Method on}\fi
+\ifx\putwordNoTitle\undefined \gdef\putwordNoTitle{No Title}\fi
+\ifx\putwordof\undefined \gdef\putwordof{of}\fi
+\ifx\putwordon\undefined \gdef\putwordon{on}\fi
+\ifx\putwordpage\undefined \gdef\putwordpage{page}\fi
+\ifx\putwordsection\undefined \gdef\putwordsection{section}\fi
+\ifx\putwordSection\undefined \gdef\putwordSection{Section}\fi
+\ifx\putwordsee\undefined \gdef\putwordsee{see}\fi
+\ifx\putwordSee\undefined \gdef\putwordSee{See}\fi
+\ifx\putwordShortTOC\undefined \gdef\putwordShortTOC{Short Contents}\fi
+\ifx\putwordTOC\undefined \gdef\putwordTOC{Table of Contents}\fi
+%
+\ifx\putwordMJan\undefined \gdef\putwordMJan{January}\fi
+\ifx\putwordMFeb\undefined \gdef\putwordMFeb{February}\fi
+\ifx\putwordMMar\undefined \gdef\putwordMMar{March}\fi
+\ifx\putwordMApr\undefined \gdef\putwordMApr{April}\fi
+\ifx\putwordMMay\undefined \gdef\putwordMMay{May}\fi
+\ifx\putwordMJun\undefined \gdef\putwordMJun{June}\fi
+\ifx\putwordMJul\undefined \gdef\putwordMJul{July}\fi
+\ifx\putwordMAug\undefined \gdef\putwordMAug{August}\fi
+\ifx\putwordMSep\undefined \gdef\putwordMSep{September}\fi
+\ifx\putwordMOct\undefined \gdef\putwordMOct{October}\fi
+\ifx\putwordMNov\undefined \gdef\putwordMNov{November}\fi
+\ifx\putwordMDec\undefined \gdef\putwordMDec{December}\fi
+%
+\ifx\putwordDefmac\undefined \gdef\putwordDefmac{Macro}\fi
+\ifx\putwordDefspec\undefined \gdef\putwordDefspec{Special Form}\fi
+\ifx\putwordDefvar\undefined \gdef\putwordDefvar{Variable}\fi
+\ifx\putwordDefopt\undefined \gdef\putwordDefopt{User Option}\fi
+\ifx\putwordDeftypevar\undefined\gdef\putwordDeftypevar{Variable}\fi
+\ifx\putwordDeffunc\undefined \gdef\putwordDeffunc{Function}\fi
+\ifx\putwordDeftypefun\undefined\gdef\putwordDeftypefun{Function}\fi
+
+% In some macros, we cannot use the `\? notation---the left quote is
+% in some cases the escape char.
+\chardef\colonChar = `\:
+\chardef\commaChar = `\,
+\chardef\dotChar = `\.
+\chardef\equalChar = `\=
+\chardef\exclamChar= `\!
+\chardef\questChar = `\?
+\chardef\semiChar = `\;
+\chardef\spaceChar = `\ %
+\chardef\underChar = `\_
+
+% Ignore a token.
+%
+\def\gobble#1{}
+
+% True if #1 is the empty string, i.e., called like `\ifempty{}'.
+%
+\def\ifempty#1{\ifemptyx #1\emptymarkA\emptymarkB}%
+\def\ifemptyx#1#2\emptymarkB{\ifx #1\emptymarkA}%
+
+% Hyphenation fixes.
+\hyphenation{ap-pen-dix}
+\hyphenation{eshell}
+\hyphenation{mini-buf-fer mini-buf-fers}
+\hyphenation{time-stamp}
+\hyphenation{white-space}
+
+% Margin to add to right of even pages, to left of odd pages.
+\newdimen\bindingoffset
+\newdimen\normaloffset
+\newdimen\pagewidth \newdimen\pageheight
+
+% Sometimes it is convenient to have everything in the transcript file
+% and nothing on the terminal. We don't just call \tracingall here,
+% since that produces some useless output on the terminal. We also make
+% some effort to order the tracing commands to reduce output in the log
+% file; cf. trace.sty in LaTeX.
+%
+\def\gloggingall{\begingroup \globaldefs = 1 \loggingall \endgroup}%
+\def\loggingall{%
+ \tracingstats2
+ \tracingpages1
+ \tracinglostchars2 % 2 gives us more in etex
+ \tracingparagraphs1
+ \tracingoutput1
+ \tracingmacros2
+ \tracingrestores1
+ \showboxbreadth\maxdimen \showboxdepth\maxdimen
+ \ifx\eTeXversion\undefined\else % etex gives us more logging
+ \tracingscantokens1
+ \tracingifs1
+ \tracinggroups1
+ \tracingnesting2
+ \tracingassigns1
+ \fi
+ \tracingcommands3 % 3 gives us more in etex
+ \errorcontextlines\maxdimen
+}%
+
+% add check for \lastpenalty to plain's definitions. If the last thing
+% we did was a \nobreak, we don't want to insert more space.
+%
+\def\smallbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\smallskipamount
+ \removelastskip\penalty-50\smallskip\fi\fi}
+\def\medbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\medskipamount
+ \removelastskip\penalty-100\medskip\fi\fi}
+\def\bigbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\bigskipamount
+ \removelastskip\penalty-200\bigskip\fi\fi}
+
+% For @cropmarks command.
+% Do @cropmarks to get crop marks.
+%
+\newif\ifcropmarks
+\let\cropmarks = \cropmarkstrue
+%
+% Dimensions to add cropmarks at corners.
+% Added by P. A. MacKay, 12 Nov. 1986
+%
+\newdimen\outerhsize \newdimen\outervsize % set by the paper size routines
+\newdimen\cornerlong \cornerlong=1pc
+\newdimen\cornerthick \cornerthick=.3pt
+\newdimen\topandbottommargin \topandbottommargin=.75in
+
+% Main output routine.
+\chardef\PAGE = 255
+\output = {\onepageout{\pagecontents\PAGE}}
+
+\newbox\headlinebox
+\newbox\footlinebox
+
+% \onepageout takes a vbox as an argument. Note that \pagecontents
+% does insertions, but you have to call it yourself.
+\def\onepageout#1{%
+ \ifcropmarks \hoffset=0pt \else \hoffset=\normaloffset \fi
+ %
+ \ifodd\pageno \advance\hoffset by \bindingoffset
+ \else \advance\hoffset by -\bindingoffset\fi
+ %
+ % Do this outside of the \shipout so @code etc. will be expanded in
+ % the headline as they should be, not taken literally (outputting ''code).
+ \setbox\headlinebox = \vbox{\let\hsize=\pagewidth \makeheadline}%
+ \setbox\footlinebox = \vbox{\let\hsize=\pagewidth \makefootline}%
+ %
+ {%
+ % Have to do this stuff outside the \shipout because we want it to
+ % take effect in \write's, yet the group defined by the \vbox ends
+ % before the \shipout runs.
+ %
+ \escapechar = `\\ % use backslash in output files.
+ \indexdummies % don't expand commands in the output.
+ \normalturnoffactive % \ in index entries must not stay \, e.g., if
+ % the page break happens to be in the middle of an example.
+ \shipout\vbox{%
+ % Do this early so pdf references go to the beginning of the page.
+ \ifpdfmakepagedest \pdfmkdest{\the\pageno} \fi
+ %
+ \ifcropmarks \vbox to \outervsize\bgroup
+ \hsize = \outerhsize
+ \vskip-\topandbottommargin
+ \vtop to0pt{%
+ \line{\ewtop\hfil\ewtop}%
+ \nointerlineskip
+ \line{%
+ \vbox{\moveleft\cornerthick\nstop}%
+ \hfill
+ \vbox{\moveright\cornerthick\nstop}%
+ }%
+ \vss}%
+ \vskip\topandbottommargin
+ \line\bgroup
+ \hfil % center the page within the outer (page) hsize.
+ \ifodd\pageno\hskip\bindingoffset\fi
+ \vbox\bgroup
+ \fi
+ %
+ \unvbox\headlinebox
+ \pagebody{#1}%
+ \ifdim\ht\footlinebox > 0pt
+ % Only leave this space if the footline is nonempty.
+ % (We lessened \vsize for it in \oddfootingxxx.)
+ % The \baselineskip=24pt in plain's \makefootline has no effect.
+ \vskip 2\baselineskip
+ \unvbox\footlinebox
+ \fi
+ %
+ \ifcropmarks
+ \egroup % end of \vbox\bgroup
+ \hfil\egroup % end of (centering) \line\bgroup
+ \vskip\topandbottommargin plus1fill minus1fill
+ \boxmaxdepth = \cornerthick
+ \vbox to0pt{\vss
+ \line{%
+ \vbox{\moveleft\cornerthick\nsbot}%
+ \hfill
+ \vbox{\moveright\cornerthick\nsbot}%
+ }%
+ \nointerlineskip
+ \line{\ewbot\hfil\ewbot}%
+ }%
+ \egroup % \vbox from first cropmarks clause
+ \fi
+ }% end of \shipout\vbox
+ }% end of group with \normalturnoffactive
+ \advancepageno
+ \ifnum\outputpenalty>-20000 \else\dosupereject\fi
+}
+
+\newinsert\margin \dimen\margin=\maxdimen
+
+\def\pagebody#1{\vbox to\pageheight{\boxmaxdepth=\maxdepth #1}}
+{\catcode`\@ =11
+\gdef\pagecontents#1{\ifvoid\topins\else\unvbox\topins\fi
+% marginal hacks, [email protected] (Juha Takala)
+\ifvoid\margin\else % marginal info is present
+ \rlap{\kern\hsize\vbox to\z@{\kern1pt\box\margin \vss}}\fi
+\dimen@=\dp#1 \unvbox#1
+\ifvoid\footins\else\vskip\skip\footins\footnoterule \unvbox\footins\fi
+\ifr@ggedbottom \kern-\dimen@ \vfil \fi}
+}
+
+% Here are the rules for the cropmarks. Note that they are
+% offset so that the space between them is truly \outerhsize or \outervsize
+% (P. A. MacKay, 12 November, 1986)
+%
+\def\ewtop{\vrule height\cornerthick depth0pt width\cornerlong}
+\def\nstop{\vbox
+ {\hrule height\cornerthick depth\cornerlong width\cornerthick}}
+\def\ewbot{\vrule height0pt depth\cornerthick width\cornerlong}
+\def\nsbot{\vbox
+ {\hrule height\cornerlong depth\cornerthick width\cornerthick}}
+
+% Parse an argument, then pass it to #1. The argument is the rest of
+% the input line (except we remove a trailing comment). #1 should be a
+% macro which expects an ordinary undelimited TeX argument.
+%
+\def\parsearg#1{%
+ \let\next = #1%
+ \begingroup
+ \obeylines
+ \futurelet\temp\parseargx
+}
+
+% If the next token is an obeyed space (from an @example environment or
+% the like), remove it and recurse. Otherwise, we're done.
+\def\parseargx{%
+ % \obeyedspace is defined far below, after the definition of \sepspaces.
+ \ifx\obeyedspace\temp
+ \expandafter\parseargdiscardspace
+ \else
+ \expandafter\parseargline
+ \fi
+}
+
+% Remove a single space (as the delimiter token to the macro call).
+{\obeyspaces %
+ \gdef\parseargdiscardspace {\futurelet\temp\parseargx}}
+
+{\obeylines %
+ \gdef\parseargline#1^^M{%
+ \endgroup % End of the group started in \parsearg.
+ %
+ % First remove any @c comment, then any @comment.
+ % Result of each macro is put in \toks0.
+ \argremovec #1\c\relax %
+ \expandafter\argremovecomment \the\toks0 \comment\relax %
+ %
+ % Call the caller's macro, saved as \next in \parsearg.
+ \expandafter\next\expandafter{\the\toks0}%
+ }%
+}
+
+% Since all \c{,omment} does is throw away the argument, we can let TeX
+% do that for us. The \relax here is matched by the \relax in the call
+% in \parseargline; it could be more or less anything, its purpose is
+% just to delimit the argument to the \c.
+\def\argremovec#1\c#2\relax{\toks0 = {#1}}
+\def\argremovecomment#1\comment#2\relax{\toks0 = {#1}}
+
+% \argremovec{,omment} might leave us with trailing spaces, though; e.g.,
+% @end itemize @c foo
+% will have two active spaces as part of the argument with the
+% `itemize'. Here we remove all active spaces from #1, and assign the
+% result to \toks0.
+%
+% This loses if there are any *other* active characters besides spaces
+% in the argument -- _ ^ +, for example -- since they get expanded.
+% Fortunately, Texinfo does not define any such commands. (If it ever
+% does, the catcode of the characters in questionwill have to be changed
+% here.) But this means we cannot call \removeactivespaces as part of
+% \argremovec{,omment}, since @c uses \parsearg, and thus the argument
+% that \parsearg gets might well have any character at all in it.
+%
+\def\removeactivespaces#1{%
+ \begingroup
+ \ignoreactivespaces
+ \edef\temp{#1}%
+ \global\toks0 = \expandafter{\temp}%
+ \endgroup
+}
+
+% Change the active space to expand to nothing.
+%
+\begingroup
+ \obeyspaces
+ \gdef\ignoreactivespaces{\obeyspaces\let =\empty}
+\endgroup
+
+
+\def\flushcr{\ifx\par\lisppar \def\next##1{}\else \let\next=\relax \fi \next}
+
+%% These are used to keep @begin/@end levels from running away
+%% Call \inENV within environments (after a \begingroup)
+\newif\ifENV \ENVfalse \def\inENV{\ifENV\relax\else\ENVtrue\fi}
+\def\ENVcheck{%
+\ifENV\errmessage{Still within an environment; press RETURN to continue}
+\endgroup\fi} % This is not perfect, but it should reduce lossage
+
+% @begin foo is the same as @foo, for now.
+\newhelp\EMsimple{Press RETURN to continue.}
+
+\outer\def\begin{\parsearg\beginxxx}
+
+\def\beginxxx #1{%
+\expandafter\ifx\csname #1\endcsname\relax
+{\errhelp=\EMsimple \errmessage{Undefined command @begin #1}}\else
+\csname #1\endcsname\fi}
+
+% @end foo executes the definition of \Efoo.
+%
+\def\end{\parsearg\endxxx}
+\def\endxxx #1{%
+ \removeactivespaces{#1}%
+ \edef\endthing{\the\toks0}%
+ %
+ \expandafter\ifx\csname E\endthing\endcsname\relax
+ \expandafter\ifx\csname \endthing\endcsname\relax
+ % There's no \foo, i.e., no ``environment'' foo.
+ \errhelp = \EMsimple
+ \errmessage{Undefined command `@end \endthing'}%
+ \else
+ \unmatchedenderror\endthing
+ \fi
+ \else
+ % Everything's ok; the right environment has been started.
+ \csname E\endthing\endcsname
+ \fi
+}
+
+% There is an environment #1, but it hasn't been started. Give an error.
+%
+\def\unmatchedenderror#1{%
+ \errhelp = \EMsimple
+ \errmessage{This `@end #1' doesn't have a matching `@#1'}%
+}
+
+% Define the control sequence \E#1 to give an unmatched @end error.
+%
+\def\defineunmatchedend#1{%
+ \expandafter\def\csname E#1\endcsname{\unmatchedenderror{#1}}%
+}
+
+
+%% Simple single-character @ commands
+
+% @@ prints an @
+% Kludge this until the fonts are right (grr).
+\def\@{{\tt\char64}}
+
+% This is turned off because it was never documented
+% and you can use @w{...} around a quote to suppress ligatures.
+%% Define @` and @' to be the same as ` and '
+%% but suppressing ligatures.
+%\def\`{{`}}
+%\def\'{{'}}
+
+% Used to generate quoted braces.
+\def\mylbrace {{\tt\char123}}
+\def\myrbrace {{\tt\char125}}
+\let\{=\mylbrace
+\let\}=\myrbrace
+\begingroup
+ % Definitions to produce \{ and \} commands for indices,
+ % and @{ and @} for the aux file.
+ \catcode`\{ = \other \catcode`\} = \other
+ \catcode`\[ = 1 \catcode`\] = 2
+ \catcode`\! = 0 \catcode`\\ = \other
+ !gdef!lbracecmd[\{]%
+ !gdef!rbracecmd[\}]%
+ !gdef!lbraceatcmd[@{]%
+ !gdef!rbraceatcmd[@}]%
+!endgroup
+
+% Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent
+% Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H.
+\let\, = \c
+\let\dotaccent = \.
+\def\ringaccent#1{{\accent23 #1}}
+\let\tieaccent = \t
+\let\ubaraccent = \b
+\let\udotaccent = \d
+
+% Other special characters: @questiondown @exclamdown
+% Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss.
+\def\questiondown{?`}
+\def\exclamdown{!`}
+
+% Dotless i and dotless j, used for accents.
+\def\imacro{i}
+\def\jmacro{j}
+\def\dotless#1{%
+ \def\temp{#1}%
+ \ifx\temp\imacro \ptexi
+ \else\ifx\temp\jmacro \j
+ \else \errmessage{@dotless can be used only with i or j}%
+ \fi\fi
+}
+
+% Be sure we're in horizontal mode when doing a tie, since we make space
+% equivalent to this in @example-like environments. Otherwise, a space
+% at the beginning of a line will start with \penalty -- and
+% since \penalty is valid in vertical mode, we'd end up putting the
+% penalty on the vertical list instead of in the new paragraph.
+{\catcode`@ = 11
+ % Avoid using \@M directly, because that causes trouble
+ % if the definition is written into an index file.
+ \global\let\tiepenalty = \@M
+ \gdef\tie{\leavevmode\penalty\tiepenalty\ }
+}
+
+% @: forces normal size whitespace following.
+\def\:{\spacefactor=1000 }
+
+% @* forces a line break.
+\def\*{\hfil\break\hbox{}\ignorespaces}
+
+% @/ allows a line break.
+\let\/=\allowbreak
+
+% @. is an end-of-sentence period.
+\def\.{.\spacefactor=3000 }
+
+% @! is an end-of-sentence bang.
+\def\!{!\spacefactor=3000 }
+
+% @? is an end-of-sentence query.
+\def\?{?\spacefactor=3000 }
+
+% @w prevents a word break. Without the \leavevmode, @w at the
+% beginning of a paragraph, when TeX is still in vertical mode, would
+% produce a whole line of output instead of starting the paragraph.
+\def\w#1{\leavevmode\hbox{#1}}
+
+% @group ... @end group forces ... to be all on one page, by enclosing
+% it in a TeX vbox. We use \vtop instead of \vbox to construct the box
+% to keep its height that of a normal line. According to the rules for
+% \topskip (p.114 of the TeXbook), the glue inserted is
+% max (\topskip - \ht (first item), 0). If that height is large,
+% therefore, no glue is inserted, and the space between the headline and
+% the text is small, which looks bad.
+%
+% Another complication is that the group might be very large. This can
+% cause the glue on the previous page to be unduly stretched, because it
+% does not have much material. In this case, it's better to add an
+% explicit \vfill so that the extra space is at the bottom. The
+% threshold for doing this is if the group is more than \vfilllimit
+% percent of a page (\vfilllimit can be changed inside of @tex).
+%
+\newbox\groupbox
+\def\vfilllimit{0.7}
+%
+\def\group{\begingroup
+ \ifnum\catcode13=\active \else
+ \errhelp = \groupinvalidhelp
+ \errmessage{@group invalid in context where filling is enabled}%
+ \fi
+ %
+ % The \vtop we start below produces a box with normal height and large
+ % depth; thus, TeX puts \baselineskip glue before it, and (when the
+ % next line of text is done) \lineskip glue after it. (See p.82 of
+ % the TeXbook.) Thus, space below is not quite equal to space
+ % above. But it's pretty close.
+ \def\Egroup{%
+ \egroup % End the \vtop.
+ % \dimen0 is the vertical size of the group's box.
+ \dimen0 = \ht\groupbox \advance\dimen0 by \dp\groupbox
+ % \dimen2 is how much space is left on the page (more or less).
+ \dimen2 = \pageheight \advance\dimen2 by -\pagetotal
+ % if the group doesn't fit on the current page, and it's a big big
+ % group, force a page break.
+ \ifdim \dimen0 > \dimen2
+ \ifdim \pagetotal < \vfilllimit\pageheight
+ \page
+ \fi
+ \fi
+ \copy\groupbox
+ \endgroup % End the \group.
+ }%
+ %
+ \setbox\groupbox = \vtop\bgroup
+ % We have to put a strut on the last line in case the @group is in
+ % the midst of an example, rather than completely enclosing it.
+ % Otherwise, the interline space between the last line of the group
+ % and the first line afterwards is too small. But we can't put the
+ % strut in \Egroup, since there it would be on a line by itself.
+ % Hence this just inserts a strut at the beginning of each line.
+ \everypar = {\strut}%
+ %
+ % Since we have a strut on every line, we don't need any of TeX's
+ % normal interline spacing.
+ \offinterlineskip
+ %
+ % OK, but now we have to do something about blank
+ % lines in the input in @example-like environments, which normally
+ % just turn into \lisppar, which will insert no space now that we've
+ % turned off the interline space. Simplest is to make them be an
+ % empty paragraph.
+ \ifx\par\lisppar
+ \edef\par{\leavevmode \par}%
+ %
+ % Reset ^^M's definition to new definition of \par.
+ \obeylines
+ \fi
+ %
+ % Do @comment since we are called inside an environment such as
+ % @example, where each end-of-line in the input causes an
+ % end-of-line in the output. We don't want the end-of-line after
+ % the `@group' to put extra space in the output. Since @group
+ % should appear on a line by itself (according to the Texinfo
+ % manual), we don't worry about eating any user text.
+ \comment
+}
+%
+% TeX puts in an \escapechar (i.e., `@') at the beginning of the help
+% message, so this ends up printing `@group can only ...'.
+%
+\newhelp\groupinvalidhelp{%
+group can only be used in environments such as @example,^^J%
+where each line of input produces a line of output.}
+
+% @need space-in-mils
+% forces a page break if there is not space-in-mils remaining.
+
+\newdimen\mil \mil=0.001in
+
+\def\need{\parsearg\needx}
+
+% Old definition--didn't work.
+%\def\needx #1{\par %
+%% This method tries to make TeX break the page naturally
+%% if the depth of the box does not fit.
+%{\baselineskip=0pt%
+%\vtop to #1\mil{\vfil}\kern -#1\mil\nobreak
+%\prevdepth=-1000pt
+%}}
+
+\def\needx#1{%
+ % Ensure vertical mode, so we don't make a big box in the middle of a
+ % paragraph.
+ \par
+ %
+ % If the @need value is less than one line space, it's useless.
+ \dimen0 = #1\mil
+ \dimen2 = \ht\strutbox
+ \advance\dimen2 by \dp\strutbox
+ \ifdim\dimen0 > \dimen2
+ %
+ % Do a \strut just to make the height of this box be normal, so the
+ % normal leading is inserted relative to the preceding line.
+ % And a page break here is fine.
+ \vtop to #1\mil{\strut\vfil}%
+ %
+ % TeX does not even consider page breaks if a penalty added to the
+ % main vertical list is 10000 or more. But in order to see if the
+ % empty box we just added fits on the page, we must make it consider
+ % page breaks. On the other hand, we don't want to actually break the
+ % page after the empty box. So we use a penalty of 9999.
+ %
+ % There is an extremely small chance that TeX will actually break the
+ % page at this \penalty, if there are no other feasible breakpoints in
+ % sight. (If the user is using lots of big @group commands, which
+ % almost-but-not-quite fill up a page, TeX will have a hard time doing
+ % good page breaking, for example.) However, I could not construct an
+ % example where a page broke at this \penalty; if it happens in a real
+ % document, then we can reconsider our strategy.
+ \penalty9999
+ %
+ % Back up by the size of the box, whether we did a page break or not.
+ \kern -#1\mil
+ %
+ % Do not allow a page break right after this kern.
+ \nobreak
+ \fi
+}
+
+% @br forces paragraph break
+
+\let\br = \par
+
+% @dots{} output an ellipsis using the current font.
+% We do .5em per period so that it has the same spacing in a typewriter
+% font as three actual period characters.
+%
+\def\dots{%
+ \leavevmode
+ \hbox to 1.5em{%
+ \hskip 0pt plus 0.25fil minus 0.25fil
+ .\hss.\hss.%
+ \hskip 0pt plus 0.5fil minus 0.5fil
+ }%
+}
+
+% @enddots{} is an end-of-sentence ellipsis.
+%
+\def\enddots{%
+ \leavevmode
+ \hbox to 2em{%
+ \hskip 0pt plus 0.25fil minus 0.25fil
+ .\hss.\hss.\hss.%
+ \hskip 0pt plus 0.5fil minus 0.5fil
+ }%
+ \spacefactor=3000
+}
+
+% @page forces the start of a new page.
+%
+\def\page{\par\vfill\supereject}
+
+% @exdent text....
+% outputs text on separate line in roman font, starting at standard page margin
+
+% This records the amount of indent in the innermost environment.
+% That's how much \exdent should take out.
+\newskip\exdentamount
+
+% This defn is used inside fill environments such as @defun.
+\def\exdent{\parsearg\exdentyyy}
+\def\exdentyyy #1{{\hfil\break\hbox{\kern -\exdentamount{\rm#1}}\hfil\break}}
+
+% This defn is used inside nofill environments such as @example.
+\def\nofillexdent{\parsearg\nofillexdentyyy}
+\def\nofillexdentyyy #1{{\advance \leftskip by -\exdentamount
+\leftline{\hskip\leftskip{\rm#1}}}}
+
+% @inmargin{WHICH}{TEXT} puts TEXT in the WHICH margin next to the current
+% paragraph. For more general purposes, use the \margin insertion
+% class. WHICH is `l' or `r'.
+%
+\newskip\inmarginspacing \inmarginspacing=1cm
+\def\strutdepth{\dp\strutbox}
+%
+\def\doinmargin#1#2{\strut\vadjust{%
+ \nobreak
+ \kern-\strutdepth
+ \vtop to \strutdepth{%
+ \baselineskip=\strutdepth
+ \vss
+ % if you have multiple lines of stuff to put here, you'll need to
+ % make the vbox yourself of the appropriate size.
+ \ifx#1l%
+ \llap{\ignorespaces #2\hskip\inmarginspacing}%
+ \else
+ \rlap{\hskip\hsize \hskip\inmarginspacing \ignorespaces #2}%
+ \fi
+ \null
+ }%
+}}
+\def\inleftmargin{\doinmargin l}
+\def\inrightmargin{\doinmargin r}
+%
+% @inmargin{TEXT [, RIGHT-TEXT]}
+% (if RIGHT-TEXT is given, use TEXT for left page, RIGHT-TEXT for right;
+% else use TEXT for both).
+%
+\def\inmargin#1{\parseinmargin #1,,\finish}
+\def\parseinmargin#1,#2,#3\finish{% not perfect, but better than nothing.
+ \setbox0 = \hbox{\ignorespaces #2}%
+ \ifdim\wd0 > 0pt
+ \def\lefttext{#1}% have both texts
+ \def\righttext{#2}%
+ \else
+ \def\lefttext{#1}% have only one text
+ \def\righttext{#1}%
+ \fi
+ %
+ \ifodd\pageno
+ \def\temp{\inrightmargin\righttext}% odd page -> outside is right margin
+ \else
+ \def\temp{\inleftmargin\lefttext}%
+ \fi
+ \temp
+}
+
+% @include file insert text of that file as input.
+% Allow normal characters that we make active in the argument (a file name).
+\def\include{\begingroup
+ \catcode`\\=\other
+ \catcode`~=\other
+ \catcode`^=\other
+ \catcode`_=\other
+ \catcode`|=\other
+ \catcode`<=\other
+ \catcode`>=\other
+ \catcode`+=\other
+ \parsearg\includezzz}
+% Restore active chars for included file.
+\def\includezzz#1{\endgroup\begingroup
+ % Read the included file in a group so nested @include's work.
+ \def\thisfile{#1}%
+ \let\value=\expandablevalue
+ \input\thisfile
+\endgroup}
+
+\def\thisfile{}
+
+% @center line
+% outputs that line, centered.
+%
+\def\center{\parsearg\docenter}
+\def\docenter#1{{%
+ \ifhmode \hfil\break \fi
+ \advance\hsize by -\leftskip
+ \advance\hsize by -\rightskip
+ \line{\hfil \ignorespaces#1\unskip \hfil}%
+ \ifhmode \break \fi
+}}
+
+% @sp n outputs n lines of vertical space
+
+\def\sp{\parsearg\spxxx}
+\def\spxxx #1{\vskip #1\baselineskip}
+
+% @comment ...line which is ignored...
+% @c is the same as @comment
+% @ignore ... @end ignore is another way to write a comment
+
+\def\comment{\begingroup \catcode`\^^M=\other%
+\catcode`\@=\other \catcode`\{=\other \catcode`\}=\other%
+\commentxxx}
+{\catcode`\^^M=\other \gdef\commentxxx#1^^M{\endgroup}}
+
+\let\c=\comment
+
+% @paragraphindent NCHARS
+% We'll use ems for NCHARS, close enough.
+% NCHARS can also be the word `asis' or `none'.
+% We cannot feasibly implement @paragraphindent asis, though.
+%
+\def\asisword{asis} % no translation, these are keywords
+\def\noneword{none}
+%
+\def\paragraphindent{\parsearg\doparagraphindent}
+\def\doparagraphindent#1{%
+ \def\temp{#1}%
+ \ifx\temp\asisword
+ \else
+ \ifx\temp\noneword
+ \defaultparindent = 0pt
+ \else
+ \defaultparindent = #1em
+ \fi
+ \fi
+ \parindent = \defaultparindent
+}
+
+% @exampleindent NCHARS
+% We'll use ems for NCHARS like @paragraphindent.
+% It seems @exampleindent asis isn't necessary, but
+% I preserve it to make it similar to @paragraphindent.
+\def\exampleindent{\parsearg\doexampleindent}
+\def\doexampleindent#1{%
+ \def\temp{#1}%
+ \ifx\temp\asisword
+ \else
+ \ifx\temp\noneword
+ \lispnarrowing = 0pt
+ \else
+ \lispnarrowing = #1em
+ \fi
+ \fi
+}
+
+% @firstparagraphindent WORD
+% If WORD is `none', then suppress indentation of the first paragraph
+% after a section heading. If WORD is `insert', then do indentat such
+% paragraphs.
+%
+% The paragraph indentation is suppressed or not by calling
+% \suppressfirstparagraphindent, which the sectioning commands do. We
+% switch the definition of this back and forth according to WORD. By
+% default, we suppress indentation.
+%
+\def\suppressfirstparagraphindent{\dosuppressfirstparagraphindent}
+\newdimen\currentparindent
+%
+\def\insertword{insert}
+%
+\def\firstparagraphindent{\parsearg\dofirstparagraphindent}
+\def\dofirstparagraphindent#1{%
+ \def\temp{#1}%
+ \ifx\temp\noneword
+ \let\suppressfirstparagraphindent = \dosuppressfirstparagraphindent
+ \else\ifx\temp\insertword
+ \let\suppressfirstparagraphindent = \relax
+ \else
+ \errhelp = \EMsimple
+ \errmessage{Unknown @firstparagraphindent option `\temp'}%
+ \fi\fi
+}
+
+% Here is how we actually suppress indentation. Redefine \everypar to
+% \kern backwards by \parindent, and then reset itself to empty.
+%
+% We also make \indent itself not actually do anything until the next
+% paragraph.
+%
+\gdef\dosuppressfirstparagraphindent{%
+ \gdef\indent{%
+ \global\let\indent=\ptexindent
+ \global\everypar = {}%
+ }%
+ \global\everypar = {%
+ \kern-\parindent
+ \global\let\indent=\ptexindent
+ \global\everypar = {}%
+ }%
+}%
+
+
+% @asis just yields its argument. Used with @table, for example.
+%
+\def\asis#1{#1}
+
+% @math outputs its argument in math mode.
+% We don't use $'s directly in the definition of \math because we need
+% to set catcodes according to plain TeX first, to allow for subscripts,
+% superscripts, special math chars, etc.
+%
+\let\implicitmath = $%$ font-lock fix
+%
+% One complication: _ usually means subscripts, but it could also mean
+% an actual _ character, as in @math{@var{some_variable} + 1}. So make
+% _ within @math be active (mathcode "8000), and distinguish by seeing
+% if the current family is \slfam, which is what @var uses.
+%
+{\catcode\underChar = \active
+\gdef\mathunderscore{%
+ \catcode\underChar=\active
+ \def_{\ifnum\fam=\slfam \_\else\sb\fi}%
+}}
+%
+% Another complication: we want \\ (and @\) to output a \ character.
+% FYI, plain.tex uses \\ as a temporary control sequence (why?), but
+% this is not advertised and we don't care. Texinfo does not
+% otherwise define @\.
+%
+% The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\.
+\def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi}
+%
+\def\math{%
+ \tex
+ \mathcode`\_="8000 \mathunderscore
+ \let\\ = \mathbackslash
+ \mathactive
+ \implicitmath\finishmath}
+\def\finishmath#1{#1\implicitmath\Etex}
+
+% Some active characters (such as <) are spaced differently in math.
+% We have to reset their definitions in case the @math was an
+% argument to a command which set the catcodes (such as @item or @section).
+%
+{
+ \catcode`^ = \active
+ \catcode`< = \active
+ \catcode`> = \active
+ \catcode`+ = \active
+ \gdef\mathactive{%
+ \let^ = \ptexhat
+ \let< = \ptexless
+ \let> = \ptexgtr
+ \let+ = \ptexplus
+ }
+}
+
+% @bullet and @minus need the same treatment as @math, just above.
+\def\bullet{\implicitmath\ptexbullet\implicitmath}
+\def\minus{\implicitmath-\implicitmath}
+
+% @refill is a no-op.
+\let\refill=\relax
+
+% If working on a large document in chapters, it is convenient to
+% be able to disable indexing, cross-referencing, and contents, for test runs.
+% This is done with @novalidate (before @setfilename).
+%
+\newif\iflinks \linkstrue % by default we want the aux files.
+\let\novalidate = \linksfalse
+
+% @setfilename is done at the beginning of every texinfo file.
+% So open here the files we need to have open while reading the input.
+% This makes it possible to make a .fmt file for texinfo.
+\def\setfilename{%
+ \iflinks
+ \readauxfile
+ \fi % \openindices needs to do some work in any case.
+ \openindices
+ \fixbackslash % Turn off hack to swallow `\input texinfo'.
+ \global\let\setfilename=\comment % Ignore extra @setfilename cmds.
+ %
+ % If texinfo.cnf is present on the system, read it.
+ % Useful for site-wide @afourpaper, etc.
+ % Just to be on the safe side, close the input stream before the \input.
+ \openin 1 texinfo.cnf
+ \ifeof1 \let\temp=\relax \else \def\temp{\input texinfo.cnf }\fi
+ \closein1
+ \temp
+ %
+ \comment % Ignore the actual filename.
+}
+
+% Called from \setfilename.
+%
+\def\openindices{%
+ \newindex{cp}%
+ \newcodeindex{fn}%
+ \newcodeindex{vr}%
+ \newcodeindex{tp}%
+ \newcodeindex{ky}%
+ \newcodeindex{pg}%
+}
+
+% @bye.
+\outer\def\bye{\pagealignmacro\tracingstats=1\ptexend}
+
+
+\message{pdf,}
+% adobe `portable' document format
+\newcount\tempnum
+\newcount\lnkcount
+\newtoks\filename
+\newcount\filenamelength
+\newcount\pgn
+\newtoks\toksA
+\newtoks\toksB
+\newtoks\toksC
+\newtoks\toksD
+\newbox\boxA
+\newcount\countA
+\newif\ifpdf
+\newif\ifpdfmakepagedest
+
+\ifx\pdfoutput\undefined
+ \pdffalse
+ \let\pdfmkdest = \gobble
+ \let\pdfurl = \gobble
+ \let\endlink = \relax
+ \let\linkcolor = \relax
+ \let\pdfmakeoutlines = \relax
+\else
+ \pdftrue
+ \pdfoutput = 1
+ \input pdfcolor
+ \def\dopdfimage#1#2#3{%
+ \def\imagewidth{#2}%
+ \def\imageheight{#3}%
+ % without \immediate, pdftex seg faults when the same image is
+ % included twice. (Version 3.14159-pre-1.0-unofficial-20010704.)
+ \ifnum\pdftexversion < 14
+ \immediate\pdfimage
+ \else
+ \immediate\pdfximage
+ \fi
+ \ifx\empty\imagewidth\else width \imagewidth \fi
+ \ifx\empty\imageheight\else height \imageheight \fi
+ \ifnum\pdftexversion<13
+ #1.pdf%
+ \else
+ {#1.pdf}%
+ \fi
+ \ifnum\pdftexversion < 14 \else
+ \pdfrefximage \pdflastximage
+ \fi}
+ \def\pdfmkdest#1{{\normalturnoffactive \pdfdest name{#1} xyz}}
+ \def\pdfmkpgn#1{#1}
+ \let\linkcolor = \Blue % was Cyan, but that seems light?
+ \def\endlink{\Black\pdfendlink}
+ % Adding outlines to PDF; macros for calculating structure of outlines
+ % come from Petr Olsak
+ \def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0%
+ \else \csname#1\endcsname \fi}
+ \def\advancenumber#1{\tempnum=\expnumber{#1}\relax
+ \advance\tempnum by1
+ \expandafter\xdef\csname#1\endcsname{\the\tempnum}}
+ \def\pdfmakeoutlines{{%
+ \openin 1 \jobname.toc
+ \ifeof 1\else\begingroup
+ \closein 1
+ % Thanh's hack / proper braces in bookmarks
+ \edef\mylbrace{\iftrue \string{\else}\fi}\let\{=\mylbrace
+ \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace
+ %
+ \def\chapentry ##1##2##3{}
+ \def\secentry ##1##2##3##4{\advancenumber{chap##2}}
+ \def\subsecentry ##1##2##3##4##5{\advancenumber{sec##2.##3}}
+ \def\subsubsecentry ##1##2##3##4##5##6{\advancenumber{subsec##2.##3.##4}}
+ \let\appendixentry = \chapentry
+ \let\unnumbchapentry = \chapentry
+ \let\unnumbsecentry = \secentry
+ \let\unnumbsubsecentry = \subsecentry
+ \let\unnumbsubsubsecentry = \subsubsecentry
+ \input \jobname.toc
+ \def\chapentry ##1##2##3{%
+ \pdfoutline goto name{\pdfmkpgn{##3}}count-\expnumber{chap##2}{##1}}
+ \def\secentry ##1##2##3##4{%
+ \pdfoutline goto name{\pdfmkpgn{##4}}count-\expnumber{sec##2.##3}{##1}}
+ \def\subsecentry ##1##2##3##4##5{%
+ \pdfoutline goto name{\pdfmkpgn{##5}}count-\expnumber{subsec##2.##3.##4}{##1}}
+ \def\subsubsecentry ##1##2##3##4##5##6{%
+ \pdfoutline goto name{\pdfmkpgn{##6}}{##1}}
+ \let\appendixentry = \chapentry
+ \let\unnumbchapentry = \chapentry
+ \let\unnumbsecentry = \secentry
+ \let\unnumbsubsecentry = \subsecentry
+ \let\unnumbsubsubsecentry = \subsubsecentry
+ %
+ % Make special characters normal for writing to the pdf file.
+ %
+ \indexnofonts
+ \let\tt=\relax
+ \turnoffactive
+ \input \jobname.toc
+ \endgroup\fi
+ }}
+ \def\makelinks #1,{%
+ \def\params{#1}\def\E{END}%
+ \ifx\params\E
+ \let\nextmakelinks=\relax
+ \else
+ \let\nextmakelinks=\makelinks
+ \ifnum\lnkcount>0,\fi
+ \picknum{#1}%
+ \startlink attr{/Border [0 0 0]}
+ goto name{\pdfmkpgn{\the\pgn}}%
+ \linkcolor #1%
+ \advance\lnkcount by 1%
+ \endlink
+ \fi
+ \nextmakelinks
+ }
+ \def\picknum#1{\expandafter\pn#1}
+ \def\pn#1{%
+ \def\p{#1}%
+ \ifx\p\lbrace
+ \let\nextpn=\ppn
+ \else
+ \let\nextpn=\ppnn
+ \def\first{#1}
+ \fi
+ \nextpn
+ }
+ \def\ppn#1{\pgn=#1\gobble}
+ \def\ppnn{\pgn=\first}
+ \def\pdfmklnk#1{\lnkcount=0\makelinks #1,END,}
+ \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
+ \def\skipspaces#1{\def\PP{#1}\def\D{|}%
+ \ifx\PP\D\let\nextsp\relax
+ \else\let\nextsp\skipspaces
+ \ifx\p\space\else\addtokens{\filename}{\PP}%
+ \advance\filenamelength by 1
+ \fi
+ \fi
+ \nextsp}
+ \def\getfilename#1{\filenamelength=0\expandafter\skipspaces#1|\relax}
+ \ifnum\pdftexversion < 14
+ \let \startlink \pdfannotlink
+ \else
+ \let \startlink \pdfstartlink
+ \fi
+ \def\pdfurl#1{%
+ \begingroup
+ \normalturnoffactive\def\@{@}%
+ \let\value=\expandablevalue
+ \leavevmode\Red
+ \startlink attr{/Border [0 0 0]}%
+ user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
+ % #1
+ \endgroup}
+ \def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}}
+ \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
+ \def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks}
+ \def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}}
+ \def\maketoks{%
+ \expandafter\poptoks\the\toksA|ENDTOKS|
+ \ifx\first0\adn0
+ \else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3
+ \else\ifx\first4\adn4 \else\ifx\first5\adn5 \else\ifx\first6\adn6
+ \else\ifx\first7\adn7 \else\ifx\first8\adn8 \else\ifx\first9\adn9
+ \else
+ \ifnum0=\countA\else\makelink\fi
+ \ifx\first.\let\next=\done\else
+ \let\next=\maketoks
+ \addtokens{\toksB}{\the\toksD}
+ \ifx\first,\addtokens{\toksB}{\space}\fi
+ \fi
+ \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+ \next}
+ \def\makelink{\addtokens{\toksB}%
+ {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0}
+ \def\pdflink#1{%
+ \startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}}
+ \linkcolor #1\endlink}
+ \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
+\fi % \ifx\pdfoutput
+
+
+\message{fonts,}
+% Font-change commands.
+
+% Texinfo sort of supports the sans serif font style, which plain TeX does not.
+% So we set up a \sf analogous to plain's \rm, etc.
+\newfam\sffam
+\def\sf{\fam=\sffam \tensf}
+\let\li = \sf % Sometimes we call it \li, not \sf.
+
+% We don't need math for this one.
+\def\ttsl{\tenttsl}
+
+% Default leading.
+\newdimen\textleading \textleading = 13.2pt
+
+% Set the baselineskip to #1, and the lineskip and strut size
+% correspondingly. There is no deep meaning behind these magic numbers
+% used as factors; they just match (closely enough) what Knuth defined.
+%
+\def\lineskipfactor{.08333}
+\def\strutheightpercent{.70833}
+\def\strutdepthpercent {.29167}
+%
+\def\setleading#1{%
+ \normalbaselineskip = #1\relax
+ \normallineskip = \lineskipfactor\normalbaselineskip
+ \normalbaselines
+ \setbox\strutbox =\hbox{%
+ \vrule width0pt height\strutheightpercent\baselineskip
+ depth \strutdepthpercent \baselineskip
+ }%
+}
+
+% Set the font macro #1 to the font named #2, adding on the
+% specified font prefix (normally `cm').
+% #3 is the font's design size, #4 is a scale factor
+\def\setfont#1#2#3#4{\font#1=\fontprefix#2#3 scaled #4}
+
+% Use cm as the default font prefix.
+% To specify the font prefix, you must define \fontprefix
+% before you read in texinfo.tex.
+\ifx\fontprefix\undefined
+\def\fontprefix{cm}
+\fi
+% Support font families that don't use the same naming scheme as CM.
+\def\rmshape{r}
+\def\rmbshape{bx} %where the normal face is bold
+\def\bfshape{b}
+\def\bxshape{bx}
+\def\ttshape{tt}
+\def\ttbshape{tt}
+\def\ttslshape{sltt}
+\def\itshape{ti}
+\def\itbshape{bxti}
+\def\slshape{sl}
+\def\slbshape{bxsl}
+\def\sfshape{ss}
+\def\sfbshape{ss}
+\def\scshape{csc}
+\def\scbshape{csc}
+
+\newcount\mainmagstep
+\ifx\bigger\relax
+ % not really supported.
+ \mainmagstep=\magstep1
+ \setfont\textrm\rmshape{12}{1000}
+ \setfont\texttt\ttshape{12}{1000}
+\else
+ \mainmagstep=\magstephalf
+ \setfont\textrm\rmshape{10}{\mainmagstep}
+ \setfont\texttt\ttshape{10}{\mainmagstep}
+\fi
+% Instead of cmb10, you may want to use cmbx10.
+% cmbx10 is a prettier font on its own, but cmb10
+% looks better when embedded in a line with cmr10
+% (in Bob's opinion).
+\setfont\textbf\bfshape{10}{\mainmagstep}
+\setfont\textit\itshape{10}{\mainmagstep}
+\setfont\textsl\slshape{10}{\mainmagstep}
+\setfont\textsf\sfshape{10}{\mainmagstep}
+\setfont\textsc\scshape{10}{\mainmagstep}
+\setfont\textttsl\ttslshape{10}{\mainmagstep}
+\font\texti=cmmi10 scaled \mainmagstep
+\font\textsy=cmsy10 scaled \mainmagstep
+
+% A few fonts for @defun, etc.
+\setfont\defbf\bxshape{10}{\magstep1} %was 1314
+\setfont\deftt\ttshape{10}{\magstep1}
+\def\df{\let\tentt=\deftt \let\tenbf = \defbf \bf}
+
+% Fonts for indices, footnotes, small examples (9pt).
+\setfont\smallrm\rmshape{9}{1000}
+\setfont\smalltt\ttshape{9}{1000}
+\setfont\smallbf\bfshape{10}{900}
+\setfont\smallit\itshape{9}{1000}
+\setfont\smallsl\slshape{9}{1000}
+\setfont\smallsf\sfshape{9}{1000}
+\setfont\smallsc\scshape{10}{900}
+\setfont\smallttsl\ttslshape{10}{900}
+\font\smalli=cmmi9
+\font\smallsy=cmsy9
+
+% Fonts for small examples (8pt).
+\setfont\smallerrm\rmshape{8}{1000}
+\setfont\smallertt\ttshape{8}{1000}
+\setfont\smallerbf\bfshape{10}{800}
+\setfont\smallerit\itshape{8}{1000}
+\setfont\smallersl\slshape{8}{1000}
+\setfont\smallersf\sfshape{8}{1000}
+\setfont\smallersc\scshape{10}{800}
+\setfont\smallerttsl\ttslshape{10}{800}
+\font\smalleri=cmmi8
+\font\smallersy=cmsy8
+
+% Fonts for title page:
+\setfont\titlerm\rmbshape{12}{\magstep3}
+\setfont\titleit\itbshape{10}{\magstep4}
+\setfont\titlesl\slbshape{10}{\magstep4}
+\setfont\titlett\ttbshape{12}{\magstep3}
+\setfont\titlettsl\ttslshape{10}{\magstep4}
+\setfont\titlesf\sfbshape{17}{\magstep1}
+\let\titlebf=\titlerm
+\setfont\titlesc\scbshape{10}{\magstep4}
+\font\titlei=cmmi12 scaled \magstep3
+\font\titlesy=cmsy10 scaled \magstep4
+\def\authorrm{\secrm}
+\def\authortt{\sectt}
+
+% Chapter (and unnumbered) fonts (17.28pt).
+\setfont\chaprm\rmbshape{12}{\magstep2}
+\setfont\chapit\itbshape{10}{\magstep3}
+\setfont\chapsl\slbshape{10}{\magstep3}
+\setfont\chaptt\ttbshape{12}{\magstep2}
+\setfont\chapttsl\ttslshape{10}{\magstep3}
+\setfont\chapsf\sfbshape{17}{1000}
+\let\chapbf=\chaprm
+\setfont\chapsc\scbshape{10}{\magstep3}
+\font\chapi=cmmi12 scaled \magstep2
+\font\chapsy=cmsy10 scaled \magstep3
+
+% Section fonts (14.4pt).
+\setfont\secrm\rmbshape{12}{\magstep1}
+\setfont\secit\itbshape{10}{\magstep2}
+\setfont\secsl\slbshape{10}{\magstep2}
+\setfont\sectt\ttbshape{12}{\magstep1}
+\setfont\secttsl\ttslshape{10}{\magstep2}
+\setfont\secsf\sfbshape{12}{\magstep1}
+\let\secbf\secrm
+\setfont\secsc\scbshape{10}{\magstep2}
+\font\seci=cmmi12 scaled \magstep1
+\font\secsy=cmsy10 scaled \magstep2
+
+% Subsection fonts (13.15pt).
+\setfont\ssecrm\rmbshape{12}{\magstephalf}
+\setfont\ssecit\itbshape{10}{1315}
+\setfont\ssecsl\slbshape{10}{1315}
+\setfont\ssectt\ttbshape{12}{\magstephalf}
+\setfont\ssecttsl\ttslshape{10}{1315}
+\setfont\ssecsf\sfbshape{12}{\magstephalf}
+\let\ssecbf\ssecrm
+\setfont\ssecsc\scbshape{10}{\magstep1}
+\font\sseci=cmmi12 scaled \magstephalf
+\font\ssecsy=cmsy10 scaled 1315
+% The smallcaps and symbol fonts should actually be scaled \magstep1.5,
+% but that is not a standard magnification.
+
+% In order for the font changes to affect most math symbols and letters,
+% we have to define the \textfont of the standard families. Since
+% texinfo doesn't allow for producing subscripts and superscripts except
+% in the main text, we don't bother to reset \scriptfont and
+% \scriptscriptfont (which would also require loading a lot more fonts).
+%
+\def\resetmathfonts{%
+ \textfont0=\tenrm \textfont1=\teni \textfont2=\tensy
+ \textfont\itfam=\tenit \textfont\slfam=\tensl \textfont\bffam=\tenbf
+ \textfont\ttfam=\tentt \textfont\sffam=\tensf
+}
+
+% The font-changing commands redefine the meanings of \tenSTYLE, instead
+% of just \STYLE. We do this so that font changes will continue to work
+% in math mode, where it is the current \fam that is relevant in most
+% cases, not the current font. Plain TeX does \def\bf{\fam=\bffam
+% \tenbf}, for example. By redefining \tenbf, we obviate the need to
+% redefine \bf itself.
+\def\textfonts{%
+ \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl
+ \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc
+ \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy \let\tenttsl=\textttsl
+ \resetmathfonts \setleading{\textleading}}
+\def\titlefonts{%
+ \let\tenrm=\titlerm \let\tenit=\titleit \let\tensl=\titlesl
+ \let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc
+ \let\tensf=\titlesf \let\teni=\titlei \let\tensy=\titlesy
+ \let\tenttsl=\titlettsl
+ \resetmathfonts \setleading{25pt}}
+\def\titlefont#1{{\titlefonts\rm #1}}
+\def\chapfonts{%
+ \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl
+ \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc
+ \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy \let\tenttsl=\chapttsl
+ \resetmathfonts \setleading{19pt}}
+\def\secfonts{%
+ \let\tenrm=\secrm \let\tenit=\secit \let\tensl=\secsl
+ \let\tenbf=\secbf \let\tentt=\sectt \let\smallcaps=\secsc
+ \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy \let\tenttsl=\secttsl
+ \resetmathfonts \setleading{16pt}}
+\def\subsecfonts{%
+ \let\tenrm=\ssecrm \let\tenit=\ssecit \let\tensl=\ssecsl
+ \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc
+ \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy \let\tenttsl=\ssecttsl
+ \resetmathfonts \setleading{15pt}}
+\let\subsubsecfonts = \subsecfonts % Maybe make sssec fonts scaled magstephalf?
+\def\smallfonts{%
+ \let\tenrm=\smallrm \let\tenit=\smallit \let\tensl=\smallsl
+ \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc
+ \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy
+ \let\tenttsl=\smallttsl
+ \resetmathfonts \setleading{10.5pt}}
+\def\smallerfonts{%
+ \let\tenrm=\smallerrm \let\tenit=\smallerit \let\tensl=\smallersl
+ \let\tenbf=\smallerbf \let\tentt=\smallertt \let\smallcaps=\smallersc
+ \let\tensf=\smallersf \let\teni=\smalleri \let\tensy=\smallersy
+ \let\tenttsl=\smallerttsl
+ \resetmathfonts \setleading{9.5pt}}
+
+% Set the fonts to use with the @small... environments.
+\let\smallexamplefonts = \smallfonts
+
+% About \smallexamplefonts. If we use \smallfonts (9pt), @smallexample
+% can fit this many characters:
+% 8.5x11=86 smallbook=72 a4=90 a5=69
+% If we use \smallerfonts (8pt), then we can fit this many characters:
+% 8.5x11=90+ smallbook=80 a4=90+ a5=77
+% For me, subjectively, the few extra characters that fit aren't worth
+% the additional smallness of 8pt. So I'm making the default 9pt.
+%
+% By the way, for comparison, here's what fits with @example (10pt):
+% 8.5x11=71 smallbook=60 a4=75 a5=58
+%
+% I wish we used A4 paper on this side of the Atlantic.
+%
+% --karl, 24jan03.
+
+
+% Set up the default fonts, so we can use them for creating boxes.
+%
+\textfonts
+
+% Define these so they can be easily changed for other fonts.
+\def\angleleft{$\langle$}
+\def\angleright{$\rangle$}
+
+% Count depth in font-changes, for error checks
+\newcount\fontdepth \fontdepth=0
+
+% Fonts for short table of contents.
+\setfont\shortcontrm\rmshape{12}{1000}
+\setfont\shortcontbf\bxshape{12}{1000}
+\setfont\shortcontsl\slshape{12}{1000}
+\setfont\shortconttt\ttshape{12}{1000}
+
+%% Add scribe-like font environments, plus @l for inline lisp (usually sans
+%% serif) and @ii for TeX italic
+
+% \smartitalic{ARG} outputs arg in italics, followed by an italic correction
+% unless the following character is such as not to need one.
+\def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else
+ \ptexslash\fi\fi\fi}
+\def\smartslanted#1{{\ifusingtt\ttsl\sl #1}\futurelet\next\smartitalicx}
+\def\smartitalic#1{{\ifusingtt\ttsl\it #1}\futurelet\next\smartitalicx}
+
+\let\i=\smartitalic
+\let\var=\smartslanted
+\let\dfn=\smartslanted
+\let\emph=\smartitalic
+\let\cite=\smartslanted
+
+\def\b#1{{\bf #1}}
+\let\strong=\b
+
+% We can't just use \exhyphenpenalty, because that only has effect at
+% the end of a paragraph. Restore normal hyphenation at the end of the
+% group within which \nohyphenation is presumably called.
+%
+\def\nohyphenation{\hyphenchar\font = -1 \aftergroup\restorehyphenation}
+\def\restorehyphenation{\hyphenchar\font = `- }
+
+% Set sfcode to normal for the chars that usually have another value.
+% Can't use plain's \frenchspacing because it uses the `\x notation, and
+% sometimes \x has an active definition that messes things up.
+%
+\catcode`@=11
+ \def\frenchspacing{%
+ \sfcode\dotChar =\@m \sfcode\questChar=\@m \sfcode\exclamChar=\@m
+ \sfcode\colonChar=\@m \sfcode\semiChar =\@m \sfcode\commaChar =\@m
+ }
+\catcode`@=\other
+
+\def\t#1{%
+ {\tt \rawbackslash \frenchspacing #1}%
+ \null
+}
+\let\ttfont=\t
+\def\samp#1{`\tclose{#1}'\null}
+\setfont\keyrm\rmshape{8}{1000}
+\font\keysy=cmsy9
+\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
+ \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
+ \vbox{\hrule\kern-0.4pt
+ \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
+ \kern-0.4pt\hrule}%
+ \kern-.06em\raise0.4pt\hbox{\angleright}}}}
+% The old definition, with no lozenge:
+%\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null}
+\def\ctrl #1{{\tt \rawbackslash \hat}#1}
+
+% @file, @option are the same as @samp.
+\let\file=\samp
+\let\option=\samp
+
+% @code is a modification of @t,
+% which makes spaces the same size as normal in the surrounding text.
+\def\tclose#1{%
+ {%
+ % Change normal interword space to be same as for the current font.
+ \spaceskip = \fontdimen2\font
+ %
+ % Switch to typewriter.
+ \tt
+ %
+ % But `\ ' produces the large typewriter interword space.
+ \def\ {{\spaceskip = 0pt{} }}%
+ %
+ % Turn off hyphenation.
+ \nohyphenation
+ %
+ \rawbackslash
+ \frenchspacing
+ #1%
+ }%
+ \null
+}
+
+% We *must* turn on hyphenation at `-' and `_' in \code.
+% Otherwise, it is too hard to avoid overfull hboxes
+% in the Emacs manual, the Library manual, etc.
+
+% Unfortunately, TeX uses one parameter (\hyphenchar) to control
+% both hyphenation at - and hyphenation within words.
+% We must therefore turn them both off (\tclose does that)
+% and arrange explicitly to hyphenate at a dash.
+% -- rms.
+{
+ \catcode`\-=\active
+ \catcode`\_=\active
+ %
+ \global\def\code{\begingroup
+ \catcode`\-=\active \let-\codedash
+ \catcode`\_=\active \let_\codeunder
+ \codex
+ }
+ %
+ % If we end up with any active - characters when handling the index,
+ % just treat them as a normal -.
+ \global\def\indexbreaks{\catcode`\-=\active \let-\realdash}
+}
+
+\def\realdash{-}
+\def\codedash{-\discretionary{}{}{}}
+\def\codeunder{%
+ % this is all so @math{@code{var_name}+1} can work. In math mode, _
+ % is "active" (mathcode"8000) and \normalunderscore (or \char95, etc.)
+ % will therefore expand the active definition of _, which is us
+ % (inside @code that is), therefore an endless loop.
+ \ifusingtt{\ifmmode
+ \mathchar"075F % class 0=ordinary, family 7=ttfam, pos 0x5F=_.
+ \else\normalunderscore \fi
+ \discretionary{}{}{}}%
+ {\_}%
+}
+\def\codex #1{\tclose{#1}\endgroup}
+
+% @kbd is like @code, except that if the argument is just one @key command,
+% then @kbd has no effect.
+
+% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
+% `example' (@kbd uses ttsl only inside of @example and friends),
+% or `code' (@kbd uses normal tty font always).
+\def\kbdinputstyle{\parsearg\kbdinputstylexxx}
+\def\kbdinputstylexxx#1{%
+ \def\arg{#1}%
+ \ifx\arg\worddistinct
+ \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
+ \else\ifx\arg\wordexample
+ \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
+ \else\ifx\arg\wordcode
+ \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
+ \else
+ \errhelp = \EMsimple
+ \errmessage{Unknown @kbdinputstyle option `\arg'}%
+ \fi\fi\fi
+}
+\def\worddistinct{distinct}
+\def\wordexample{example}
+\def\wordcode{code}
+
+% Default is `distinct.'
+\kbdinputstyle distinct
+
+\def\xkey{\key}
+\def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}%
+\ifx\one\xkey\ifx\threex\three \key{#2}%
+\else{\tclose{\kbdfont\look}}\fi
+\else{\tclose{\kbdfont\look}}\fi}
+
+% For @url, @env, @command quotes seem unnecessary, so use \code.
+\let\url=\code
+\let\env=\code
+\let\command=\code
+
+% @uref (abbreviation for `urlref') takes an optional (comma-separated)
+% second argument specifying the text to display and an optional third
+% arg as text to display instead of (rather than in addition to) the url
+% itself. First (mandatory) arg is the url. Perhaps eventually put in
+% a hypertex \special here.
+%
+\def\uref#1{\douref #1,,,\finish}
+\def\douref#1,#2,#3,#4\finish{\begingroup
+ \unsepspaces
+ \pdfurl{#1}%
+ \setbox0 = \hbox{\ignorespaces #3}%
+ \ifdim\wd0 > 0pt
+ \unhbox0 % third arg given, show only that
+ \else
+ \setbox0 = \hbox{\ignorespaces #2}%
+ \ifdim\wd0 > 0pt
+ \ifpdf
+ \unhbox0 % PDF: 2nd arg given, show only it
+ \else
+ \unhbox0\ (\code{#1})% DVI: 2nd arg given, show both it and url
+ \fi
+ \else
+ \code{#1}% only url given, so show it
+ \fi
+ \fi
+ \endlink
+\endgroup}
+
+% rms does not like angle brackets --karl, 17may97.
+% So now @email is just like @uref, unless we are pdf.
+%
+%\def\email#1{\angleleft{\tt #1}\angleright}
+\ifpdf
+ \def\email#1{\doemail#1,,\finish}
+ \def\doemail#1,#2,#3\finish{\begingroup
+ \unsepspaces
+ \pdfurl{mailto:#1}%
+ \setbox0 = \hbox{\ignorespaces #2}%
+ \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi
+ \endlink
+ \endgroup}
+\else
+ \let\email=\uref
+\fi
+
+% Check if we are currently using a typewriter font. Since all the
+% Computer Modern typewriter fonts have zero interword stretch (and
+% shrink), and it is reasonable to expect all typewriter fonts to have
+% this property, we can check that font parameter.
+%
+\def\ifmonospace{\ifdim\fontdimen3\font=0pt }
+
+% Typeset a dimension, e.g., `in' or `pt'. The only reason for the
+% argument is to make the input look right: @dmn{pt} instead of @dmn{}pt.
+%
+\def\dmn#1{\thinspace #1}
+
+\def\kbd#1{\def\look{#1}\expandafter\kbdfoo\look??\par}
+
+% @l was never documented to mean ``switch to the Lisp font'',
+% and it is not used as such in any manual I can find. We need it for
+% Polish suppressed-l. --karl, 22sep96.
+%\def\l#1{{\li #1}\null}
+
+% Explicit font changes: @r, @sc, undocumented @ii.
+\def\r#1{{\rm #1}} % roman font
+\def\sc#1{{\smallcaps#1}} % smallcaps font
+\def\ii#1{{\it #1}} % italic font
+
+% @acronym downcases the argument and prints in smallcaps.
+\def\acronym#1{{\smallcaps \lowercase{#1}}}
+
+% @pounds{} is a sterling sign.
+\def\pounds{{\it\$}}
+
+% @registeredsymbol - R in a circle. For now, only works in text size;
+% we'd have to redo the font mechanism to change the \scriptstyle and
+% \scriptscriptstyle font sizes to make it look right in headings.
+% Adapted from the plain.tex definition of \copyright.
+%
+\def\registeredsymbol{%
+ $^{{\ooalign{\hfil\raise.07ex\hbox{$\scriptstyle\rm R$}\hfil\crcr\Orb}}%
+ }$%
+}
+
+
+\message{page headings,}
+
+\newskip\titlepagetopglue \titlepagetopglue = 1.5in
+\newskip\titlepagebottomglue \titlepagebottomglue = 2pc
+
+% First the title page. Must do @settitle before @titlepage.
+\newif\ifseenauthor
+\newif\iffinishedtitlepage
+
+% Do an implicit @contents or @shortcontents after @end titlepage if the
+% user says @setcontentsaftertitlepage or @setshortcontentsaftertitlepage.
+%
+\newif\ifsetcontentsaftertitlepage
+ \let\setcontentsaftertitlepage = \setcontentsaftertitlepagetrue
+\newif\ifsetshortcontentsaftertitlepage
+ \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue
+
+\def\shorttitlepage{\parsearg\shorttitlepagezzz}
+\def\shorttitlepagezzz #1{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}%
+ \endgroup\page\hbox{}\page}
+
+\def\titlepage{\begingroup \parindent=0pt \textfonts
+ \let\subtitlerm=\tenrm
+ \def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}%
+ %
+ \def\authorfont{\authorrm \normalbaselineskip = 16pt \normalbaselines
+ \let\tt=\authortt}%
+ %
+ % Leave some space at the very top of the page.
+ \vglue\titlepagetopglue
+ %
+ % Now you can print the title using @title.
+ \def\title{\parsearg\titlezzz}%
+ \def\titlezzz##1{\leftline{\titlefonts\rm ##1}
+ % print a rule at the page bottom also.
+ \finishedtitlepagefalse
+ \vskip4pt \hrule height 4pt width \hsize \vskip4pt}%
+ % No rule at page bottom unless we print one at the top with @title.
+ \finishedtitlepagetrue
+ %
+ % Now you can put text using @subtitle.
+ \def\subtitle{\parsearg\subtitlezzz}%
+ \def\subtitlezzz##1{{\subtitlefont \rightline{##1}}}%
+ %
+ % @author should come last, but may come many times.
+ \def\author{\parsearg\authorzzz}%
+ \def\authorzzz##1{\ifseenauthor\else\vskip 0pt plus 1filll\seenauthortrue\fi
+ {\authorfont \leftline{##1}}}%
+ %
+ % Most title ``pages'' are actually two pages long, with space
+ % at the top of the second. We don't want the ragged left on the second.
+ \let\oldpage = \page
+ \def\page{%
+ \iffinishedtitlepage\else
+ \finishtitlepage
+ \fi
+ \oldpage
+ \let\page = \oldpage
+ \hbox{}}%
+% \def\page{\oldpage \hbox{}}
+}
+
+\def\Etitlepage{%
+ \iffinishedtitlepage\else
+ \finishtitlepage
+ \fi
+ % It is important to do the page break before ending the group,
+ % because the headline and footline are only empty inside the group.
+ % If we use the new definition of \page, we always get a blank page
+ % after the title page, which we certainly don't want.
+ \oldpage
+ \endgroup
+ %
+ % Need this before the \...aftertitlepage checks so that if they are
+ % in effect the toc pages will come out with page numbers.
+ \HEADINGSon
+ %
+ % If they want short, they certainly want long too.
+ \ifsetshortcontentsaftertitlepage
+ \shortcontents
+ \contents
+ \global\let\shortcontents = \relax
+ \global\let\contents = \relax
+ \fi
+ %
+ \ifsetcontentsaftertitlepage
+ \contents
+ \global\let\contents = \relax
+ \global\let\shortcontents = \relax
+ \fi
+}
+
+\def\finishtitlepage{%
+ \vskip4pt \hrule height 2pt width \hsize
+ \vskip\titlepagebottomglue
+ \finishedtitlepagetrue
+}
+
+%%% Set up page headings and footings.
+
+\let\thispage=\folio
+
+\newtoks\evenheadline % headline on even pages
+\newtoks\oddheadline % headline on odd pages
+\newtoks\evenfootline % footline on even pages
+\newtoks\oddfootline % footline on odd pages
+
+% Now make Tex use those variables
+\headline={{\textfonts\rm \ifodd\pageno \the\oddheadline
+ \else \the\evenheadline \fi}}
+\footline={{\textfonts\rm \ifodd\pageno \the\oddfootline
+ \else \the\evenfootline \fi}\HEADINGShook}
+\let\HEADINGShook=\relax
+
+% Commands to set those variables.
+% For example, this is what @headings on does
+% @evenheading @thistitle|@thispage|@thischapter
+% @oddheading @thischapter|@thispage|@thistitle
+% @evenfooting @thisfile||
+% @oddfooting ||@thisfile
+
+\def\evenheading{\parsearg\evenheadingxxx}
+\def\oddheading{\parsearg\oddheadingxxx}
+\def\everyheading{\parsearg\everyheadingxxx}
+
+\def\evenfooting{\parsearg\evenfootingxxx}
+\def\oddfooting{\parsearg\oddfootingxxx}
+\def\everyfooting{\parsearg\everyfootingxxx}
+
+{\catcode`\@=0 %
+
+\gdef\evenheadingxxx #1{\evenheadingyyy #1@|@|@|@|\finish}
+\gdef\evenheadingyyy #1@|#2@|#3@|#4\finish{%
+\global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
+
+\gdef\oddheadingxxx #1{\oddheadingyyy #1@|@|@|@|\finish}
+\gdef\oddheadingyyy #1@|#2@|#3@|#4\finish{%
+\global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
+
+\gdef\everyheadingxxx#1{\oddheadingxxx{#1}\evenheadingxxx{#1}}%
+
+\gdef\evenfootingxxx #1{\evenfootingyyy #1@|@|@|@|\finish}
+\gdef\evenfootingyyy #1@|#2@|#3@|#4\finish{%
+\global\evenfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
+
+\gdef\oddfootingxxx #1{\oddfootingyyy #1@|@|@|@|\finish}
+\gdef\oddfootingyyy #1@|#2@|#3@|#4\finish{%
+ \global\oddfootline = {\rlap{\centerline{#2}}\line{#1\hfil#3}}%
+ %
+ % Leave some space for the footline. Hopefully ok to assume
+ % @evenfooting will not be used by itself.
+ \global\advance\pageheight by -\baselineskip
+ \global\advance\vsize by -\baselineskip
+}
+
+\gdef\everyfootingxxx#1{\oddfootingxxx{#1}\evenfootingxxx{#1}}
+%
+}% unbind the catcode of @.
+
+% @headings double turns headings on for double-sided printing.
+% @headings single turns headings on for single-sided printing.
+% @headings off turns them off.
+% @headings on same as @headings double, retained for compatibility.
+% @headings after turns on double-sided headings after this page.
+% @headings doubleafter turns on double-sided headings after this page.
+% @headings singleafter turns on single-sided headings after this page.
+% By default, they are off at the start of a document,
+% and turned `on' after @end titlepage.
+
+\def\headings #1 {\csname HEADINGS#1\endcsname}
+
+\def\HEADINGSoff{
+\global\evenheadline={\hfil} \global\evenfootline={\hfil}
+\global\oddheadline={\hfil} \global\oddfootline={\hfil}}
+\HEADINGSoff
+% When we turn headings on, set the page number to 1.
+% For double-sided printing, put current file name in lower left corner,
+% chapter name on inside top of right hand pages, document
+% title on inside top of left hand pages, and page numbers on outside top
+% edge of all pages.
+\def\HEADINGSdouble{
+\global\pageno=1
+\global\evenfootline={\hfil}
+\global\oddfootline={\hfil}
+\global\evenheadline={\line{\folio\hfil\thistitle}}
+\global\oddheadline={\line{\thischapter\hfil\folio}}
+\global\let\contentsalignmacro = \chapoddpage
+}
+\let\contentsalignmacro = \chappager
+
+% For single-sided printing, chapter title goes across top left of page,
+% page number on top right.
+\def\HEADINGSsingle{
+\global\pageno=1
+\global\evenfootline={\hfil}
+\global\oddfootline={\hfil}
+\global\evenheadline={\line{\thischapter\hfil\folio}}
+\global\oddheadline={\line{\thischapter\hfil\folio}}
+\global\let\contentsalignmacro = \chappager
+}
+\def\HEADINGSon{\HEADINGSdouble}
+
+\def\HEADINGSafter{\let\HEADINGShook=\HEADINGSdoublex}
+\let\HEADINGSdoubleafter=\HEADINGSafter
+\def\HEADINGSdoublex{%
+\global\evenfootline={\hfil}
+\global\oddfootline={\hfil}
+\global\evenheadline={\line{\folio\hfil\thistitle}}
+\global\oddheadline={\line{\thischapter\hfil\folio}}
+\global\let\contentsalignmacro = \chapoddpage
+}
+
+\def\HEADINGSsingleafter{\let\HEADINGShook=\HEADINGSsinglex}
+\def\HEADINGSsinglex{%
+\global\evenfootline={\hfil}
+\global\oddfootline={\hfil}
+\global\evenheadline={\line{\thischapter\hfil\folio}}
+\global\oddheadline={\line{\thischapter\hfil\folio}}
+\global\let\contentsalignmacro = \chappager
+}
+
+% Subroutines used in generating headings
+% This produces Day Month Year style of output.
+% Only define if not already defined, in case a txi-??.tex file has set
+% up a different format (e.g., txi-cs.tex does this).
+\ifx\today\undefined
+\def\today{%
+ \number\day\space
+ \ifcase\month
+ \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr
+ \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug
+ \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec
+ \fi
+ \space\number\year}
+\fi
+
+% @settitle line... specifies the title of the document, for headings.
+% It generates no output of its own.
+\def\thistitle{\putwordNoTitle}
+\def\settitle{\parsearg\settitlezzz}
+\def\settitlezzz #1{\gdef\thistitle{#1}}
+
+
+\message{tables,}
+% Tables -- @table, @ftable, @vtable, @item(x), @kitem(x), @xitem(x).
+
+% default indentation of table text
+\newdimen\tableindent \tableindent=.8in
+% default indentation of @itemize and @enumerate text
+\newdimen\itemindent \itemindent=.3in
+% margin between end of table item and start of table text.
+\newdimen\itemmargin \itemmargin=.1in
+
+% used internally for \itemindent minus \itemmargin
+\newdimen\itemmax
+
+% Note @table, @vtable, and @vtable define @item, @itemx, etc., with
+% these defs.
+% They also define \itemindex
+% to index the item name in whatever manner is desired (perhaps none).
+
+\newif\ifitemxneedsnegativevskip
+
+\def\itemxpar{\par\ifitemxneedsnegativevskip\nobreak\vskip-\parskip\nobreak\fi}
+
+\def\internalBitem{\smallbreak \parsearg\itemzzz}
+\def\internalBitemx{\itemxpar \parsearg\itemzzz}
+
+\def\internalBxitem "#1"{\def\xitemsubtopix{#1} \smallbreak \parsearg\xitemzzz}
+\def\internalBxitemx "#1"{\def\xitemsubtopix{#1} \itemxpar \parsearg\xitemzzz}
+
+\def\internalBkitem{\smallbreak \parsearg\kitemzzz}
+\def\internalBkitemx{\itemxpar \parsearg\kitemzzz}
+
+\def\kitemzzz #1{\dosubind {kw}{\code{#1}}{for {\bf \lastfunction}}%
+ \itemzzz {#1}}
+
+\def\xitemzzz #1{\dosubind {kw}{\code{#1}}{for {\bf \xitemsubtopic}}%
+ \itemzzz {#1}}
+
+\def\itemzzz #1{\begingroup %
+ \advance\hsize by -\rightskip
+ \advance\hsize by -\tableindent
+ \setbox0=\hbox{\itemfont{#1}}%
+ \itemindex{#1}%
+ \nobreak % This prevents a break before @itemx.
+ %
+ % If the item text does not fit in the space we have, put it on a line
+ % by itself, and do not allow a page break either before or after that
+ % line. We do not start a paragraph here because then if the next
+ % command is, e.g., @kindex, the whatsit would get put into the
+ % horizontal list on a line by itself, resulting in extra blank space.
+ \ifdim \wd0>\itemmax
+ %
+ % Make this a paragraph so we get the \parskip glue and wrapping,
+ % but leave it ragged-right.
+ \begingroup
+ \advance\leftskip by-\tableindent
+ \advance\hsize by\tableindent
+ \advance\rightskip by0pt plus1fil
+ \leavevmode\unhbox0\par
+ \endgroup
+ %
+ % We're going to be starting a paragraph, but we don't want the
+ % \parskip glue -- logically it's part of the @item we just started.
+ \nobreak \vskip-\parskip
+ %
+ % Stop a page break at the \parskip glue coming up. (Unfortunately
+ % we can't prevent a possible page break at the following
+ % \baselineskip glue.) However, if what follows is an environment
+ % such as @example, there will be no \parskip glue; then
+ % the negative vskip we just would cause the example and the item to
+ % crash together. So we use this bizarre value of 10001 as a signal
+ % to \aboveenvbreak to insert \parskip glue after all.
+ % (Possibly there are other commands that could be followed by
+ % @example which need the same treatment, but not section titles; or
+ % maybe section titles are the only special case and they should be
+ % penalty 10001...)
+ \penalty 10001
+ \endgroup
+ \itemxneedsnegativevskipfalse
+ \else
+ % The item text fits into the space. Start a paragraph, so that the
+ % following text (if any) will end up on the same line.
+ \noindent
+ % Do this with kerns and \unhbox so that if there is a footnote in
+ % the item text, it can migrate to the main vertical list and
+ % eventually be printed.
+ \nobreak\kern-\tableindent
+ \dimen0 = \itemmax \advance\dimen0 by \itemmargin \advance\dimen0 by -\wd0
+ \unhbox0
+ \nobreak\kern\dimen0
+ \endgroup
+ \itemxneedsnegativevskiptrue
+ \fi
+}
+
+\def\item{\errmessage{@item while not in a table}}
+\def\itemx{\errmessage{@itemx while not in a table}}
+\def\kitem{\errmessage{@kitem while not in a table}}
+\def\kitemx{\errmessage{@kitemx while not in a table}}
+\def\xitem{\errmessage{@xitem while not in a table}}
+\def\xitemx{\errmessage{@xitemx while not in a table}}
+
+% Contains a kludge to get @end[description] to work.
+\def\description{\tablez{\dontindex}{1}{}{}{}{}}
+
+% @table, @ftable, @vtable.
+\def\table{\begingroup\inENV\obeylines\obeyspaces\tablex}
+{\obeylines\obeyspaces%
+\gdef\tablex #1^^M{%
+\tabley\dontindex#1 \endtabley}}
+
+\def\ftable{\begingroup\inENV\obeylines\obeyspaces\ftablex}
+{\obeylines\obeyspaces%
+\gdef\ftablex #1^^M{%
+\tabley\fnitemindex#1 \endtabley
+\def\Eftable{\endgraf\afterenvbreak\endgroup}%
+\let\Etable=\relax}}
+
+\def\vtable{\begingroup\inENV\obeylines\obeyspaces\vtablex}
+{\obeylines\obeyspaces%
+\gdef\vtablex #1^^M{%
+\tabley\vritemindex#1 \endtabley
+\def\Evtable{\endgraf\afterenvbreak\endgroup}%
+\let\Etable=\relax}}
+
+\def\dontindex #1{}
+\def\fnitemindex #1{\doind {fn}{\code{#1}}}%
+\def\vritemindex #1{\doind {vr}{\code{#1}}}%
+
+{\obeyspaces %
+\gdef\tabley#1#2 #3 #4 #5 #6 #7\endtabley{\endgroup%
+\tablez{#1}{#2}{#3}{#4}{#5}{#6}}}
+
+\def\tablez #1#2#3#4#5#6{%
+\aboveenvbreak %
+\begingroup %
+\def\Edescription{\Etable}% Necessary kludge.
+\let\itemindex=#1%
+\ifnum 0#3>0 \advance \leftskip by #3\mil \fi %
+\ifnum 0#4>0 \tableindent=#4\mil \fi %
+\ifnum 0#5>0 \advance \rightskip by #5\mil \fi %
+\def\itemfont{#2}%
+\itemmax=\tableindent %
+\advance \itemmax by -\itemmargin %
+\advance \leftskip by \tableindent %
+\exdentamount=\tableindent
+\parindent = 0pt
+\parskip = \smallskipamount
+\ifdim \parskip=0pt \parskip=2pt \fi%
+\def\Etable{\endgraf\afterenvbreak\endgroup}%
+\let\item = \internalBitem %
+\let\itemx = \internalBitemx %
+\let\kitem = \internalBkitem %
+\let\kitemx = \internalBkitemx %
+\let\xitem = \internalBxitem %
+\let\xitemx = \internalBxitemx %
+}
+
+% This is the counter used by @enumerate, which is really @itemize
+
+\newcount \itemno
+
+\def\itemize{\parsearg\itemizezzz}
+
+\def\itemizezzz #1{%
+ \begingroup % ended by the @end itemize
+ \itemizey {#1}{\Eitemize}
+}
+
+\def\itemizey#1#2{%
+ \aboveenvbreak
+ \itemmax=\itemindent
+ \advance\itemmax by -\itemmargin
+ \advance\leftskip by \itemindent
+ \exdentamount=\itemindent
+ \parindent=0pt
+ \parskip=\smallskipamount
+ \ifdim\parskip=0pt \parskip=2pt \fi
+ \def#2{\endgraf\afterenvbreak\endgroup}%
+ \def\itemcontents{#1}%
+ % @itemize with no arg is equivalent to @itemize @bullet.
+ \ifx\itemcontents\empty\def\itemcontents{\bullet}\fi
+ \let\item=\itemizeitem
+}
+
+% \splitoff TOKENS\endmark defines \first to be the first token in
+% TOKENS, and \rest to be the remainder.
+%
+\def\splitoff#1#2\endmark{\def\first{#1}\def\rest{#2}}%
+
+% Allow an optional argument of an uppercase letter, lowercase letter,
+% or number, to specify the first label in the enumerated list. No
+% argument is the same as `1'.
+%
+\def\enumerate{\parsearg\enumeratezzz}
+\def\enumeratezzz #1{\enumeratey #1 \endenumeratey}
+\def\enumeratey #1 #2\endenumeratey{%
+ \begingroup % ended by the @end enumerate
+ %
+ % If we were given no argument, pretend we were given `1'.
+ \def\thearg{#1}%
+ \ifx\thearg\empty \def\thearg{1}\fi
+ %
+ % Detect if the argument is a single token. If so, it might be a
+ % letter. Otherwise, the only valid thing it can be is a number.
+ % (We will always have one token, because of the test we just made.
+ % This is a good thing, since \splitoff doesn't work given nothing at
+ % all -- the first parameter is undelimited.)
+ \expandafter\splitoff\thearg\endmark
+ \ifx\rest\empty
+ % Only one token in the argument. It could still be anything.
+ % A ``lowercase letter'' is one whose \lccode is nonzero.
+ % An ``uppercase letter'' is one whose \lccode is both nonzero, and
+ % not equal to itself.
+ % Otherwise, we assume it's a number.
+ %
+ % We need the \relax at the end of the \ifnum lines to stop TeX from
+ % continuing to look for a <number>.
+ %
+ \ifnum\lccode\expandafter`\thearg=0\relax
+ \numericenumerate % a number (we hope)
+ \else
+ % It's a letter.
+ \ifnum\lccode\expandafter`\thearg=\expandafter`\thearg\relax
+ \lowercaseenumerate % lowercase letter
+ \else
+ \uppercaseenumerate % uppercase letter
+ \fi
+ \fi
+ \else
+ % Multiple tokens in the argument. We hope it's a number.
+ \numericenumerate
+ \fi
+}
+
+% An @enumerate whose labels are integers. The starting integer is
+% given in \thearg.
+%
+\def\numericenumerate{%
+ \itemno = \thearg
+ \startenumeration{\the\itemno}%
+}
+
+% The starting (lowercase) letter is in \thearg.
+\def\lowercaseenumerate{%
+ \itemno = \expandafter`\thearg
+ \startenumeration{%
+ % Be sure we're not beyond the end of the alphabet.
+ \ifnum\itemno=0
+ \errmessage{No more lowercase letters in @enumerate; get a bigger
+ alphabet}%
+ \fi
+ \char\lccode\itemno
+ }%
+}
+
+% The starting (uppercase) letter is in \thearg.
+\def\uppercaseenumerate{%
+ \itemno = \expandafter`\thearg
+ \startenumeration{%
+ % Be sure we're not beyond the end of the alphabet.
+ \ifnum\itemno=0
+ \errmessage{No more uppercase letters in @enumerate; get a bigger
+ alphabet}
+ \fi
+ \char\uccode\itemno
+ }%
+}
+
+% Call itemizey, adding a period to the first argument and supplying the
+% common last two arguments. Also subtract one from the initial value in
+% \itemno, since @item increments \itemno.
+%
+\def\startenumeration#1{%
+ \advance\itemno by -1
+ \itemizey{#1.}\Eenumerate\flushcr
+}
+
+% @alphaenumerate and @capsenumerate are abbreviations for giving an arg
+% to @enumerate.
+%
+\def\alphaenumerate{\enumerate{a}}
+\def\capsenumerate{\enumerate{A}}
+\def\Ealphaenumerate{\Eenumerate}
+\def\Ecapsenumerate{\Eenumerate}
+
+% Definition of @item while inside @itemize.
+
+\def\itemizeitem{%
+\advance\itemno by 1
+{\let\par=\endgraf \smallbreak}%
+\ifhmode \errmessage{In hmode at itemizeitem}\fi
+{\parskip=0in \hskip 0pt
+\hbox to 0pt{\hss \itemcontents\hskip \itemmargin}%
+\vadjust{\penalty 1200}}%
+\flushcr}
+
+% @multitable macros
+% Amy Hendrickson, 8/18/94, 3/6/96
+%
+% @multitable ... @end multitable will make as many columns as desired.
+% Contents of each column will wrap at width given in preamble. Width
+% can be specified either with sample text given in a template line,
+% or in percent of \hsize, the current width of text on page.
+
+% Table can continue over pages but will only break between lines.
+
+% To make preamble:
+%
+% Either define widths of columns in terms of percent of \hsize:
+% @multitable @columnfractions .25 .3 .45
+% @item ...
+%
+% Numbers following @columnfractions are the percent of the total
+% current hsize to be used for each column. You may use as many
+% columns as desired.
+
+
+% Or use a template:
+% @multitable {Column 1 template} {Column 2 template} {Column 3 template}
+% @item ...
+% using the widest term desired in each column.
+%
+% For those who want to use more than one line's worth of words in
+% the preamble, break the line within one argument and it
+% will parse correctly, i.e.,
+%
+% @multitable {Column 1 template} {Column 2 template} {Column 3
+% template}
+% Not:
+% @multitable {Column 1 template} {Column 2 template}
+% {Column 3 template}
+
+% Each new table line starts with @item, each subsequent new column
+% starts with @tab. Empty columns may be produced by supplying @tab's
+% with nothing between them for as many times as empty columns are needed,
+% ie, @tab@tab@tab will produce two empty columns.
+
+% @item, @tab, @multitable or @end multitable do not need to be on their
+% own lines, but it will not hurt if they are.
+
+% Sample multitable:
+
+% @multitable {Column 1 template} {Column 2 template} {Column 3 template}
+% @item first col stuff @tab second col stuff @tab third col
+% @item
+% first col stuff
+% @tab
+% second col stuff
+% @tab
+% third col
+% @item first col stuff @tab second col stuff
+% @tab Many paragraphs of text may be used in any column.
+%
+% They will wrap at the width determined by the template.
+% @item@tab@tab This will be in third column.
+% @end multitable
+
+% Default dimensions may be reset by user.
+% @multitableparskip is vertical space between paragraphs in table.
+% @multitableparindent is paragraph indent in table.
+% @multitablecolmargin is horizontal space to be left between columns.
+% @multitablelinespace is space to leave between table items, baseline
+% to baseline.
+% 0pt means it depends on current normal line spacing.
+%
+\newskip\multitableparskip
+\newskip\multitableparindent
+\newdimen\multitablecolspace
+\newskip\multitablelinespace
+\multitableparskip=0pt
+\multitableparindent=6pt
+\multitablecolspace=12pt
+\multitablelinespace=0pt
+
+% Macros used to set up halign preamble:
+%
+\let\endsetuptable\relax
+\def\xendsetuptable{\endsetuptable}
+\let\columnfractions\relax
+\def\xcolumnfractions{\columnfractions}
+\newif\ifsetpercent
+
+% #1 is the part of the @columnfraction before the decimal point, which
+% is presumably either 0 or the empty string (but we don't check, we
+% just throw it away). #2 is the decimal part, which we use as the
+% percent of \hsize for this column.
+\def\pickupwholefraction#1.#2 {%
+ \global\advance\colcount by 1
+ \expandafter\xdef\csname col\the\colcount\endcsname{.#2\hsize}%
+ \setuptable
+}
+
+\newcount\colcount
+\def\setuptable#1{%
+ \def\firstarg{#1}%
+ \ifx\firstarg\xendsetuptable
+ \let\go = \relax
+ \else
+ \ifx\firstarg\xcolumnfractions
+ \global\setpercenttrue
+ \else
+ \ifsetpercent
+ \let\go\pickupwholefraction
+ \else
+ \global\advance\colcount by 1
+ \setbox0=\hbox{#1\unskip\space}% Add a normal word space as a
+ % separator; typically that is always in the input, anyway.
+ \expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}%
+ \fi
+ \fi
+ \ifx\go\pickupwholefraction
+ % Put the argument back for the \pickupwholefraction call, so
+ % we'll always have a period there to be parsed.
+ \def\go{\pickupwholefraction#1}%
+ \else
+ \let\go = \setuptable
+ \fi%
+ \fi
+ \go
+}
+
+% @multitable ... @end multitable definitions:
+%
+\def\multitable{\parsearg\dotable}
+\def\dotable#1{\bgroup
+ \vskip\parskip
+ \let\item=\crcrwithfootnotes
+ % A \tab used to include \hskip1sp. But then the space in a template
+ % line is not enough. That is bad. So let's go back to just & until
+ % we encounter the problem it was intended to solve again. --karl,
+ % [email protected], 20apr99.
+ \let\tab=&%
+ \let\startfootins=\startsavedfootnote
+ \tolerance=9500
+ \hbadness=9500
+ \setmultitablespacing
+ \parskip=\multitableparskip
+ \parindent=\multitableparindent
+ \overfullrule=0pt
+ \global\colcount=0
+ \def\Emultitable{%
+ \global\setpercentfalse
+ \crcrwithfootnotes\crcr
+ \egroup\egroup
+ }%
+ %
+ % To parse everything between @multitable and @item:
+ \setuptable#1 \endsetuptable
+ %
+ % \everycr will reset column counter, \colcount, at the end of
+ % each line. Every column entry will cause \colcount to advance by one.
+ % The table preamble
+ % looks at the current \colcount to find the correct column width.
+ \everycr{\noalign{%
+ %
+ % \filbreak%% keeps underfull box messages off when table breaks over pages.
+ % Maybe so, but it also creates really weird page breaks when the table
+ % breaks over pages. Wouldn't \vfil be better? Wait until the problem
+ % manifests itself, so it can be fixed for real --karl.
+ \global\colcount=0\relax}}%
+ %
+ % This preamble sets up a generic column definition, which will
+ % be used as many times as user calls for columns.
+ % \vtop will set a single line and will also let text wrap and
+ % continue for many paragraphs if desired.
+ \halign\bgroup&\global\advance\colcount by 1\relax
+ \multistrut\vtop{\hsize=\expandafter\csname col\the\colcount\endcsname
+ %
+ % In order to keep entries from bumping into each other
+ % we will add a \leftskip of \multitablecolspace to all columns after
+ % the first one.
+ %
+ % If a template has been used, we will add \multitablecolspace
+ % to the width of each template entry.
+ %
+ % If the user has set preamble in terms of percent of \hsize we will
+ % use that dimension as the width of the column, and the \leftskip
+ % will keep entries from bumping into each other. Table will start at
+ % left margin and final column will justify at right margin.
+ %
+ % Make sure we don't inherit \rightskip from the outer environment.
+ \rightskip=0pt
+ \ifnum\colcount=1
+ % The first column will be indented with the surrounding text.
+ \advance\hsize by\leftskip
+ \else
+ \ifsetpercent \else
+ % If user has not set preamble in terms of percent of \hsize
+ % we will advance \hsize by \multitablecolspace.
+ \advance\hsize by \multitablecolspace
+ \fi
+ % In either case we will make \leftskip=\multitablecolspace:
+ \leftskip=\multitablecolspace
+ \fi
+ % Ignoring space at the beginning and end avoids an occasional spurious
+ % blank line, when TeX decides to break the line at the space before the
+ % box from the multistrut, so the strut ends up on a line by itself.
+ % For example:
+ % @multitable @columnfractions .11 .89
+ % @item @code{#}
+ % @tab Legal holiday which is valid in major parts of the whole country.
+ % Is automatically provided with highlighting sequences respectively marking
+ % characters.
+ \noindent\ignorespaces##\unskip\multistrut}\cr
+}
+
+\def\setmultitablespacing{% test to see if user has set \multitablelinespace.
+% If so, do nothing. If not, give it an appropriate dimension based on
+% current baselineskip.
+\ifdim\multitablelinespace=0pt
+\setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip
+\global\advance\multitablelinespace by-\ht0
+%% strut to put in table in case some entry doesn't have descenders,
+%% to keep lines equally spaced
+\let\multistrut = \strut
+\else
+%% FIXME: what is \box0 supposed to be?
+\gdef\multistrut{\vrule height\multitablelinespace depth\dp0
+width0pt\relax} \fi
+%% Test to see if parskip is larger than space between lines of
+%% table. If not, do nothing.
+%% If so, set to same dimension as multitablelinespace.
+\ifdim\multitableparskip>\multitablelinespace
+\global\multitableparskip=\multitablelinespace
+\global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
+ %% than skip between lines in the table.
+\fi%
+\ifdim\multitableparskip=0pt
+\global\multitableparskip=\multitablelinespace
+\global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
+ %% than skip between lines in the table.
+\fi}
+
+% In case a @footnote appears inside an alignment, save the footnote
+% text to a box and make the \insert when a row of the table is
+% finished. Otherwise, the insertion is lost, it never migrates to the
+% main vertical list. --kasal, 22jan03.
+%
+\newbox\savedfootnotes
+%
+% \dotable \let's \startfootins to this, so that \dofootnote will call
+% it instead of starting the insertion right away.
+\def\startsavedfootnote{%
+ \global\setbox\savedfootnotes = \vbox\bgroup
+ \unvbox\savedfootnotes
+}
+\def\crcrwithfootnotes{%
+ \crcr
+ \ifvoid\savedfootnotes \else
+ \noalign{\insert\footins{\box\savedfootnotes}}%
+ \fi
+}
+
+\message{conditionals,}
+% Prevent errors for section commands.
+% Used in @ignore and in failing conditionals.
+\def\ignoresections{%
+ \let\chapter=\relax
+ \let\unnumbered=\relax
+ \let\top=\relax
+ \let\unnumberedsec=\relax
+ \let\unnumberedsection=\relax
+ \let\unnumberedsubsec=\relax
+ \let\unnumberedsubsection=\relax
+ \let\unnumberedsubsubsec=\relax
+ \let\unnumberedsubsubsection=\relax
+ \let\section=\relax
+ \let\subsec=\relax
+ \let\subsubsec=\relax
+ \let\subsection=\relax
+ \let\subsubsection=\relax
+ \let\appendix=\relax
+ \let\appendixsec=\relax
+ \let\appendixsection=\relax
+ \let\appendixsubsec=\relax
+ \let\appendixsubsection=\relax
+ \let\appendixsubsubsec=\relax
+ \let\appendixsubsubsection=\relax
+ \let\contents=\relax
+ \let\smallbook=\relax
+ \let\titlepage=\relax
+}
+
+% Used in nested conditionals, where we have to parse the Texinfo source
+% and so want to turn off most commands, in case they are used
+% incorrectly.
+%
+% We use \empty instead of \relax for the @def... commands, so that \end
+% doesn't throw an error. For instance:
+% @ignore
+% @deffn ...
+% @end deffn
+% @end ignore
+%
+% The @end deffn is going to get expanded, because we're trying to allow
+% nested conditionals. But we don't want to expand the actual @deffn,
+% since it might be syntactically correct and intended to be ignored.
+% Since \end checks for \relax, using \empty does not cause an error.
+%
+\def\ignoremorecommands{%
+ \let\defcodeindex = \relax
+ \let\defcv = \empty
+ \let\defcvx = \empty
+ \let\Edefcv = \empty
+ \let\deffn = \empty
+ \let\deffnx = \empty
+ \let\Edeffn = \empty
+ \let\defindex = \relax
+ \let\defivar = \empty
+ \let\defivarx = \empty
+ \let\Edefivar = \empty
+ \let\defmac = \empty
+ \let\defmacx = \empty
+ \let\Edefmac = \empty
+ \let\defmethod = \empty
+ \let\defmethodx = \empty
+ \let\Edefmethod = \empty
+ \let\defop = \empty
+ \let\defopx = \empty
+ \let\Edefop = \empty
+ \let\defopt = \empty
+ \let\defoptx = \empty
+ \let\Edefopt = \empty
+ \let\defspec = \empty
+ \let\defspecx = \empty
+ \let\Edefspec = \empty
+ \let\deftp = \empty
+ \let\deftpx = \empty
+ \let\Edeftp = \empty
+ \let\deftypefn = \empty
+ \let\deftypefnx = \empty
+ \let\Edeftypefn = \empty
+ \let\deftypefun = \empty
+ \let\deftypefunx = \empty
+ \let\Edeftypefun = \empty
+ \let\deftypeivar = \empty
+ \let\deftypeivarx = \empty
+ \let\Edeftypeivar = \empty
+ \let\deftypemethod = \empty
+ \let\deftypemethodx = \empty
+ \let\Edeftypemethod = \empty
+ \let\deftypeop = \empty
+ \let\deftypeopx = \empty
+ \let\Edeftypeop = \empty
+ \let\deftypevar = \empty
+ \let\deftypevarx = \empty
+ \let\Edeftypevar = \empty
+ \let\deftypevr = \empty
+ \let\deftypevrx = \empty
+ \let\Edeftypevr = \empty
+ \let\defun = \empty
+ \let\defunx = \empty
+ \let\Edefun = \empty
+ \let\defvar = \empty
+ \let\defvarx = \empty
+ \let\Edefvar = \empty
+ \let\defvr = \empty
+ \let\defvrx = \empty
+ \let\Edefvr = \empty
+ \let\clear = \relax
+ \let\down = \relax
+ \let\evenfooting = \relax
+ \let\evenheading = \relax
+ \let\everyfooting = \relax
+ \let\everyheading = \relax
+ \let\headings = \relax
+ \let\include = \relax
+ \let\item = \relax
+ \let\lowersections = \relax
+ \let\oddfooting = \relax
+ \let\oddheading = \relax
+ \let\printindex = \relax
+ \let\pxref = \relax
+ \let\raisesections = \relax
+ \let\ref = \relax
+ \let\set = \relax
+ \let\setchapternewpage = \relax
+ \let\setchapterstyle = \relax
+ \let\settitle = \relax
+ \let\up = \relax
+ \let\verbatiminclude = \relax
+ \let\xref = \relax
+}
+
+% Ignore @ignore, @ifhtml, @ifinfo, and the like.
+%
+\def\direntry{\doignore{direntry}}
+\def\documentdescriptionword{documentdescription}
+\def\documentdescription{\doignore{documentdescription}}
+\def\html{\doignore{html}}
+\def\ifhtml{\doignore{ifhtml}}
+\def\ifinfo{\doignore{ifinfo}}
+\def\ifnottex{\doignore{ifnottex}}
+\def\ifplaintext{\doignore{ifplaintext}}
+\def\ifxml{\doignore{ifxml}}
+\def\ignore{\doignore{ignore}}
+\def\menu{\doignore{menu}}
+\def\xml{\doignore{xml}}
+
+% @dircategory CATEGORY -- specify a category of the dir file
+% which this file should belong to. Ignore this in TeX.
+\let\dircategory = \comment
+
+% Ignore text until a line `@end #1'.
+%
+\def\doignore#1{\begingroup
+ % Don't complain about control sequences we have declared \outer.
+ \ignoresections
+ %
+ % Define a command to swallow text until we reach `@end #1'.
+ % This @ is a catcode 12 token (that is the normal catcode of @ in
+ % this texinfo.tex file). We change the catcode of @ below to match.
+ \long\def\doignoretext##1@end #1{\enddoignore}%
+ %
+ % Make sure that spaces turn into tokens that match what \doignoretext wants.
+ \catcode\spaceChar = 10
+ %
+ % Ignore braces, too, so mismatched braces don't cause trouble.
+ \catcode`\{ = 9
+ \catcode`\} = 9
+ %
+ % We must not have @c interpreted as a control sequence.
+ \catcode`\@ = 12
+ %
+ \def\ignoreword{#1}%
+ \ifx\ignoreword\documentdescriptionword
+ % The c kludge breaks documentdescription, since
+ % `documentdescription' contains a `c'. Means not everything will
+ % be ignored inside @documentdescription, but oh well...
+ \else
+ % Make the letter c a comment character so that the rest of the line
+ % will be ignored. This way, the document can have (for example)
+ % @c @end ifinfo
+ % and the @end ifinfo will be properly ignored.
+ % (We've just changed @ to catcode 12.)
+ \catcode`\c = 14
+ \fi
+ %
+ % And now expand the command defined above.
+ \doignoretext
+}
+
+% What we do to finish off ignored text.
+%
+\def\enddoignore{\endgroup\ignorespaces}%
+
+\newif\ifwarnedobs\warnedobsfalse
+\def\obstexwarn{%
+ \ifwarnedobs\relax\else
+ % We need to warn folks that they may have trouble with TeX 3.0.
+ % This uses \immediate\write16 rather than \message to get newlines.
+ \immediate\write16{}
+ \immediate\write16{WARNING: for users of Unix TeX 3.0!}
+ \immediate\write16{This manual trips a bug in TeX version 3.0 (tex hangs).}
+ \immediate\write16{If you are running another version of TeX, relax.}
+ \immediate\write16{If you are running Unix TeX 3.0, kill this TeX process.}
+ \immediate\write16{ Then upgrade your TeX installation if you can.}
+ \immediate\write16{ (See ftp://ftp.gnu.org/non-gnu/TeX.README.)}
+ \immediate\write16{If you are stuck with version 3.0, run the}
+ \immediate\write16{ script ``tex3patch'' from the Texinfo distribution}
+ \immediate\write16{ to use a workaround.}
+ \immediate\write16{}
+ \global\warnedobstrue
+ \fi
+}
+
+% **In TeX 3.0, setting text in \nullfont hangs tex. For a
+% workaround (which requires the file ``dummy.tfm'' to be installed),
+% uncomment the following line:
+%%%%%\font\nullfont=dummy\let\obstexwarn=\relax
+
+% Ignore text, except that we keep track of conditional commands for
+% purposes of nesting, up to an `@end #1' command.
+%
+\def\nestedignore#1{%
+ \obstexwarn
+ % We must actually expand the ignored text to look for the @end
+ % command, so that nested ignore constructs work. Thus, we put the
+ % text into a \vbox and then do nothing with the result. To minimize
+ % the chance of memory overflow, we follow the approach outlined on
+ % page 401 of the TeXbook.
+ %
+ \setbox0 = \vbox\bgroup
+ % Don't complain about control sequences we have declared \outer.
+ \ignoresections
+ %
+ % Define `@end #1' to end the box, which will in turn undefine the
+ % @end command again.
+ \expandafter\def\csname E#1\endcsname{\egroup\ignorespaces}%
+ %
+ % We are going to be parsing Texinfo commands. Most cause no
+ % trouble when they are used incorrectly, but some commands do
+ % complicated argument parsing or otherwise get confused, so we
+ % undefine them.
+ %
+ % We can't do anything about stray @-signs, unfortunately;
+ % they'll produce `undefined control sequence' errors.
+ \ignoremorecommands
+ %
+ % Set the current font to be \nullfont, a TeX primitive, and define
+ % all the font commands to also use \nullfont. We don't use
+ % dummy.tfm, as suggested in the TeXbook, because some sites
+ % might not have that installed. Therefore, math mode will still
+ % produce output, but that should be an extremely small amount of
+ % stuff compared to the main input.
+ %
+ \nullfont
+ \let\tenrm=\nullfont \let\tenit=\nullfont \let\tensl=\nullfont
+ \let\tenbf=\nullfont \let\tentt=\nullfont \let\smallcaps=\nullfont
+ \let\tensf=\nullfont
+ % Similarly for index fonts.
+ \let\smallrm=\nullfont \let\smallit=\nullfont \let\smallsl=\nullfont
+ \let\smallbf=\nullfont \let\smalltt=\nullfont \let\smallsc=\nullfont
+ \let\smallsf=\nullfont
+ % Similarly for smallexample fonts.
+ \let\smallerrm=\nullfont \let\smallerit=\nullfont \let\smallersl=\nullfont
+ \let\smallerbf=\nullfont \let\smallertt=\nullfont \let\smallersc=\nullfont
+ \let\smallersf=\nullfont
+ %
+ % Don't complain when characters are missing from the fonts.
+ \tracinglostchars = 0
+ %
+ % Don't bother to do space factor calculations.
+ \frenchspacing
+ %
+ % Don't report underfull hboxes.
+ \hbadness = 10000
+ %
+ % Do minimal line-breaking.
+ \pretolerance = 10000
+ %
+ % Do not execute instructions in @tex.
+ \def\tex{\doignore{tex}}%
+ % Do not execute macro definitions.
+ % `c' is a comment character, so the word `macro' will get cut off.
+ \def\macro{\doignore{ma}}%
+}
+
+% @set VAR sets the variable VAR to an empty value.
+% @set VAR REST-OF-LINE sets VAR to the value REST-OF-LINE.
+%
+% Since we want to separate VAR from REST-OF-LINE (which might be
+% empty), we can't just use \parsearg; we have to insert a space of our
+% own to delimit the rest of the line, and then take it out again if we
+% didn't need it. Make sure the catcode of space is correct to avoid
+% losing inside @example, for instance.
+%
+\def\set{\begingroup\catcode` =10
+ \catcode`\-=12 \catcode`\_=12 % Allow - and _ in VAR.
+ \parsearg\setxxx}
+\def\setxxx#1{\setyyy#1 \endsetyyy}
+\def\setyyy#1 #2\endsetyyy{%
+ \def\temp{#2}%
+ \ifx\temp\empty \global\expandafter\let\csname SET#1\endcsname = \empty
+ \else \setzzz{#1}#2\endsetzzz % Remove the trailing space \setxxx inserted.
+ \fi
+ \endgroup
+}
+% Can't use \xdef to pre-expand #2 and save some time, since \temp or
+% \next or other control sequences that we've defined might get us into
+% an infinite loop. Consider `@set foo @cite{bar}'.
+\def\setzzz#1#2 \endsetzzz{\expandafter\gdef\csname SET#1\endcsname{#2}}
+
+% @clear VAR clears (i.e., unsets) the variable VAR.
+%
+\def\clear{\parsearg\clearxxx}
+\def\clearxxx#1{\global\expandafter\let\csname SET#1\endcsname=\relax}
+
+% @value{foo} gets the text saved in variable foo.
+{
+ \catcode`\_ = \active
+ %
+ % We might end up with active _ or - characters in the argument if
+ % we're called from @code, as @code{@value{foo-bar_}}. So \let any
+ % such active characters to their normal equivalents.
+ \gdef\value{\begingroup
+ \catcode`\-=\other \catcode`\_=\other
+ \indexbreaks \let_\normalunderscore
+ \valuexxx}
+}
+\def\valuexxx#1{\expandablevalue{#1}\endgroup}
+
+% We have this subroutine so that we can handle at least some @value's
+% properly in indexes (we \let\value to this in \indexdummies). Ones
+% whose names contain - or _ still won't work, but we can't do anything
+% about that. The command has to be fully expandable (if the variable
+% is set), since the result winds up in the index file. This means that
+% if the variable's value contains other Texinfo commands, it's almost
+% certain it will fail (although perhaps we could fix that with
+% sufficient work to do a one-level expansion on the result, instead of
+% complete).
+%
+\def\expandablevalue#1{%
+ \expandafter\ifx\csname SET#1\endcsname\relax
+ {[No value for ``#1'']}%
+ \message{Variable `#1', used in @value, is not set.}%
+ \else
+ \csname SET#1\endcsname
+ \fi
+}
+
+% @ifset VAR ... @end ifset reads the `...' iff VAR has been defined
+% with @set.
+%
+\def\ifset{\parsearg\doifset}
+\def\doifset#1{%
+ \expandafter\ifx\csname SET#1\endcsname\relax
+ \let\next=\ifsetfail
+ \else
+ \let\next=\ifsetsucceed
+ \fi
+ \next
+}
+\def\ifsetsucceed{\conditionalsucceed{ifset}}
+\def\ifsetfail{\nestedignore{ifset}}
+\defineunmatchedend{ifset}
+
+% @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been
+% defined with @set, or has been undefined with @clear.
+%
+\def\ifclear{\parsearg\doifclear}
+\def\doifclear#1{%
+ \expandafter\ifx\csname SET#1\endcsname\relax
+ \let\next=\ifclearsucceed
+ \else
+ \let\next=\ifclearfail
+ \fi
+ \next
+}
+\def\ifclearsucceed{\conditionalsucceed{ifclear}}
+\def\ifclearfail{\nestedignore{ifclear}}
+\defineunmatchedend{ifclear}
+
+% @iftex, @ifnothtml, @ifnotinfo, @ifnotplaintext always succeed; we
+% read the text following, through the first @end iftex (etc.). Make
+% `@end iftex' (etc.) valid only after an @iftex.
+%
+\def\iftex{\conditionalsucceed{iftex}}
+\def\ifnothtml{\conditionalsucceed{ifnothtml}}
+\def\ifnotinfo{\conditionalsucceed{ifnotinfo}}
+\def\ifnotplaintext{\conditionalsucceed{ifnotplaintext}}
+\defineunmatchedend{iftex}
+\defineunmatchedend{ifnothtml}
+\defineunmatchedend{ifnotinfo}
+\defineunmatchedend{ifnotplaintext}
+
+% True conditional. Since \set globally defines its variables, we can
+% just start and end a group (to keep the @end definition undefined at
+% the outer level).
+%
+\def\conditionalsucceed#1{\begingroup
+ \expandafter\def\csname E#1\endcsname{\endgroup}%
+}
+
+% @defininfoenclose.
+\let\definfoenclose=\comment
+
+
+\message{indexing,}
+% Index generation facilities
+
+% Define \newwrite to be identical to plain tex's \newwrite
+% except not \outer, so it can be used within \newindex.
+{\catcode`\@=11
+\gdef\newwrite{\alloc@7\write\chardef\sixt@@n}}
+
+% \newindex {foo} defines an index named foo.
+% It automatically defines \fooindex such that
+% \fooindex ...rest of line... puts an entry in the index foo.
+% It also defines \fooindfile to be the number of the output channel for
+% the file that accumulates this index. The file's extension is foo.
+% The name of an index should be no more than 2 characters long
+% for the sake of vms.
+%
+\def\newindex#1{%
+ \iflinks
+ \expandafter\newwrite \csname#1indfile\endcsname
+ \openout \csname#1indfile\endcsname \jobname.#1 % Open the file
+ \fi
+ \expandafter\xdef\csname#1index\endcsname{% % Define @#1index
+ \noexpand\doindex{#1}}
+}
+
+% @defindex foo == \newindex{foo}
+%
+\def\defindex{\parsearg\newindex}
+
+% Define @defcodeindex, like @defindex except put all entries in @code.
+%
+\def\defcodeindex{\parsearg\newcodeindex}
+%
+\def\newcodeindex#1{%
+ \iflinks
+ \expandafter\newwrite \csname#1indfile\endcsname
+ \openout \csname#1indfile\endcsname \jobname.#1
+ \fi
+ \expandafter\xdef\csname#1index\endcsname{%
+ \noexpand\docodeindex{#1}}%
+}
+
+
+% @synindex foo bar makes index foo feed into index bar.
+% Do this instead of @defindex foo if you don't want it as a separate index.
+%
+% @syncodeindex foo bar similar, but put all entries made for index foo
+% inside @code.
+%
+\def\synindex#1 #2 {\dosynindex\doindex{#1}{#2}}
+\def\syncodeindex#1 #2 {\dosynindex\docodeindex{#1}{#2}}
+
+% #1 is \doindex or \docodeindex, #2 the index getting redefined (foo),
+% #3 the target index (bar).
+\def\dosynindex#1#2#3{%
+ % Only do \closeout if we haven't already done it, else we'll end up
+ % closing the target index.
+ \expandafter \ifx\csname donesynindex#2\endcsname \undefined
+ % The \closeout helps reduce unnecessary open files; the limit on the
+ % Acorn RISC OS is a mere 16 files.
+ \expandafter\closeout\csname#2indfile\endcsname
+ \expandafter\let\csname\donesynindex#2\endcsname = 1
+ \fi
+ % redefine \fooindfile:
+ \expandafter\let\expandafter\temp\expandafter=\csname#3indfile\endcsname
+ \expandafter\let\csname#2indfile\endcsname=\temp
+ % redefine \fooindex:
+ \expandafter\xdef\csname#2index\endcsname{\noexpand#1{#3}}%
+}
+
+% Define \doindex, the driver for all \fooindex macros.
+% Argument #1 is generated by the calling \fooindex macro,
+% and it is "foo", the name of the index.
+
+% \doindex just uses \parsearg; it calls \doind for the actual work.
+% This is because \doind is more useful to call from other macros.
+
+% There is also \dosubind {index}{topic}{subtopic}
+% which makes an entry in a two-level index such as the operation index.
+
+\def\doindex#1{\edef\indexname{#1}\parsearg\singleindexer}
+\def\singleindexer #1{\doind{\indexname}{#1}}
+
+% like the previous two, but they put @code around the argument.
+\def\docodeindex#1{\edef\indexname{#1}\parsearg\singlecodeindexer}
+\def\singlecodeindexer #1{\doind{\indexname}{\code{#1}}}
+
+% Take care of Texinfo commands that can appear in an index entry.
+% Since there are some commands we want to expand, and others we don't,
+% we have to laboriously prevent expansion for those that we don't.
+%
+\def\indexdummies{%
+ \def\@{@}% change to @@ when we switch to @ as escape char in index files.
+ \def\ {\realbackslash\space }%
+ % Need these in case \tex is in effect and \{ is a \delimiter again.
+ % But can't use \lbracecmd and \rbracecmd because texindex assumes
+ % braces and backslashes are used only as delimiters.
+ \let\{ = \mylbrace
+ \let\} = \myrbrace
+ %
+ % \definedummyword defines \#1 as \realbackslash #1\space, thus
+ % effectively preventing its expansion. This is used only for control
+ % words, not control letters, because the \space would be incorrect
+ % for control characters, but is needed to separate the control word
+ % from whatever follows.
+ %
+ % For control letters, we have \definedummyletter, which omits the
+ % space.
+ %
+ % These can be used both for control words that take an argument and
+ % those that do not. If it is followed by {arg} in the input, then
+ % that will dutifully get written to the index (or wherever).
+ %
+ \def\definedummyword##1{%
+ \expandafter\def\csname ##1\endcsname{\realbackslash ##1\space}%
+ }%
+ \def\definedummyletter##1{%
+ \expandafter\def\csname ##1\endcsname{\realbackslash ##1}%
+ }%
+ %
+ % Do the redefinitions.
+ \commondummies
+}
+
+% For the aux file, @ is the escape character. So we want to redefine
+% everything using @ instead of \realbackslash. When everything uses
+% @, this will be simpler.
+%
+\def\atdummies{%
+ \def\@{@@}%
+ \def\ {@ }%
+ \let\{ = \lbraceatcmd
+ \let\} = \rbraceatcmd
+ %
+ % (See comments in \indexdummies.)
+ \def\definedummyword##1{%
+ \expandafter\def\csname ##1\endcsname{@##1\space}%
+ }%
+ \def\definedummyletter##1{%
+ \expandafter\def\csname ##1\endcsname{@##1}%
+ }%
+ %
+ % Do the redefinitions.
+ \commondummies
+}
+
+% Called from \indexdummies and \atdummies. \definedummyword and
+% \definedummyletter must be defined first.
+%
+\def\commondummies{%
+ %
+ \normalturnoffactive
+ %
+ % Control letters and accents.
+ \definedummyletter{_}%
+ \definedummyletter{,}%
+ \definedummyletter{"}%
+ \definedummyletter{`}%
+ \definedummyletter{'}%
+ \definedummyletter{^}%
+ \definedummyletter{~}%
+ \definedummyletter{=}%
+ \definedummyword{u}%
+ \definedummyword{v}%
+ \definedummyword{H}%
+ \definedummyword{dotaccent}%
+ \definedummyword{ringaccent}%
+ \definedummyword{tieaccent}%
+ \definedummyword{ubaraccent}%
+ \definedummyword{udotaccent}%
+ \definedummyword{dotless}%
+ %
+ % Other non-English letters.
+ \definedummyword{AA}%
+ \definedummyword{AE}%
+ \definedummyword{L}%
+ \definedummyword{OE}%
+ \definedummyword{O}%
+ \definedummyword{aa}%
+ \definedummyword{ae}%
+ \definedummyword{l}%
+ \definedummyword{oe}%
+ \definedummyword{o}%
+ \definedummyword{ss}%
+ %
+ % Although these internal commands shouldn't show up, sometimes they do.
+ \definedummyword{bf}%
+ \definedummyword{gtr}%
+ \definedummyword{hat}%
+ \definedummyword{less}%
+ \definedummyword{sf}%
+ \definedummyword{sl}%
+ \definedummyword{tclose}%
+ \definedummyword{tt}%
+ %
+ % Texinfo font commands.
+ \definedummyword{b}%
+ \definedummyword{i}%
+ \definedummyword{r}%
+ \definedummyword{sc}%
+ \definedummyword{t}%
+ %
+ \definedummyword{TeX}%
+ \definedummyword{acronym}%
+ \definedummyword{cite}%
+ \definedummyword{code}%
+ \definedummyword{command}%
+ \definedummyword{dfn}%
+ \definedummyword{dots}%
+ \definedummyword{emph}%
+ \definedummyword{env}%
+ \definedummyword{file}%
+ \definedummyword{kbd}%
+ \definedummyword{key}%
+ \definedummyword{math}%
+ \definedummyword{option}%
+ \definedummyword{samp}%
+ \definedummyword{strong}%
+ \definedummyword{uref}%
+ \definedummyword{url}%
+ \definedummyword{var}%
+ \definedummyword{w}%
+ %
+ % Assorted special characters.
+ \definedummyword{bullet}%
+ \definedummyword{copyright}%
+ \definedummyword{dots}%
+ \definedummyword{enddots}%
+ \definedummyword{equiv}%
+ \definedummyword{error}%
+ \definedummyword{expansion}%
+ \definedummyword{minus}%
+ \definedummyword{pounds}%
+ \definedummyword{point}%
+ \definedummyword{print}%
+ \definedummyword{result}%
+ %
+ % Handle some cases of @value -- where the variable name does not
+ % contain - or _, and the value does not contain any
+ % (non-fully-expandable) commands.
+ \let\value = \expandablevalue
+ %
+ % Normal spaces, not active ones.
+ \unsepspaces
+ %
+ % No macro expansion.
+ \turnoffmacros
+}
+
+% If an index command is used in an @example environment, any spaces
+% therein should become regular spaces in the raw index file, not the
+% expansion of \tie (\leavevmode \penalty \@M \ ).
+{\obeyspaces
+ \gdef\unsepspaces{\obeyspaces\let =\space}}
+
+
+% \indexnofonts is used when outputting the strings to sort the index
+% by, and when constructing control sequence names. It eliminates all
+% control sequences and just writes whatever the best ASCII sort string
+% would be for a given command (usually its argument).
+%
+\def\indexdummytex{TeX}
+\def\indexdummydots{...}
+%
+\def\indexnofonts{%
+ \def\ { }%
+ \def\@{@}%
+ % how to handle braces?
+ \def\_{\normalunderscore}%
+ %
+ \let\,=\asis
+ \let\"=\asis
+ \let\`=\asis
+ \let\'=\asis
+ \let\^=\asis
+ \let\~=\asis
+ \let\==\asis
+ \let\u=\asis
+ \let\v=\asis
+ \let\H=\asis
+ \let\dotaccent=\asis
+ \let\ringaccent=\asis
+ \let\tieaccent=\asis
+ \let\ubaraccent=\asis
+ \let\udotaccent=\asis
+ \let\dotless=\asis
+ %
+ % Other non-English letters.
+ \def\AA{AA}%
+ \def\AE{AE}%
+ \def\L{L}%
+ \def\OE{OE}%
+ \def\O{O}%
+ \def\aa{aa}%
+ \def\ae{ae}%
+ \def\l{l}%
+ \def\oe{oe}%
+ \def\o{o}%
+ \def\ss{ss}%
+ \def\exclamdown{!}%
+ \def\questiondown{?}%
+ %
+ % Don't no-op \tt, since it isn't a user-level command
+ % and is used in the definitions of the active chars like <, >, |, etc.
+ % Likewise with the other plain tex font commands.
+ %\let\tt=\asis
+ %
+ % Texinfo font commands.
+ \let\b=\asis
+ \let\i=\asis
+ \let\r=\asis
+ \let\sc=\asis
+ \let\t=\asis
+ %
+ \let\TeX=\indexdummytex
+ \let\acronym=\asis
+ \let\cite=\asis
+ \let\code=\asis
+ \let\command=\asis
+ \let\dfn=\asis
+ \let\dots=\indexdummydots
+ \let\emph=\asis
+ \let\env=\asis
+ \let\file=\asis
+ \let\kbd=\asis
+ \let\key=\asis
+ \let\math=\asis
+ \let\option=\asis
+ \let\samp=\asis
+ \let\strong=\asis
+ \let\uref=\asis
+ \let\url=\asis
+ \let\var=\asis
+ \let\w=\asis
+}
+
+\let\indexbackslash=0 %overridden during \printindex.
+\let\SETmarginindex=\relax % put index entries in margin (undocumented)?
+
+% For \ifx comparisons.
+\def\emptymacro{\empty}
+
+% Most index entries go through here, but \dosubind is the general case.
+%
+\def\doind#1#2{\dosubind{#1}{#2}\empty}
+
+% Workhorse for all \fooindexes.
+% #1 is name of index, #2 is stuff to put there, #3 is subentry --
+% \empty if called from \doind, as we usually are. The main exception
+% is with defuns, which call us directly.
+%
+\def\dosubind#1#2#3{%
+ % Put the index entry in the margin if desired.
+ \ifx\SETmarginindex\relax\else
+ \insert\margin{\hbox{\vrule height8pt depth3pt width0pt #2}}%
+ \fi
+ {%
+ \count255=\lastpenalty
+ {%
+ \indexdummies % Must do this here, since \bf, etc expand at this stage
+ \escapechar=`\\
+ {%
+ \let\folio = 0% We will expand all macros now EXCEPT \folio.
+ \def\rawbackslashxx{\indexbackslash}% \indexbackslash isn't defined now
+ % so it will be output as is; and it will print as backslash.
+ %
+ % The main index entry text.
+ \toks0 = {#2}%
+ %
+ % If third arg is present, precede it with space in sort key.
+ \def\thirdarg{#3}%
+ \ifx\thirdarg\emptymacro \else
+ % If the third (subentry) arg is present, add it to the index
+ % line to write.
+ \toks0 = \expandafter{\the\toks0 \space #3}%
+ \fi
+ %
+ % Process the index entry with all font commands turned off, to
+ % get the string to sort by.
+ {\indexnofonts
+ \edef\temp{\the\toks0}% need full expansion
+ \xdef\indexsorttmp{\temp}%
+ }%
+ %
+ % Set up the complete index entry, with both the sort key and
+ % the original text, including any font commands. We write
+ % three arguments to \entry to the .?? file (four in the
+ % subentry case), texindex reduces to two when writing the .??s
+ % sorted result.
+ \edef\temp{%
+ \write\csname#1indfile\endcsname{%
+ \realbackslash entry{\indexsorttmp}{\folio}{\the\toks0}}%
+ }%
+ %
+ % If a skip is the last thing on the list now, preserve it
+ % by backing up by \lastskip, doing the \write, then inserting
+ % the skip again. Otherwise, the whatsit generated by the
+ % \write will make \lastskip zero. The result is that sequences
+ % like this:
+ % @end defun
+ % @tindex whatever
+ % @defun ...
+ % will have extra space inserted, because the \medbreak in the
+ % start of the @defun won't see the skip inserted by the @end of
+ % the previous defun.
+ %
+ % But don't do any of this if we're not in vertical mode. We
+ % don't want to do a \vskip and prematurely end a paragraph.
+ %
+ % Avoid page breaks due to these extra skips, too.
+ %
+ \iflinks
+ \ifvmode
+ \skip0 = \lastskip
+ \ifdim\lastskip = 0pt \else \nobreak\vskip-\skip0 \fi
+ \fi
+ %
+ \temp % do the write
+ %
+ \ifvmode \ifdim\skip0 = 0pt \else \nobreak\vskip\skip0 \fi \fi
+ \fi
+ }%
+ }%
+ \penalty\count255
+ }%
+}
+
+% The index entry written in the file actually looks like
+% \entry {sortstring}{page}{topic}
+% or
+% \entry {sortstring}{page}{topic}{subtopic}
+% The texindex program reads in these files and writes files
+% containing these kinds of lines:
+% \initial {c}
+% before the first topic whose initial is c
+% \entry {topic}{pagelist}
+% for a topic that is used without subtopics
+% \primary {topic}
+% for the beginning of a topic that is used with subtopics
+% \secondary {subtopic}{pagelist}
+% for each subtopic.
+
+% Define the user-accessible indexing commands
+% @findex, @vindex, @kindex, @cindex.
+
+\def\findex {\fnindex}
+\def\kindex {\kyindex}
+\def\cindex {\cpindex}
+\def\vindex {\vrindex}
+\def\tindex {\tpindex}
+\def\pindex {\pgindex}
+
+\def\cindexsub {\begingroup\obeylines\cindexsub}
+{\obeylines %
+\gdef\cindexsub "#1" #2^^M{\endgroup %
+\dosubind{cp}{#2}{#1}}}
+
+% Define the macros used in formatting output of the sorted index material.
+
+% @printindex causes a particular index (the ??s file) to get printed.
+% It does not print any chapter heading (usually an @unnumbered).
+%
+\def\printindex{\parsearg\doprintindex}
+\def\doprintindex#1{\begingroup
+ \dobreak \chapheadingskip{10000}%
+ %
+ \smallfonts \rm
+ \tolerance = 9500
+ \everypar = {}% don't want the \kern\-parindent from indentation suppression.
+ \indexbreaks
+ %
+ % See if the index file exists and is nonempty.
+ % Change catcode of @ here so that if the index file contains
+ % \initial {@}
+ % as its first line, TeX doesn't complain about mismatched braces
+ % (because it thinks @} is a control sequence).
+ \catcode`\@ = 11
+ \openin 1 \jobname.#1s
+ \ifeof 1
+ % \enddoublecolumns gets confused if there is no text in the index,
+ % and it loses the chapter title and the aux file entries for the
+ % index. The easiest way to prevent this problem is to make sure
+ % there is some text.
+ \putwordIndexNonexistent
+ \else
+ %
+ % If the index file exists but is empty, then \openin leaves \ifeof
+ % false. We have to make TeX try to read something from the file, so
+ % it can discover if there is anything in it.
+ \read 1 to \temp
+ \ifeof 1
+ \putwordIndexIsEmpty
+ \else
+ % Index files are almost Texinfo source, but we use \ as the escape
+ % character. It would be better to use @, but that's too big a change
+ % to make right now.
+ \def\indexbackslash{\rawbackslashxx}%
+ \catcode`\\ = 0
+ \escapechar = `\\
+ \begindoublecolumns
+ \input \jobname.#1s
+ \enddoublecolumns
+ \fi
+ \fi
+ \closein 1
+\endgroup}
+
+% These macros are used by the sorted index file itself.
+% Change them to control the appearance of the index.
+
+\def\initial#1{{%
+ % Some minor font changes for the special characters.
+ \let\tentt=\sectt \let\tt=\sectt \let\sf=\sectt
+ %
+ % Remove any glue we may have, we'll be inserting our own.
+ \removelastskip
+ %
+ % We like breaks before the index initials, so insert a bonus.
+ \penalty -300
+ %
+ % Typeset the initial. Making this add up to a whole number of
+ % baselineskips increases the chance of the dots lining up from column
+ % to column. It still won't often be perfect, because of the stretch
+ % we need before each entry, but it's better.
+ %
+ % No shrink because it confuses \balancecolumns.
+ \vskip 1.67\baselineskip plus .5\baselineskip
+ \leftline{\secbf #1}%
+ \vskip .33\baselineskip plus .1\baselineskip
+ %
+ % Do our best not to break after the initial.
+ \nobreak
+}}
+
+% This typesets a paragraph consisting of #1, dot leaders, and then #2
+% flush to the right margin. It is used for index and table of contents
+% entries. The paragraph is indented by \leftskip.
+%
+\def\entry#1#2{\begingroup
+ %
+ % Start a new paragraph if necessary, so our assignments below can't
+ % affect previous text.
+ \par
+ %
+ % Do not fill out the last line with white space.
+ \parfillskip = 0in
+ %
+ % No extra space above this paragraph.
+ \parskip = 0in
+ %
+ % Do not prefer a separate line ending with a hyphen to fewer lines.
+ \finalhyphendemerits = 0
+ %
+ % \hangindent is only relevant when the entry text and page number
+ % don't both fit on one line. In that case, bob suggests starting the
+ % dots pretty far over on the line. Unfortunately, a large
+ % indentation looks wrong when the entry text itself is broken across
+ % lines. So we use a small indentation and put up with long leaders.
+ %
+ % \hangafter is reset to 1 (which is the value we want) at the start
+ % of each paragraph, so we need not do anything with that.
+ \hangindent = 2em
+ %
+ % When the entry text needs to be broken, just fill out the first line
+ % with blank space.
+ \rightskip = 0pt plus1fil
+ %
+ % A bit of stretch before each entry for the benefit of balancing columns.
+ \vskip 0pt plus1pt
+ %
+ % Start a ``paragraph'' for the index entry so the line breaking
+ % parameters we've set above will have an effect.
+ \noindent
+ %
+ % Insert the text of the index entry. TeX will do line-breaking on it.
+ #1%
+ % The following is kludged to not output a line of dots in the index if
+ % there are no page numbers. The next person who breaks this will be
+ % cursed by a Unix daemon.
+ \def\tempa{{\rm }}%
+ \def\tempb{#2}%
+ \edef\tempc{\tempa}%
+ \edef\tempd{\tempb}%
+ \ifx\tempc\tempd\ \else%
+ %
+ % If we must, put the page number on a line of its own, and fill out
+ % this line with blank space. (The \hfil is overwhelmed with the
+ % fill leaders glue in \indexdotfill if the page number does fit.)
+ \hfil\penalty50
+ \null\nobreak\indexdotfill % Have leaders before the page number.
+ %
+ % The `\ ' here is removed by the implicit \unskip that TeX does as
+ % part of (the primitive) \par. Without it, a spurious underfull
+ % \hbox ensues.
+ \ifpdf
+ \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph.
+ \else
+ \ #2% The page number ends the paragraph.
+ \fi
+ \fi%
+ \par
+\endgroup}
+
+% Like \dotfill except takes at least 1 em.
+\def\indexdotfill{\cleaders
+ \hbox{$\mathsurround=0pt \mkern1.5mu ${\it .}$ \mkern1.5mu$}\hskip 1em plus 1fill}
+
+\def\primary #1{\line{#1\hfil}}
+
+\newskip\secondaryindent \secondaryindent=0.5cm
+\def\secondary#1#2{{%
+ \parfillskip=0in
+ \parskip=0in
+ \hangindent=1in
+ \hangafter=1
+ \noindent\hskip\secondaryindent\hbox{#1}\indexdotfill
+ \ifpdf
+ \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph.
+ \else
+ #2
+ \fi
+ \par
+}}
+
+% Define two-column mode, which we use to typeset indexes.
+% Adapted from the TeXbook, page 416, which is to say,
+% the manmac.tex format used to print the TeXbook itself.
+\catcode`\@=11
+
+\newbox\partialpage
+\newdimen\doublecolumnhsize
+
+\def\begindoublecolumns{\begingroup % ended by \enddoublecolumns
+ % Grab any single-column material above us.
+ \output = {%
+ %
+ % Here is a possibility not foreseen in manmac: if we accumulate a
+ % whole lot of material, we might end up calling this \output
+ % routine twice in a row (see the doublecol-lose test, which is
+ % essentially a couple of indexes with @setchapternewpage off). In
+ % that case we just ship out what is in \partialpage with the normal
+ % output routine. Generally, \partialpage will be empty when this
+ % runs and this will be a no-op. See the indexspread.tex test case.
+ \ifvoid\partialpage \else
+ \onepageout{\pagecontents\partialpage}%
+ \fi
+ %
+ \global\setbox\partialpage = \vbox{%
+ % Unvbox the main output page.
+ \unvbox\PAGE
+ \kern-\topskip \kern\baselineskip
+ }%
+ }%
+ \eject % run that output routine to set \partialpage
+ %
+ % Use the double-column output routine for subsequent pages.
+ \output = {\doublecolumnout}%
+ %
+ % Change the page size parameters. We could do this once outside this
+ % routine, in each of @smallbook, @afourpaper, and the default 8.5x11
+ % format, but then we repeat the same computation. Repeating a couple
+ % of assignments once per index is clearly meaningless for the
+ % execution time, so we may as well do it in one place.
+ %
+ % First we halve the line length, less a little for the gutter between
+ % the columns. We compute the gutter based on the line length, so it
+ % changes automatically with the paper format. The magic constant
+ % below is chosen so that the gutter has the same value (well, +-<1pt)
+ % as it did when we hard-coded it.
+ %
+ % We put the result in a separate register, \doublecolumhsize, so we
+ % can restore it in \pagesofar, after \hsize itself has (potentially)
+ % been clobbered.
+ %
+ \doublecolumnhsize = \hsize
+ \advance\doublecolumnhsize by -.04154\hsize
+ \divide\doublecolumnhsize by 2
+ \hsize = \doublecolumnhsize
+ %
+ % Double the \vsize as well. (We don't need a separate register here,
+ % since nobody clobbers \vsize.)
+ \vsize = 2\vsize
+}
+
+% The double-column output routine for all double-column pages except
+% the last.
+%
+\def\doublecolumnout{%
+ \splittopskip=\topskip \splitmaxdepth=\maxdepth
+ % Get the available space for the double columns -- the normal
+ % (undoubled) page height minus any material left over from the
+ % previous page.
+ \dimen@ = \vsize
+ \divide\dimen@ by 2
+ \advance\dimen@ by -\ht\partialpage
+ %
+ % box0 will be the left-hand column, box2 the right.
+ \setbox0=\vsplit255 to\dimen@ \setbox2=\vsplit255 to\dimen@
+ \onepageout\pagesofar
+ \unvbox255
+ \penalty\outputpenalty
+}
+%
+% Re-output the contents of the output page -- any previous material,
+% followed by the two boxes we just split, in box0 and box2.
+\def\pagesofar{%
+ \unvbox\partialpage
+ %
+ \hsize = \doublecolumnhsize
+ \wd0=\hsize \wd2=\hsize
+ \hbox to\pagewidth{\box0\hfil\box2}%
+}
+%
+% All done with double columns.
+\def\enddoublecolumns{%
+ \output = {%
+ % Split the last of the double-column material. Leave it on the
+ % current page, no automatic page break.
+ \balancecolumns
+ %
+ % If we end up splitting too much material for the current page,
+ % though, there will be another page break right after this \output
+ % invocation ends. Having called \balancecolumns once, we do not
+ % want to call it again. Therefore, reset \output to its normal
+ % definition right away. (We hope \balancecolumns will never be
+ % called on to balance too much material, but if it is, this makes
+ % the output somewhat more palatable.)
+ \global\output = {\onepageout{\pagecontents\PAGE}}%
+ }%
+ \eject
+ \endgroup % started in \begindoublecolumns
+ %
+ % \pagegoal was set to the doubled \vsize above, since we restarted
+ % the current page. We're now back to normal single-column
+ % typesetting, so reset \pagegoal to the normal \vsize (after the
+ % \endgroup where \vsize got restored).
+ \pagegoal = \vsize
+}
+%
+% Called at the end of the double column material.
+\def\balancecolumns{%
+ \setbox0 = \vbox{\unvbox255}% like \box255 but more efficient, see p.120.
+ \dimen@ = \ht0
+ \advance\dimen@ by \topskip
+ \advance\dimen@ by-\baselineskip
+ \divide\dimen@ by 2 % target to split to
+ %debug\message{final 2-column material height=\the\ht0, target=\the\dimen@.}%
+ \splittopskip = \topskip
+ % Loop until we get a decent breakpoint.
+ {%
+ \vbadness = 10000
+ \loop
+ \global\setbox3 = \copy0
+ \global\setbox1 = \vsplit3 to \dimen@
+ \ifdim\ht3>\dimen@
+ \global\advance\dimen@ by 1pt
+ \repeat
+ }%
+ %debug\message{split to \the\dimen@, column heights: \the\ht1, \the\ht3.}%
+ \setbox0=\vbox to\dimen@{\unvbox1}%
+ \setbox2=\vbox to\dimen@{\unvbox3}%
+ %
+ \pagesofar
+}
+\catcode`\@ = \other
+
+
+\message{sectioning,}
+% Chapters, sections, etc.
+
+\newcount\chapno
+\newcount\secno \secno=0
+\newcount\subsecno \subsecno=0
+\newcount\subsubsecno \subsubsecno=0
+
+% This counter is funny since it counts through charcodes of letters A, B, ...
+\newcount\appendixno \appendixno = `\@
+% \def\appendixletter{\char\the\appendixno}
+% We do the following for the sake of pdftex, which needs the actual
+% letter in the expansion, not just typeset.
+\def\appendixletter{%
+ \ifnum\appendixno=`A A%
+ \else\ifnum\appendixno=`B B%
+ \else\ifnum\appendixno=`C C%
+ \else\ifnum\appendixno=`D D%
+ \else\ifnum\appendixno=`E E%
+ \else\ifnum\appendixno=`F F%
+ \else\ifnum\appendixno=`G G%
+ \else\ifnum\appendixno=`H H%
+ \else\ifnum\appendixno=`I I%
+ \else\ifnum\appendixno=`J J%
+ \else\ifnum\appendixno=`K K%
+ \else\ifnum\appendixno=`L L%
+ \else\ifnum\appendixno=`M M%
+ \else\ifnum\appendixno=`N N%
+ \else\ifnum\appendixno=`O O%
+ \else\ifnum\appendixno=`P P%
+ \else\ifnum\appendixno=`Q Q%
+ \else\ifnum\appendixno=`R R%
+ \else\ifnum\appendixno=`S S%
+ \else\ifnum\appendixno=`T T%
+ \else\ifnum\appendixno=`U U%
+ \else\ifnum\appendixno=`V V%
+ \else\ifnum\appendixno=`W W%
+ \else\ifnum\appendixno=`X X%
+ \else\ifnum\appendixno=`Y Y%
+ \else\ifnum\appendixno=`Z Z%
+ % The \the is necessary, despite appearances, because \appendixletter is
+ % expanded while writing the .toc file. \char\appendixno is not
+ % expandable, thus it is written literally, thus all appendixes come out
+ % with the same letter (or @) in the toc without it.
+ \else\char\the\appendixno
+ \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+ \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi}
+
+% Each @chapter defines this as the name of the chapter.
+% page headings and footings can use it. @section does likewise.
+\def\thischapter{}
+\def\thissection{}
+
+\newcount\absseclevel % used to calculate proper heading level
+\newcount\secbase\secbase=0 % @raise/lowersections modify this count
+
+% @raisesections: treat @section as chapter, @subsection as section, etc.
+\def\raisesections{\global\advance\secbase by -1}
+\let\up=\raisesections % original BFox name
+
+% @lowersections: treat @chapter as section, @section as subsection, etc.
+\def\lowersections{\global\advance\secbase by 1}
+\let\down=\lowersections % original BFox name
+
+% Choose a numbered-heading macro
+% #1 is heading level if unmodified by @raisesections or @lowersections
+% #2 is text for heading
+\def\numhead#1#2{\absseclevel=\secbase\advance\absseclevel by #1
+\ifcase\absseclevel
+ \chapterzzz{#2}
+\or
+ \seczzz{#2}
+\or
+ \numberedsubseczzz{#2}
+\or
+ \numberedsubsubseczzz{#2}
+\else
+ \ifnum \absseclevel<0
+ \chapterzzz{#2}
+ \else
+ \numberedsubsubseczzz{#2}
+ \fi
+\fi
+\suppressfirstparagraphindent
+}
+
+% like \numhead, but chooses appendix heading levels
+\def\apphead#1#2{\absseclevel=\secbase\advance\absseclevel by #1
+\ifcase\absseclevel
+ \appendixzzz{#2}
+\or
+ \appendixsectionzzz{#2}
+\or
+ \appendixsubseczzz{#2}
+\or
+ \appendixsubsubseczzz{#2}
+\else
+ \ifnum \absseclevel<0
+ \appendixzzz{#2}
+ \else
+ \appendixsubsubseczzz{#2}
+ \fi
+\fi
+\suppressfirstparagraphindent
+}
+
+% like \numhead, but chooses numberless heading levels
+\def\unnmhead#1#2{\absseclevel=\secbase\advance\absseclevel by #1
+\ifcase\absseclevel
+ \unnumberedzzz{#2}
+\or
+ \unnumberedseczzz{#2}
+\or
+ \unnumberedsubseczzz{#2}
+\or
+ \unnumberedsubsubseczzz{#2}
+\else
+ \ifnum \absseclevel<0
+ \unnumberedzzz{#2}
+ \else
+ \unnumberedsubsubseczzz{#2}
+ \fi
+\fi
+\suppressfirstparagraphindent
+}
+
+% @chapter, @appendix, @unnumbered.
+\def\thischaptername{No Chapter Title}
+\outer\def\chapter{\parsearg\chapteryyy}
+\def\chapteryyy #1{\numhead0{#1}} % normally numhead0 calls chapterzzz
+\def\chapterzzz #1{%
+ \secno=0 \subsecno=0 \subsubsecno=0
+ \global\advance \chapno by 1 \message{\putwordChapter\space \the\chapno}%
+ \chapmacro {#1}{\the\chapno}%
+ \gdef\thissection{#1}%
+ \gdef\thischaptername{#1}%
+ % We don't substitute the actual chapter name into \thischapter
+ % because we don't want its macros evaluated now.
+ \xdef\thischapter{\putwordChapter{} \the\chapno: \noexpand\thischaptername}%
+ \writetocentry{chap}{#1}{{\the\chapno}}
+ \donoderef
+ \global\let\section = \numberedsec
+ \global\let\subsection = \numberedsubsec
+ \global\let\subsubsection = \numberedsubsubsec
+}
+
+% we use \chapno to avoid indenting back
+\def\appendixbox#1{%
+ \setbox0 = \hbox{\putwordAppendix{} \the\chapno}%
+ \hbox to \wd0{#1\hss}}
+
+\outer\def\appendix{\parsearg\appendixyyy}
+\def\appendixyyy #1{\apphead0{#1}} % normally apphead0 calls appendixzzz
+\def\appendixzzz #1{%
+ \secno=0 \subsecno=0 \subsubsecno=0
+ \global\advance \appendixno by 1
+ \message{\putwordAppendix\space \appendixletter}%
+ \chapmacro {#1}{\appendixbox{\putwordAppendix{} \appendixletter}}%
+ \gdef\thissection{#1}%
+ \gdef\thischaptername{#1}%
+ \xdef\thischapter{\putwordAppendix{} \appendixletter: \noexpand\thischaptername}%
+ \writetocentry{appendix}{#1}{{\appendixletter}}
+ \appendixnoderef
+ \global\let\section = \appendixsec
+ \global\let\subsection = \appendixsubsec
+ \global\let\subsubsection = \appendixsubsubsec
+}
+
+% @centerchap is like @unnumbered, but the heading is centered.
+\outer\def\centerchap{\parsearg\centerchapyyy}
+\def\centerchapyyy #1{{\let\unnumbchapmacro=\centerchapmacro \unnumberedyyy{#1}}}
+
+% @top is like @unnumbered.
+\outer\def\top{\parsearg\unnumberedyyy}
+
+\outer\def\unnumbered{\parsearg\unnumberedyyy}
+\def\unnumberedyyy #1{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz
+\def\unnumberedzzz #1{%
+ \secno=0 \subsecno=0 \subsubsecno=0
+ %
+ % This used to be simply \message{#1}, but TeX fully expands the
+ % argument to \message. Therefore, if #1 contained @-commands, TeX
+ % expanded them. For example, in `@unnumbered The @cite{Book}', TeX
+ % expanded @cite (which turns out to cause errors because \cite is meant
+ % to be executed, not expanded).
+ %
+ % Anyway, we don't want the fully-expanded definition of @cite to appear
+ % as a result of the \message, we just want `@cite' itself. We use
+ % \the<toks register> to achieve this: TeX expands \the<toks> only once,
+ % simply yielding the contents of <toks register>. (We also do this for
+ % the toc entries.)
+ \toks0 = {#1}\message{(\the\toks0)}%
+ %
+ \unnumbchapmacro {#1}%
+ \gdef\thischapter{#1}\gdef\thissection{#1}%
+ \writetocentry{unnumbchap}{#1}{{\the\chapno}}
+ \unnumbnoderef
+ \global\let\section = \unnumberedsec
+ \global\let\subsection = \unnumberedsubsec
+ \global\let\subsubsection = \unnumberedsubsubsec
+}
+
+% Sections.
+\outer\def\numberedsec{\parsearg\secyyy}
+\def\secyyy #1{\numhead1{#1}} % normally calls seczzz
+\def\seczzz #1{%
+ \subsecno=0 \subsubsecno=0 \global\advance \secno by 1 %
+ \gdef\thissection{#1}\secheading {#1}{\the\chapno}{\the\secno}%
+ \writetocentry{sec}{#1}{{\the\chapno}{\the\secno}}
+ \donoderef
+ \nobreak
+}
+
+\outer\def\appendixsection{\parsearg\appendixsecyyy}
+\outer\def\appendixsec{\parsearg\appendixsecyyy}
+\def\appendixsecyyy #1{\apphead1{#1}} % normally calls appendixsectionzzz
+\def\appendixsectionzzz #1{%
+ \subsecno=0 \subsubsecno=0 \global\advance \secno by 1 %
+ \gdef\thissection{#1}\secheading {#1}{\appendixletter}{\the\secno}%
+ \writetocentry{sec}{#1}{{\appendixletter}{\the\secno}}
+ \appendixnoderef
+ \nobreak
+}
+
+\outer\def\unnumberedsec{\parsearg\unnumberedsecyyy}
+\def\unnumberedsecyyy #1{\unnmhead1{#1}} % normally calls unnumberedseczzz
+\def\unnumberedseczzz #1{%
+ \plainsecheading {#1}\gdef\thissection{#1}%
+ \writetocentry{unnumbsec}{#1}{{\the\chapno}{\the\secno}}
+ \unnumbnoderef
+ \nobreak
+}
+
+% Subsections.
+\outer\def\numberedsubsec{\parsearg\numberedsubsecyyy}
+\def\numberedsubsecyyy #1{\numhead2{#1}} % normally calls numberedsubseczzz
+\def\numberedsubseczzz #1{%
+ \gdef\thissection{#1}\subsubsecno=0 \global\advance \subsecno by 1 %
+ \subsecheading {#1}{\the\chapno}{\the\secno}{\the\subsecno}%
+ \writetocentry{subsec}{#1}{{\the\chapno}{\the\secno}{\the\subsecno}}
+ \donoderef
+ \nobreak
+}
+
+\outer\def\appendixsubsec{\parsearg\appendixsubsecyyy}
+\def\appendixsubsecyyy #1{\apphead2{#1}} % normally calls appendixsubseczzz
+\def\appendixsubseczzz #1{%
+ \gdef\thissection{#1}\subsubsecno=0 \global\advance \subsecno by 1 %
+ \subsecheading {#1}{\appendixletter}{\the\secno}{\the\subsecno}%
+ \writetocentry{subsec}{#1}{{\appendixletter}{\the\secno}{\the\subsecno}}
+ \appendixnoderef
+ \nobreak
+}
+
+\outer\def\unnumberedsubsec{\parsearg\unnumberedsubsecyyy}
+\def\unnumberedsubsecyyy #1{\unnmhead2{#1}} %normally calls unnumberedsubseczzz
+\def\unnumberedsubseczzz #1{%
+ \plainsubsecheading {#1}\gdef\thissection{#1}%
+ \writetocentry{unnumbsubsec}{#1}{{\the\chapno}{\the\secno}{\the\subsecno}}
+ \unnumbnoderef
+ \nobreak
+}
+
+% Subsubsections.
+\outer\def\numberedsubsubsec{\parsearg\numberedsubsubsecyyy}
+\def\numberedsubsubsecyyy #1{\numhead3{#1}} % normally numberedsubsubseczzz
+\def\numberedsubsubseczzz #1{%
+ \gdef\thissection{#1}\global\advance \subsubsecno by 1 %
+ \subsubsecheading {#1}
+ {\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}%
+ \writetocentry{subsubsec}{#1}{{\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}}
+ \donoderef
+ \nobreak
+}
+
+\outer\def\appendixsubsubsec{\parsearg\appendixsubsubsecyyy}
+\def\appendixsubsubsecyyy #1{\apphead3{#1}} % normally appendixsubsubseczzz
+\def\appendixsubsubseczzz #1{%
+ \gdef\thissection{#1}\global\advance \subsubsecno by 1 %
+ \subsubsecheading {#1}
+ {\appendixletter}{\the\secno}{\the\subsecno}{\the\subsubsecno}%
+ \writetocentry{subsubsec}{#1}{{\appendixletter}{\the\secno}{\the\subsecno}{\the\subsubsecno}}
+ \appendixnoderef
+ \nobreak
+}
+
+\outer\def\unnumberedsubsubsec{\parsearg\unnumberedsubsubsecyyy}
+\def\unnumberedsubsubsecyyy #1{\unnmhead3{#1}} %normally unnumberedsubsubseczzz
+\def\unnumberedsubsubseczzz #1{%
+ \plainsubsubsecheading {#1}\gdef\thissection{#1}%
+ \writetocentry{unnumbsubsubsec}{#1}{{\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}}
+ \unnumbnoderef
+ \nobreak
+}
+
+% These are variants which are not "outer", so they can appear in @ifinfo.
+% Actually, they should now be obsolete; ordinary section commands should work.
+\def\infotop{\parsearg\unnumberedzzz}
+\def\infounnumbered{\parsearg\unnumberedzzz}
+\def\infounnumberedsec{\parsearg\unnumberedseczzz}
+\def\infounnumberedsubsec{\parsearg\unnumberedsubseczzz}
+\def\infounnumberedsubsubsec{\parsearg\unnumberedsubsubseczzz}
+
+\def\infoappendix{\parsearg\appendixzzz}
+\def\infoappendixsec{\parsearg\appendixseczzz}
+\def\infoappendixsubsec{\parsearg\appendixsubseczzz}
+\def\infoappendixsubsubsec{\parsearg\appendixsubsubseczzz}
+
+\def\infochapter{\parsearg\chapterzzz}
+\def\infosection{\parsearg\sectionzzz}
+\def\infosubsection{\parsearg\subsectionzzz}
+\def\infosubsubsection{\parsearg\subsubsectionzzz}
+
+% These macros control what the section commands do, according
+% to what kind of chapter we are in (ordinary, appendix, or unnumbered).
+% Define them by default for a numbered chapter.
+\global\let\section = \numberedsec
+\global\let\subsection = \numberedsubsec
+\global\let\subsubsection = \numberedsubsubsec
+
+% Define @majorheading, @heading and @subheading
+
+% NOTE on use of \vbox for chapter headings, section headings, and such:
+% 1) We use \vbox rather than the earlier \line to permit
+% overlong headings to fold.
+% 2) \hyphenpenalty is set to 10000 because hyphenation in a
+% heading is obnoxious; this forbids it.
+% 3) Likewise, headings look best if no \parindent is used, and
+% if justification is not attempted. Hence \raggedright.
+
+
+\def\majorheading{\parsearg\majorheadingzzz}
+\def\majorheadingzzz #1{%
+ {\advance\chapheadingskip by 10pt \chapbreak }%
+ {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
+ \parindent=0pt\raggedright
+ \rm #1\hfill}}\bigskip \par\penalty 200}
+
+\def\chapheading{\parsearg\chapheadingzzz}
+\def\chapheadingzzz #1{\chapbreak %
+ {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
+ \parindent=0pt\raggedright
+ \rm #1\hfill}}\bigskip \par\penalty 200}
+
+% @heading, @subheading, @subsubheading.
+\def\heading{\parsearg\plainsecheading}
+\def\subheading{\parsearg\plainsubsecheading}
+\def\subsubheading{\parsearg\plainsubsubsecheading}
+
+% These macros generate a chapter, section, etc. heading only
+% (including whitespace, linebreaking, etc. around it),
+% given all the information in convenient, parsed form.
+
+%%% Args are the skip and penalty (usually negative)
+\def\dobreak#1#2{\par\ifdim\lastskip<#1\removelastskip\penalty#2\vskip#1\fi}
+
+\def\setchapterstyle #1 {\csname CHAPF#1\endcsname}
+
+%%% Define plain chapter starts, and page on/off switching for it
+% Parameter controlling skip before chapter headings (if needed)
+
+\newskip\chapheadingskip
+
+\def\chapbreak{\dobreak \chapheadingskip {-4000}}
+\def\chappager{\par\vfill\supereject}
+\def\chapoddpage{\chappager \ifodd\pageno \else \hbox to 0pt{} \chappager\fi}
+
+\def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname}
+
+\def\CHAPPAGoff{%
+\global\let\contentsalignmacro = \chappager
+\global\let\pchapsepmacro=\chapbreak
+\global\let\pagealignmacro=\chappager}
+
+\def\CHAPPAGon{%
+\global\let\contentsalignmacro = \chappager
+\global\let\pchapsepmacro=\chappager
+\global\let\pagealignmacro=\chappager
+\global\def\HEADINGSon{\HEADINGSsingle}}
+
+\def\CHAPPAGodd{
+\global\let\contentsalignmacro = \chapoddpage
+\global\let\pchapsepmacro=\chapoddpage
+\global\let\pagealignmacro=\chapoddpage
+\global\def\HEADINGSon{\HEADINGSdouble}}
+
+\CHAPPAGon
+
+\def\CHAPFplain{
+\global\let\chapmacro=\chfplain
+\global\let\unnumbchapmacro=\unnchfplain
+\global\let\centerchapmacro=\centerchfplain}
+
+% Plain chapter opening.
+% #1 is the text, #2 the chapter number or empty if unnumbered.
+\def\chfplain#1#2{%
+ \pchapsepmacro
+ {%
+ \chapfonts \rm
+ \def\chapnum{#2}%
+ \setbox0 = \hbox{#2\ifx\chapnum\empty\else\enspace\fi}%
+ \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
+ \hangindent = \wd0 \centerparametersmaybe
+ \unhbox0 #1\par}%
+ }%
+ \nobreak\bigskip % no page break after a chapter title
+ \nobreak
+}
+
+% Plain opening for unnumbered.
+\def\unnchfplain#1{\chfplain{#1}{}}
+
+% @centerchap -- centered and unnumbered.
+\let\centerparametersmaybe = \relax
+\def\centerchfplain#1{{%
+ \def\centerparametersmaybe{%
+ \advance\rightskip by 3\rightskip
+ \leftskip = \rightskip
+ \parfillskip = 0pt
+ }%
+ \chfplain{#1}{}%
+}}
+
+\CHAPFplain % The default
+
+\def\unnchfopen #1{%
+\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
+ \parindent=0pt\raggedright
+ \rm #1\hfill}}\bigskip \par\nobreak
+}
+
+\def\chfopen #1#2{\chapoddpage {\chapfonts
+\vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}%
+\par\penalty 5000 %
+}
+
+\def\centerchfopen #1{%
+\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
+ \parindent=0pt
+ \hfill {\rm #1}\hfill}}\bigskip \par\nobreak
+}
+
+\def\CHAPFopen{
+\global\let\chapmacro=\chfopen
+\global\let\unnumbchapmacro=\unnchfopen
+\global\let\centerchapmacro=\centerchfopen}
+
+
+% Section titles.
+\newskip\secheadingskip
+\def\secheadingbreak{\dobreak \secheadingskip {-1000}}
+\def\secheading#1#2#3{\sectionheading{sec}{#2.#3}{#1}}
+\def\plainsecheading#1{\sectionheading{sec}{}{#1}}
+
+% Subsection titles.
+\newskip \subsecheadingskip
+\def\subsecheadingbreak{\dobreak \subsecheadingskip {-500}}
+\def\subsecheading#1#2#3#4{\sectionheading{subsec}{#2.#3.#4}{#1}}
+\def\plainsubsecheading#1{\sectionheading{subsec}{}{#1}}
+
+% Subsubsection titles.
+\let\subsubsecheadingskip = \subsecheadingskip
+\let\subsubsecheadingbreak = \subsecheadingbreak
+\def\subsubsecheading#1#2#3#4#5{\sectionheading{subsubsec}{#2.#3.#4.#5}{#1}}
+\def\plainsubsubsecheading#1{\sectionheading{subsubsec}{}{#1}}
+
+
+% Print any size section title.
+%
+% #1 is the section type (sec/subsec/subsubsec), #2 is the section
+% number (maybe empty), #3 the text.
+\def\sectionheading#1#2#3{%
+ {%
+ \expandafter\advance\csname #1headingskip\endcsname by \parskip
+ \csname #1headingbreak\endcsname
+ }%
+ {%
+ % Switch to the right set of fonts.
+ \csname #1fonts\endcsname \rm
+ %
+ % Only insert the separating space if we have a section number.
+ \def\secnum{#2}%
+ \setbox0 = \hbox{#2\ifx\secnum\empty\else\enspace\fi}%
+ %
+ \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
+ \hangindent = \wd0 % zero if no section number
+ \unhbox0 #3}%
+ }%
+ % Add extra space after the heading -- either a line space or a
+ % paragraph space, whichever is more. (Some people like to set
+ % \parskip to large values for some reason.) Don't allow stretch, though.
+ \nobreak
+ \ifdim\parskip>\normalbaselineskip
+ \kern\parskip
+ \else
+ \kern\normalbaselineskip
+ \fi
+ \nobreak
+}
+
+
+\message{toc,}
+% Table of contents.
+\newwrite\tocfile
+
+% Write an entry to the toc file, opening it if necessary.
+% Called from @chapter, etc. We supply {\folio} at the end of the
+% argument, which will end up as the last argument to the \...entry macro.
+%
+% Usage: \writetocentry{chap}{The Name of The Game}{{\the\chapno}}
+% We open the .toc file for writing here instead of at @setfilename (or
+% any other fixed time) so that @contents can be anywhere in the document.
+%
+\newif\iftocfileopened
+\def\writetocentry#1#2#3{%
+ \iftocfileopened\else
+ \immediate\openout\tocfile = \jobname.toc
+ \global\tocfileopenedtrue
+ \fi
+ %
+ \iflinks
+ \toks0 = {#2}%
+ \edef\temp{\write\tocfile{\realbackslash #1entry{\the\toks0}#3{\folio}}}%
+ \temp
+ \fi
+ %
+ % Tell \shipout to create a page destination if we're doing pdf, which
+ % will be the target of the links in the table of contents. We can't
+ % just do it on every page because the title pages are numbered 1 and
+ % 2 (the page numbers aren't printed), and so are the first two pages
+ % of the document. Thus, we'd have two destinations named `1', and
+ % two named `2'.
+ \ifpdf \pdfmakepagedesttrue \fi
+}
+
+\newskip\contentsrightmargin \contentsrightmargin=1in
+\newcount\savepageno
+\newcount\lastnegativepageno \lastnegativepageno = -1
+
+% Finish up the main text and prepare to read what we've written
+% to \tocfile.
+%
+\def\startcontents#1{%
+ % If @setchapternewpage on, and @headings double, the contents should
+ % start on an odd page, unlike chapters. Thus, we maintain
+ % \contentsalignmacro in parallel with \pagealignmacro.
+ % From: Torbjorn Granlund <[email protected]>
+ \contentsalignmacro
+ \immediate\closeout\tocfile
+ %
+ % Don't need to put `Contents' or `Short Contents' in the headline.
+ % It is abundantly clear what they are.
+ \unnumbchapmacro{#1}\def\thischapter{}%
+ \savepageno = \pageno
+ \begingroup % Set up to handle contents files properly.
+ \catcode`\\=0 \catcode`\{=1 \catcode`\}=2 \catcode`\@=11
+ % We can't do this, because then an actual ^ in a section
+ % title fails, e.g., @chapter ^ -- exponentiation. --karl, 9jul97.
+ %\catcode`\^=7 % to see ^^e4 as \"a etc. [email protected]
+ \raggedbottom % Worry more about breakpoints than the bottom.
+ \advance\hsize by -\contentsrightmargin % Don't use the full line length.
+ %
+ % Roman numerals for page numbers.
+ \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi
+}
+
+
+% Normal (long) toc.
+\def\contents{%
+ \startcontents{\putwordTOC}%
+ \openin 1 \jobname.toc
+ \ifeof 1 \else
+ \closein 1
+ \input \jobname.toc
+ \fi
+ \vfill \eject
+ \contentsalignmacro % in case @setchapternewpage odd is in effect
+ \pdfmakeoutlines
+ \endgroup
+ \lastnegativepageno = \pageno
+ \global\pageno = \savepageno
+}
+
+% And just the chapters.
+\def\summarycontents{%
+ \startcontents{\putwordShortTOC}%
+ %
+ \let\chapentry = \shortchapentry
+ \let\appendixentry = \shortappendixentry
+ \let\unnumbchapentry = \shortunnumberedentry
+ % We want a true roman here for the page numbers.
+ \secfonts
+ \let\rm=\shortcontrm \let\bf=\shortcontbf
+ \let\sl=\shortcontsl \let\tt=\shortconttt
+ \rm
+ \hyphenpenalty = 10000
+ \advance\baselineskip by 1pt % Open it up a little.
+ \def\secentry ##1##2##3##4{}
+ \def\subsecentry ##1##2##3##4##5{}
+ \def\subsubsecentry ##1##2##3##4##5##6{}
+ \let\unnumbsecentry = \secentry
+ \let\unnumbsubsecentry = \subsecentry
+ \let\unnumbsubsubsecentry = \subsubsecentry
+ \openin 1 \jobname.toc
+ \ifeof 1 \else
+ \closein 1
+ \input \jobname.toc
+ \fi
+ \vfill \eject
+ \contentsalignmacro % in case @setchapternewpage odd is in effect
+ \endgroup
+ \lastnegativepageno = \pageno
+ \global\pageno = \savepageno
+}
+\let\shortcontents = \summarycontents
+
+\ifpdf
+ \pdfcatalog{/PageMode /UseOutlines}%
+\fi
+
+% These macros generate individual entries in the table of contents.
+% The first argument is the chapter or section name.
+% The last argument is the page number.
+% The arguments in between are the chapter number, section number, ...
+
+% Chapters, in the main contents.
+\def\chapentry#1#2#3{\dochapentry{#2\labelspace#1}{#3}}
+%
+% Chapters, in the short toc.
+% See comments in \dochapentry re vbox and related settings.
+\def\shortchapentry#1#2#3{%
+ \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#3\egroup}%
+}
+
+% Appendices, in the main contents.
+\def\appendixentry#1#2#3{%
+ \dochapentry{\appendixbox{\putwordAppendix{} #2}\labelspace#1}{#3}}
+%
+% Appendices, in the short toc.
+\let\shortappendixentry = \shortchapentry
+
+% Typeset the label for a chapter or appendix for the short contents.
+% The arg is, e.g., `Appendix A' for an appendix, or `3' for a chapter.
+% We could simplify the code here by writing out an \appendixentry
+% command in the toc file for appendices, instead of using \chapentry
+% for both, but it doesn't seem worth it.
+%
+\newdimen\shortappendixwidth
+%
+\def\shortchaplabel#1{%
+ % This space should be enough, since a single number is .5em, and the
+ % widest letter (M) is 1em, at least in the Computer Modern fonts.
+ % But use \hss just in case.
+ % (This space doesn't include the extra space that gets added after
+ % the label; that gets put in by \shortchapentry above.)
+ \dimen0 = 1em
+ \hbox to \dimen0{#1\hss}%
+}
+
+% Unnumbered chapters.
+\def\unnumbchapentry#1#2#3{\dochapentry{#1}{#3}}
+\def\shortunnumberedentry#1#2#3{\tocentry{#1}{\doshortpageno\bgroup#3\egroup}}
+
+% Sections.
+\def\secentry#1#2#3#4{\dosecentry{#2.#3\labelspace#1}{#4}}
+\def\unnumbsecentry#1#2#3#4{\dosecentry{#1}{#4}}
+
+% Subsections.
+\def\subsecentry#1#2#3#4#5{\dosubsecentry{#2.#3.#4\labelspace#1}{#5}}
+\def\unnumbsubsecentry#1#2#3#4#5{\dosubsecentry{#1}{#5}}
+
+% And subsubsections.
+\def\subsubsecentry#1#2#3#4#5#6{%
+ \dosubsubsecentry{#2.#3.#4.#5\labelspace#1}{#6}}
+\def\unnumbsubsubsecentry#1#2#3#4#5#6{\dosubsubsecentry{#1}{#6}}
+
+% This parameter controls the indentation of the various levels.
+\newdimen\tocindent \tocindent = 3pc
+
+% Now for the actual typesetting. In all these, #1 is the text and #2 is the
+% page number.
+%
+% If the toc has to be broken over pages, we want it to be at chapters
+% if at all possible; hence the \penalty.
+\def\dochapentry#1#2{%
+ \penalty-300 \vskip1\baselineskip plus.33\baselineskip minus.25\baselineskip
+ \begingroup
+ \chapentryfonts
+ \tocentry{#1}{\dopageno\bgroup#2\egroup}%
+ \endgroup
+ \nobreak\vskip .25\baselineskip plus.1\baselineskip
+}
+
+\def\dosecentry#1#2{\begingroup
+ \secentryfonts \leftskip=\tocindent
+ \tocentry{#1}{\dopageno\bgroup#2\egroup}%
+\endgroup}
+
+\def\dosubsecentry#1#2{\begingroup
+ \subsecentryfonts \leftskip=2\tocindent
+ \tocentry{#1}{\dopageno\bgroup#2\egroup}%
+\endgroup}
+
+\def\dosubsubsecentry#1#2{\begingroup
+ \subsubsecentryfonts \leftskip=3\tocindent
+ \tocentry{#1}{\dopageno\bgroup#2\egroup}%
+\endgroup}
+
+% Final typesetting of a toc entry; we use the same \entry macro as for
+% the index entries, but we want to suppress hyphenation here. (We
+% can't do that in the \entry macro, since index entries might consist
+% of hyphenated-identifiers-that-do-not-fit-on-a-line-and-nothing-else.)
+\def\tocentry#1#2{\begingroup
+ \vskip 0pt plus1pt % allow a little stretch for the sake of nice page breaks
+ % Do not use \turnoffactive in these arguments. Since the toc is
+ % typeset in cmr, characters such as _ would come out wrong; we
+ % have to do the usual translation tricks.
+ \entry{#1}{#2}%
+\endgroup}
+
+% Space between chapter (or whatever) number and the title.
+\def\labelspace{\hskip1em \relax}
+
+\def\dopageno#1{{\rm #1}}
+\def\doshortpageno#1{{\rm #1}}
+
+\def\chapentryfonts{\secfonts \rm}
+\def\secentryfonts{\textfonts}
+\let\subsecentryfonts = \textfonts
+\let\subsubsecentryfonts = \textfonts
+
+
+\message{environments,}
+% @foo ... @end foo.
+
+% @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
+%
+% Since these characters are used in examples, it should be an even number of
+% \tt widths. Each \tt character is 1en, so two makes it 1em.
+%
+\def\point{$\star$}
+\def\result{\leavevmode\raise.15ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
+\def\expansion{\leavevmode\raise.1ex\hbox to 1em{\hfil$\mapsto$\hfil}}
+\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}}
+\def\equiv{\leavevmode\lower.1ex\hbox to 1em{\hfil$\ptexequiv$\hfil}}
+
+% The @error{} command.
+% Adapted from the TeXbook's \boxit.
+%
+\newbox\errorbox
+%
+{\tentt \global\dimen0 = 3em}% Width of the box.
+\dimen2 = .55pt % Thickness of rules
+% The text. (`r' is open on the right, `e' somewhat less so on the left.)
+\setbox0 = \hbox{\kern-.75pt \tensf error\kern-1.5pt}
+%
+\global\setbox\errorbox=\hbox to \dimen0{\hfil
+ \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
+ \advance\hsize by -2\dimen2 % Rules.
+ \vbox{
+ \hrule height\dimen2
+ \hbox{\vrule width\dimen2 \kern3pt % Space to left of text.
+ \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below.
+ \kern3pt\vrule width\dimen2}% Space to right.
+ \hrule height\dimen2}
+ \hfil}
+%
+\def\error{\leavevmode\lower.7ex\copy\errorbox}
+
+% @tex ... @end tex escapes into raw Tex temporarily.
+% One exception: @ is still an escape character, so that @end tex works.
+% But \@ or @@ will get a plain tex @ character.
+
+\def\tex{\begingroup
+ \catcode `\\=0 \catcode `\{=1 \catcode `\}=2
+ \catcode `\$=3 \catcode `\&=4 \catcode `\#=6
+ \catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie
+ \catcode `\%=14
+ \catcode `\+=\other
+ \catcode `\"=\other
+ \catcode `\==\other
+ \catcode `\|=\other
+ \catcode `\<=\other
+ \catcode `\>=\other
+ \escapechar=`\\
+ %
+ \let\b=\ptexb
+ \let\bullet=\ptexbullet
+ \let\c=\ptexc
+ \let\,=\ptexcomma
+ \let\.=\ptexdot
+ \let\dots=\ptexdots
+ \let\equiv=\ptexequiv
+ \let\!=\ptexexclam
+ \let\i=\ptexi
+ \let\indent=\ptexindent
+ \let\{=\ptexlbrace
+ \let\+=\tabalign
+ \let\}=\ptexrbrace
+ \let\/=\ptexslash
+ \let\*=\ptexstar
+ \let\t=\ptext
+ %
+ \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}%
+ \def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt \endldots\,$\fi}%
+ \def\@{@}%
+\let\Etex=\endgroup}
+
+% Define @lisp ... @end lisp.
+% @lisp does a \begingroup so it can rebind things,
+% including the definition of @end lisp (which normally is erroneous).
+
+% Amount to narrow the margins by for @lisp.
+\newskip\lispnarrowing \lispnarrowing=0.4in
+
+% This is the definition that ^^M gets inside @lisp, @example, and other
+% such environments. \null is better than a space, since it doesn't
+% have any width.
+\def\lisppar{\null\endgraf}
+
+% Make each space character in the input produce a normal interword
+% space in the output. Don't allow a line break at this space, as this
+% is used only in environments like @example, where each line of input
+% should produce a line of output anyway.
+%
+{\obeyspaces %
+\gdef\sepspaces{\obeyspaces\let =\tie}}
+
+% Define \obeyedspace to be our active space, whatever it is. This is
+% for use in \parsearg.
+{\sepspaces%
+\global\let\obeyedspace= }
+
+% This space is always present above and below environments.
+\newskip\envskipamount \envskipamount = 0pt
+
+% Make spacing and below environment symmetrical. We use \parskip here
+% to help in doing that, since in @example-like environments \parskip
+% is reset to zero; thus the \afterenvbreak inserts no space -- but the
+% start of the next paragraph will insert \parskip.
+%
+\def\aboveenvbreak{{%
+ % =10000 instead of <10000 because of a special case in \itemzzz, q.v.
+ \ifnum \lastpenalty=10000 \else
+ \advance\envskipamount by \parskip
+ \endgraf
+ \ifdim\lastskip<\envskipamount
+ \removelastskip
+ % it's not a good place to break if the last penalty was \nobreak
+ % or better ...
+ \ifnum\lastpenalty>10000 \else \penalty-50 \fi
+ \vskip\envskipamount
+ \fi
+ \fi
+}}
+
+\let\afterenvbreak = \aboveenvbreak
+
+% \nonarrowing is a flag. If "set", @lisp etc don't narrow margins.
+\let\nonarrowing=\relax
+
+% @cartouche ... @end cartouche: draw rectangle w/rounded corners around
+% environment contents.
+\font\circle=lcircle10
+\newdimen\circthick
+\newdimen\cartouter\newdimen\cartinner
+\newskip\normbskip\newskip\normpskip\newskip\normlskip
+\circthick=\fontdimen8\circle
+%
+\def\ctl{{\circle\char'013\hskip -6pt}}% 6pt from pl file: 1/2charwidth
+\def\ctr{{\hskip 6pt\circle\char'010}}
+\def\cbl{{\circle\char'012\hskip -6pt}}
+\def\cbr{{\hskip 6pt\circle\char'011}}
+\def\carttop{\hbox to \cartouter{\hskip\lskip
+ \ctl\leaders\hrule height\circthick\hfil\ctr
+ \hskip\rskip}}
+\def\cartbot{\hbox to \cartouter{\hskip\lskip
+ \cbl\leaders\hrule height\circthick\hfil\cbr
+ \hskip\rskip}}
+%
+\newskip\lskip\newskip\rskip
+
+\def\cartouche{%
+\par % can't be in the midst of a paragraph.
+\begingroup
+ \lskip=\leftskip \rskip=\rightskip
+ \leftskip=0pt\rightskip=0pt %we want these *outside*.
+ \cartinner=\hsize \advance\cartinner by-\lskip
+ \advance\cartinner by-\rskip
+ \cartouter=\hsize
+ \advance\cartouter by 18.4pt % allow for 3pt kerns on either
+% side, and for 6pt waste from
+% each corner char, and rule thickness
+ \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
+ % Flag to tell @lisp, etc., not to narrow margin.
+ \let\nonarrowing=\comment
+ \vbox\bgroup
+ \baselineskip=0pt\parskip=0pt\lineskip=0pt
+ \carttop
+ \hbox\bgroup
+ \hskip\lskip
+ \vrule\kern3pt
+ \vbox\bgroup
+ \hsize=\cartinner
+ \kern3pt
+ \begingroup
+ \baselineskip=\normbskip
+ \lineskip=\normlskip
+ \parskip=\normpskip
+ \vskip -\parskip
+\def\Ecartouche{%
+ \endgroup
+ \kern3pt
+ \egroup
+ \kern3pt\vrule
+ \hskip\rskip
+ \egroup
+ \cartbot
+ \egroup
+\endgroup
+}}
+
+
+% This macro is called at the beginning of all the @example variants,
+% inside a group.
+\def\nonfillstart{%
+ \aboveenvbreak
+ \inENV % This group ends at the end of the body
+ \hfuzz = 12pt % Don't be fussy
+ \sepspaces % Make spaces be word-separators rather than space tokens.
+ \let\par = \lisppar % don't ignore blank lines
+ \obeylines % each line of input is a line of output
+ \parskip = 0pt
+ \parindent = 0pt
+ \emergencystretch = 0pt % don't try to avoid overfull boxes
+ % @cartouche defines \nonarrowing to inhibit narrowing
+ % at next level down.
+ \ifx\nonarrowing\relax
+ \advance \leftskip by \lispnarrowing
+ \exdentamount=\lispnarrowing
+ \let\exdent=\nofillexdent
+ \let\nonarrowing=\relax
+ \fi
+}
+
+% Define the \E... control sequence only if we are inside the particular
+% environment, so the error checking in \end will work.
+%
+% To end an @example-like environment, we first end the paragraph (via
+% \afterenvbreak's vertical glue), and then the group. That way we keep
+% the zero \parskip that the environments set -- \parskip glue will be
+% inserted at the beginning of the next paragraph in the document, after
+% the environment.
+%
+\def\nonfillfinish{\afterenvbreak\endgroup}
+
+% @lisp: indented, narrowed, typewriter font.
+\def\lisp{\begingroup
+ \nonfillstart
+ \let\Elisp = \nonfillfinish
+ \tt
+ \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
+ \gobble % eat return
+}
+
+% @example: Same as @lisp.
+\def\example{\begingroup \def\Eexample{\nonfillfinish\endgroup}\lisp}
+
+% @smallexample and @smalllisp: use smaller fonts.
+% Originally contributed by Pavel@xerox.
+\def\smalllisp{\begingroup
+ \def\Esmalllisp{\nonfillfinish\endgroup}%
+ \def\Esmallexample{\nonfillfinish\endgroup}%
+ \smallexamplefonts
+ \lisp
+}
+\let\smallexample = \smalllisp
+
+
+% @display: same as @lisp except keep current font.
+%
+\def\display{\begingroup
+ \nonfillstart
+ \let\Edisplay = \nonfillfinish
+ \gobble
+}
+%
+% @smalldisplay: @display plus smaller fonts.
+%
+\def\smalldisplay{\begingroup
+ \def\Esmalldisplay{\nonfillfinish\endgroup}%
+ \smallexamplefonts \rm
+ \display
+}
+
+% @format: same as @display except don't narrow margins.
+%
+\def\format{\begingroup
+ \let\nonarrowing = t
+ \nonfillstart
+ \let\Eformat = \nonfillfinish
+ \gobble
+}
+%
+% @smallformat: @format plus smaller fonts.
+%
+\def\smallformat{\begingroup
+ \def\Esmallformat{\nonfillfinish\endgroup}%
+ \smallexamplefonts \rm
+ \format
+}
+
+% @flushleft (same as @format).
+%
+\def\flushleft{\begingroup \def\Eflushleft{\nonfillfinish\endgroup}\format}
+
+% @flushright.
+%
+\def\flushright{\begingroup
+ \let\nonarrowing = t
+ \nonfillstart
+ \let\Eflushright = \nonfillfinish
+ \advance\leftskip by 0pt plus 1fill
+ \gobble
+}
+
+
+% @quotation does normal linebreaking (hence we can't use \nonfillstart)
+% and narrows the margins.
+%
+\def\quotation{%
+ \begingroup\inENV %This group ends at the end of the @quotation body
+ {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
+ \parindent=0pt
+ % We have retained a nonzero parskip for the environment, since we're
+ % doing normal filling. So to avoid extra space below the environment...
+ \def\Equotation{\parskip = 0pt \nonfillfinish}%
+ %
+ % @cartouche defines \nonarrowing to inhibit narrowing at next level down.
+ \ifx\nonarrowing\relax
+ \advance\leftskip by \lispnarrowing
+ \advance\rightskip by \lispnarrowing
+ \exdentamount = \lispnarrowing
+ \let\nonarrowing = \relax
+ \fi
+}
+
+
+% LaTeX-like @verbatim...@end verbatim and @verb{<char>...<char>}
+% If we want to allow any <char> as delimiter,
+% we need the curly braces so that makeinfo sees the @verb command, eg:
+% `@verbx...x' would look like the '@verbx' command. [email protected]
+%
+% [Knuth]: Donald Ervin Knuth, 1996. The TeXbook.
+%
+% [Knuth] p.344; only we need to do the other characters Texinfo sets
+% active too. Otherwise, they get lost as the first character on a
+% verbatim line.
+\def\dospecials{%
+ \do\ \do\\\do\{\do\}\do\$\do\&%
+ \do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~%
+ \do\<\do\>\do\|\do\@\do+\do\"%
+}
+%
+% [Knuth] p. 380
+\def\uncatcodespecials{%
+ \def\do##1{\catcode`##1=12}\dospecials}
+%
+% [Knuth] pp. 380,381,391
+% Disable Spanish ligatures ?` and !` of \tt font
+\begingroup
+ \catcode`\`=\active\gdef`{\relax\lq}
+\endgroup
+%
+% Setup for the @verb command.
+%
+% Eight spaces for a tab
+\begingroup
+ \catcode`\^^I=\active
+ \gdef\tabeightspaces{\catcode`\^^I=\active\def^^I{\ \ \ \ \ \ \ \ }}
+\endgroup
+%
+\def\setupverb{%
+ \tt % easiest (and conventionally used) font for verbatim
+ \def\par{\leavevmode\endgraf}%
+ \catcode`\`=\active
+ \tabeightspaces
+ % Respect line breaks,
+ % print special symbols as themselves, and
+ % make each space count
+ % must do in this order:
+ \obeylines \uncatcodespecials \sepspaces
+}
+
+% Setup for the @verbatim environment
+%
+% Real tab expansion
+\newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
+%
+\def\starttabbox{\setbox0=\hbox\bgroup}
+\begingroup
+ \catcode`\^^I=\active
+ \gdef\tabexpand{%
+ \catcode`\^^I=\active
+ \def^^I{\leavevmode\egroup
+ \dimen0=\wd0 % the width so far, or since the previous tab
+ \divide\dimen0 by\tabw
+ \multiply\dimen0 by\tabw % compute previous multiple of \tabw
+ \advance\dimen0 by\tabw % advance to next multiple of \tabw
+ \wd0=\dimen0 \box0 \starttabbox
+ }%
+ }
+\endgroup
+\def\setupverbatim{%
+ % Easiest (and conventionally used) font for verbatim
+ \tt
+ \def\par{\leavevmode\egroup\box0\endgraf}%
+ \catcode`\`=\active
+ \tabexpand
+ % Respect line breaks,
+ % print special symbols as themselves, and
+ % make each space count
+ % must do in this order:
+ \obeylines \uncatcodespecials \sepspaces
+ \everypar{\starttabbox}%
+}
+
+% Do the @verb magic: verbatim text is quoted by unique
+% delimiter characters. Before first delimiter expect a
+% right brace, after last delimiter expect closing brace:
+%
+% \def\doverb'{'<char>#1<char>'}'{#1}
+%
+% [Knuth] p. 382; only eat outer {}
+\begingroup
+ \catcode`[=1\catcode`]=2\catcode`\{=12\catcode`\}=12
+ \gdef\doverb{#1[\def\next##1#1}[##1\endgroup]\next]
+\endgroup
+%
+\def\verb{\begingroup\setupverb\doverb}
+%
+%
+% Do the @verbatim magic: define the macro \doverbatim so that
+% the (first) argument ends when '@end verbatim' is reached, ie:
+%
+% \def\doverbatim#1@end verbatim{#1}
+%
+% For Texinfo it's a lot easier than for LaTeX,
+% because texinfo's \verbatim doesn't stop at '\end{verbatim}':
+% we need not redefine '\', '{' and '}'.
+%
+% Inspired by LaTeX's verbatim command set [latex.ltx]
+%% Include LaTeX hack for completeness -- never know
+%% \begingroup
+%% \catcode`|=0 \catcode`[=1
+%% \catcode`]=2\catcode`\{=12\catcode`\}=12\catcode`\ =\active
+%% \catcode`\\=12|gdef|doverbatim#1@end verbatim[
+%% #1|endgroup|def|Everbatim[]|end[verbatim]]
+%% |endgroup
+%
+\begingroup
+ \catcode`\ =\active
+ \obeylines %
+ % ignore everything up to the first ^^M, that's the newline at the end
+ % of the @verbatim input line itself. Otherwise we get an extra blank
+ % line in the output.
+ \gdef\doverbatim#1^^M#2@end verbatim{#2\end{verbatim}}%
+\endgroup
+%
+\def\verbatim{%
+ \def\Everbatim{\nonfillfinish\endgroup}%
+ \begingroup
+ \nonfillstart
+ \advance\leftskip by -\defbodyindent
+ \begingroup\setupverbatim\doverbatim
+}
+
+% @verbatiminclude FILE - insert text of file in verbatim environment.
+%
+% Allow normal characters that we make active in the argument (a file name).
+\def\verbatiminclude{%
+ \begingroup
+ \catcode`\\=\other
+ \catcode`~=\other
+ \catcode`^=\other
+ \catcode`_=\other
+ \catcode`|=\other
+ \catcode`<=\other
+ \catcode`>=\other
+ \catcode`+=\other
+ \parsearg\doverbatiminclude
+}
+\def\setupverbatiminclude{%
+ \begingroup
+ \nonfillstart
+ \advance\leftskip by -\defbodyindent
+ \begingroup\setupverbatim
+}
+%
+\def\doverbatiminclude#1{%
+ % Restore active chars for included file.
+ \endgroup
+ \begingroup
+ \let\value=\expandablevalue
+ \def\thisfile{#1}%
+ \expandafter\expandafter\setupverbatiminclude\input\thisfile
+ \endgroup
+ \nonfillfinish
+ \endgroup
+}
+
+% @copying ... @end copying.
+% Save the text away for @insertcopying later. Many commands won't be
+% allowed in this context, but that's ok.
+%
+% We save the uninterpreted tokens, rather than creating a box.
+% Saving the text in a box would be much easier, but then all the
+% typesetting commands (@smallbook, font changes, etc.) have to be done
+% beforehand -- and a) we want @copying to be done first in the source
+% file; b) letting users define the frontmatter in as flexible order as
+% possible is very desirable.
+%
+\def\copying{\begingroup
+ % Define a command to swallow text until we reach `@end copying'.
+ % \ is the escape char in this texinfo.tex file, so it is the
+ % delimiter for the command; @ will be the escape char when we read
+ % it, but that doesn't matter.
+ \long\def\docopying##1\end copying{\gdef\copyingtext{##1}\enddocopying}%
+ %
+ % We must preserve ^^M's in the input file; see \insertcopying below.
+ \catcode`\^^M = \active
+ \docopying
+}
+
+% What we do to finish off the copying text.
+%
+\def\enddocopying{\endgroup\ignorespaces}
+
+% @insertcopying. Here we must play games with ^^M's. On the one hand,
+% we need them to delimit commands such as `@end quotation', so they
+% must be active. On the other hand, we certainly don't want every
+% end-of-line to be a \par, as would happen with the normal active
+% definition of ^^M. On the third hand, two ^^M's in a row should still
+% generate a \par.
+%
+% Our approach is to make ^^M insert a space and a penalty1 normally;
+% then it can also check if \lastpenalty=1. If it does, then manually
+% do \par.
+%
+% This messes up the normal definitions of @c[omment], so we redefine
+% it. Similarly for @ignore. (These commands are used in the gcc
+% manual for man page generation.)
+%
+% Seems pretty fragile, most line-oriented commands will presumably
+% fail, but for the limited use of getting the copying text (which
+% should be quite simple) inserted, we can hope it's ok.
+%
+{\catcode`\^^M=\active %
+\gdef\insertcopying{\begingroup %
+ \parindent = 0pt % looks wrong on title page
+ \def^^M{%
+ \ifnum \lastpenalty=1 %
+ \par %
+ \else %
+ \space \penalty 1 %
+ \fi %
+ }%
+ %
+ % Fix @c[omment] for catcode 13 ^^M's.
+ \def\c##1^^M{\ignorespaces}%
+ \let\comment = \c %
+ %
+ % Don't bother jumping through all the hoops that \doignore does, it
+ % would be very hard since the catcodes are already set.
+ \long\def\ignore##1\end ignore{\ignorespaces}%
+ %
+ \copyingtext %
+\endgroup}%
+}
+
+\message{defuns,}
+% @defun etc.
+
+% Allow user to change definition object font (\df) internally
+\def\setdeffont#1 {\csname DEF#1\endcsname}
+
+\newskip\defbodyindent \defbodyindent=.4in
+\newskip\defargsindent \defargsindent=50pt
+\newskip\deflastargmargin \deflastargmargin=18pt
+
+\newcount\parencount
+
+% We want ()&[] to print specially on the defun line.
+%
+\def\activeparens{%
+ \catcode`\(=\active \catcode`\)=\active
+ \catcode`\&=\active
+ \catcode`\[=\active \catcode`\]=\active
+}
+
+% Make control sequences which act like normal parenthesis chars.
+\let\lparen = ( \let\rparen = )
+
+{\activeparens % Now, smart parens don't turn on until &foo (see \amprm)
+
+% Be sure that we always have a definition for `(', etc. For example,
+% if the fn name has parens in it, \boldbrax will not be in effect yet,
+% so TeX would otherwise complain about undefined control sequence.
+\global\let(=\lparen \global\let)=\rparen
+\global\let[=\lbrack \global\let]=\rbrack
+
+\gdef\functionparens{\boldbrax\let&=\amprm\parencount=0 }
+\gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb}
+% This is used to turn on special parens
+% but make & act ordinary (given that it's active).
+\gdef\boldbraxnoamp{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb\let&=\ampnr}
+
+% Definitions of (, ) and & used in args for functions.
+% This is the definition of ( outside of all parentheses.
+\gdef\oprm#1 {{\rm\char`\(}#1 \bf \let(=\opnested
+ \global\advance\parencount by 1
+}
+%
+% This is the definition of ( when already inside a level of parens.
+\gdef\opnested{\char`\(\global\advance\parencount by 1 }
+%
+\gdef\clrm{% Print a paren in roman if it is taking us back to depth of 0.
+ % also in that case restore the outer-level definition of (.
+ \ifnum \parencount=1 {\rm \char `\)}\sl \let(=\oprm \else \char `\) \fi
+ \global\advance \parencount by -1 }
+% If we encounter &foo, then turn on ()-hacking afterwards
+\gdef\amprm#1 {{\rm\&#1}\let(=\oprm \let)=\clrm\ }
+%
+\gdef\normalparens{\boldbrax\let&=\ampnr}
+} % End of definition inside \activeparens
+%% These parens (in \boldbrax) actually are a little bolder than the
+%% contained text. This is especially needed for [ and ]
+\def\opnr{{\sf\char`\(}\global\advance\parencount by 1 }
+\def\clnr{{\sf\char`\)}\global\advance\parencount by -1 }
+\let\ampnr = \&
+\def\lbrb{{\bf\char`\[}}
+\def\rbrb{{\bf\char`\]}}
+
+% Active &'s sneak into the index arguments, so make sure it's defined.
+{
+ \catcode`& = \active
+ \global\let& = \ampnr
+}
+
+% \defname, which formats the name of the @def (not the args).
+% #1 is the function name.
+% #2 is the type of definition, such as "Function".
+%
+\def\defname#1#2{%
+ % How we'll output the type name. Putting it in brackets helps
+ % distinguish it from the body text that may end up on the next line
+ % just below it.
+ \ifempty{#2}%
+ \def\defnametype{}%
+ \else
+ \def\defnametype{[\rm #2]}%
+ \fi
+ %
+ % Get the values of \leftskip and \rightskip as they were outside the @def...
+ \dimen2=\leftskip
+ \advance\dimen2 by -\defbodyindent
+ %
+ % Figure out values for the paragraph shape.
+ \setbox0=\hbox{\hskip \deflastargmargin{\defnametype}}%
+ \dimen0=\hsize \advance \dimen0 by -\wd0 % compute size for first line
+ \dimen1=\hsize \advance \dimen1 by -\defargsindent % size for continuations
+ \parshape 2 0in \dimen0 \defargsindent \dimen1
+ %
+ % Output arg 2 ("Function" or some such) but stuck inside a box of
+ % width 0 so it does not interfere with linebreaking.
+ \noindent
+ %
+ {% Adjust \hsize to exclude the ambient margins,
+ % so that \rightline will obey them.
+ \advance \hsize by -\dimen2
+ \dimen3 = 0pt % was -1.25pc
+ \rlap{\rightline{\defnametype\kern\dimen3}}%
+ }%
+ %
+ % Allow all lines to be underfull without complaint:
+ \tolerance=10000 \hbadness=10000
+ \advance\leftskip by -\defbodyindent
+ \exdentamount=\defbodyindent
+ {\df #1}\enskip % output function name
+ % \defunargs will be called next to output the arguments, if any.
+}
+
+% Common pieces to start any @def...
+% #1 is the \E... control sequence to end the definition (which we define).
+% #2 is the \...x control sequence (which our caller defines).
+% #3 is the control sequence to process the header, such as \defunheader.
+%
+\def\parsebodycommon#1#2#3{%
+ \begingroup\inENV
+ % If there are two @def commands in a row, we'll have a \nobreak,
+ % which is there to keep the function description together with its
+ % header. But if there's nothing but headers, we want to allow a
+ % break after all. Check for penalty 10002 (inserted by
+ % \defargscommonending) instead of 10000, since the sectioning
+ % commands insert a \penalty10000, and we don't want to allow a break
+ % between a section heading and a defun.
+ \ifnum\lastpenalty=10002 \penalty0 \fi
+ \medbreak
+ %
+ % Define the \E... end token that this defining construct specifies
+ % so that it will exit this group.
+ \def#1{\endgraf\endgroup\medbreak}%
+ %
+ \parindent=0in
+ \advance\leftskip by \defbodyindent
+ \exdentamount=\defbodyindent
+}
+
+% Common part of the \...x definitions.
+%
+\def\defxbodycommon{%
+ % As with \parsebodycommon above, allow line break if we have multiple
+ % x headers in a row. It's not a great place, though.
+ \ifnum\lastpenalty=10000 \penalty1000 \fi
+ %
+ \begingroup\obeylines
+}
+
+% Process body of @defun, @deffn, @defmac, etc.
+%
+\def\defparsebody#1#2#3{%
+ \parsebodycommon{#1}{#2}{#3}%
+ \def#2{\defxbodycommon \activeparens \spacesplit#3}%
+ \catcode\equalChar=\active
+ \begingroup\obeylines\activeparens
+ \spacesplit#3%
+}
+
+% #1, #2, #3 are the common arguments (see \parsebodycommon above).
+% #4, delimited by the space, is the class name.
+%
+\def\defmethparsebody#1#2#3#4 {%
+ \parsebodycommon{#1}{#2}{#3}%
+ \def#2##1 {\defxbodycommon \activeparens \spacesplit{#3{##1}}}%
+ \begingroup\obeylines\activeparens
+ % The \empty here prevents misinterpretation of a construct such as
+ % @deffn {whatever} {Enharmonic comma}
+ % See comments at \deftpparsebody, although in our case we don't have
+ % to remove the \empty afterwards, since it is empty.
+ \spacesplit{#3{#4}}\empty
+}
+
+% Used for @deftypemethod and @deftypeivar.
+% #1, #2, #3 are the common arguments (see \defparsebody).
+% #4, delimited by a space, is the class name.
+% #5 is the method's return type.
+%
+\def\deftypemethparsebody#1#2#3#4 #5 {%
+ \parsebodycommon{#1}{#2}{#3}%
+ \def#2##1 ##2 {\defxbodycommon \activeparens \spacesplit{#3{##1}{##2}}}%
+ \begingroup\obeylines\activeparens
+ \spacesplit{#3{#4}{#5}}%
+}
+
+% Used for @deftypeop. The change from \deftypemethparsebody is an
+% extra argument at the beginning which is the `category', instead of it
+% being the hardwired string `Method' or `Instance Variable'. We have
+% to account for this both in the \...x definition and in parsing the
+% input at hand. Thus also need a control sequence (passed as #5) for
+% the \E... definition to assign the category name to.
+%
+\def\deftypeopparsebody#1#2#3#4#5 #6 {%
+ \parsebodycommon{#1}{#2}{#3}%
+ \def#2##1 ##2 ##3 {\def#4{##1}%
+ \defxbodycommon \activeparens \spacesplit{#3{##2}{##3}}}%
+ \begingroup\obeylines\activeparens
+ \spacesplit{#3{#5}{#6}}%
+}
+
+% For @defop.
+\def\defopparsebody #1#2#3#4#5 {%
+ \parsebodycommon{#1}{#2}{#3}%
+ \def#2##1 ##2 {\def#4{##1}%
+ \defxbodycommon \activeparens \spacesplit{#3{##2}}}%
+ \begingroup\obeylines\activeparens
+ \spacesplit{#3{#5}}%
+}
+
+% These parsing functions are similar to the preceding ones
+% except that they do not make parens into active characters.
+% These are used for "variables" since they have no arguments.
+%
+\def\defvarparsebody #1#2#3{%
+ \parsebodycommon{#1}{#2}{#3}%
+ \def#2{\defxbodycommon \spacesplit#3}%
+ \catcode\equalChar=\active
+ \begingroup\obeylines
+ \spacesplit#3%
+}
+
+% @defopvar.
+\def\defopvarparsebody #1#2#3#4#5 {%
+ \parsebodycommon{#1}{#2}{#3}%
+ \def#2##1 ##2 {\def#4{##1}%
+ \defxbodycommon \spacesplit{#3{##2}}}%
+ \begingroup\obeylines
+ \spacesplit{#3{#5}}%
+}
+
+\def\defvrparsebody#1#2#3#4 {%
+ \parsebodycommon{#1}{#2}{#3}%
+ \def#2##1 {\defxbodycommon \spacesplit{#3{##1}}}%
+ \begingroup\obeylines
+ \spacesplit{#3{#4}}%
+}
+
+% This loses on `@deftp {Data Type} {struct termios}' -- it thinks the
+% type is just `struct', because we lose the braces in `{struct
+% termios}' when \spacesplit reads its undelimited argument. Sigh.
+% \let\deftpparsebody=\defvrparsebody
+%
+% So, to get around this, we put \empty in with the type name. That
+% way, TeX won't find exactly `{...}' as an undelimited argument, and
+% won't strip off the braces.
+%
+\def\deftpparsebody #1#2#3#4 {%
+ \parsebodycommon{#1}{#2}{#3}%
+ \def#2##1 {\defxbodycommon \spacesplit{#3{##1}}}%
+ \begingroup\obeylines
+ \spacesplit{\parsetpheaderline{#3{#4}}}\empty
+}
+
+% Fine, but then we have to eventually remove the \empty *and* the
+% braces (if any). That's what this does.
+%
+\def\removeemptybraces\empty#1\relax{#1}
+
+% After \spacesplit has done its work, this is called -- #1 is the final
+% thing to call, #2 the type name (which starts with \empty), and #3
+% (which might be empty) the arguments.
+%
+\def\parsetpheaderline#1#2#3{%
+ #1{\removeemptybraces#2\relax}{#3}%
+}%
+
+% Split up #2 (the rest of the input line) at the first space token.
+% call #1 with two arguments:
+% the first is all of #2 before the space token,
+% the second is all of #2 after that space token.
+% If #2 contains no space token, all of it is passed as the first arg
+% and the second is passed as empty.
+%
+{\obeylines %
+ \gdef\spacesplit#1#2^^M{\endgroup\spacesplitx{#1}#2 \relax\spacesplitx}%
+ \long\gdef\spacesplitx#1#2 #3#4\spacesplitx{%
+ \ifx\relax #3%
+ #1{#2}{}%
+ \else %
+ #1{#2}{#3#4}%
+ \fi}%
+}
+
+% Define @defun.
+
+% This is called to end the arguments processing for all the @def... commands.
+%
+\def\defargscommonending{%
+ \interlinepenalty = 10000
+ \advance\rightskip by 0pt plus 1fil
+ \endgraf
+ \nobreak\vskip -\parskip
+ \penalty 10002 % signal to \parsebodycommon.
+}
+
+% This expands the args and terminates the paragraph they comprise.
+%
+\def\defunargs#1{\functionparens \sl
+% Expand, preventing hyphenation at `-' chars.
+% Note that groups don't affect changes in \hyphenchar.
+% Set the font temporarily and use \font in case \setfont made \tensl a macro.
+{\tensl\hyphenchar\font=0}%
+#1%
+{\tensl\hyphenchar\font=45}%
+\ifnum\parencount=0 \else \errmessage{Unbalanced parentheses in @def}\fi%
+ \defargscommonending
+}
+
+\def\deftypefunargs #1{%
+% Expand, preventing hyphenation at `-' chars.
+% Note that groups don't affect changes in \hyphenchar.
+% Use \boldbraxnoamp, not \functionparens, so that & is not special.
+\boldbraxnoamp
+\tclose{#1}% avoid \code because of side effects on active chars
+ \defargscommonending
+}
+
+% Do complete processing of one @defun or @defunx line already parsed.
+
+% @deffn Command forward-char nchars
+
+\def\deffn{\defmethparsebody\Edeffn\deffnx\deffnheader}
+
+\def\deffnheader #1#2#3{\doind {fn}{\code{#2}}%
+\begingroup\defname {#2}{#1}\defunargs{#3}\endgroup %
+\catcode\equalChar=\other % Turn off change made in \defparsebody
+}
+
+% @defun == @deffn Function
+
+\def\defun{\defparsebody\Edefun\defunx\defunheader}
+
+\def\defunheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index
+\begingroup\defname {#1}{\putwordDeffunc}%
+\defunargs {#2}\endgroup %
+\catcode\equalChar=\other % Turn off change made in \defparsebody
+}
+
+% @deftypefun int foobar (int @var{foo}, float @var{bar})
+
+\def\deftypefun{\defparsebody\Edeftypefun\deftypefunx\deftypefunheader}
+
+% #1 is the data type. #2 is the name and args.
+\def\deftypefunheader #1#2{\deftypefunheaderx{#1}#2 \relax}
+% #1 is the data type, #2 the name, #3 the args.
+\def\deftypefunheaderx #1#2 #3\relax{%
+\doind {fn}{\code{#2}}% Make entry in function index
+\begingroup\defname {\defheaderxcond#1\relax$.$#2}{\putwordDeftypefun}%
+\deftypefunargs {#3}\endgroup %
+\catcode\equalChar=\other % Turn off change made in \defparsebody
+}
+
+% @deftypefn {Library Function} int foobar (int @var{foo}, float @var{bar})
+
+\def\deftypefn{\defmethparsebody\Edeftypefn\deftypefnx\deftypefnheader}
+
+% \defheaderxcond#1\relax$.$
+% puts #1 in @code, followed by a space, but does nothing if #1 is null.
+\def\defheaderxcond#1#2$.${\ifx#1\relax\else\code{#1#2} \fi}
+
+% #1 is the classification. #2 is the data type. #3 is the name and args.
+\def\deftypefnheader #1#2#3{\deftypefnheaderx{#1}{#2}#3 \relax}
+% #1 is the classification, #2 the data type, #3 the name, #4 the args.
+\def\deftypefnheaderx #1#2#3 #4\relax{%
+\doind {fn}{\code{#3}}% Make entry in function index
+\begingroup
+\normalparens % notably, turn off `&' magic, which prevents
+% at least some C++ text from working
+\defname {\defheaderxcond#2\relax$.$#3}{#1}%
+\deftypefunargs {#4}\endgroup %
+\catcode\equalChar=\other % Turn off change made in \defparsebody
+}
+
+% @defmac == @deffn Macro
+
+\def\defmac{\defparsebody\Edefmac\defmacx\defmacheader}
+
+\def\defmacheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index
+\begingroup\defname {#1}{\putwordDefmac}%
+\defunargs {#2}\endgroup %
+\catcode\equalChar=\other % Turn off change made in \defparsebody
+}
+
+% @defspec == @deffn Special Form
+
+\def\defspec{\defparsebody\Edefspec\defspecx\defspecheader}
+
+\def\defspecheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index
+\begingroup\defname {#1}{\putwordDefspec}%
+\defunargs {#2}\endgroup %
+\catcode\equalChar=\other % Turn off change made in \defparsebody
+}
+
+% @defop CATEGORY CLASS OPERATION ARG...
+%
+\def\defop #1 {\def\defoptype{#1}%
+\defopparsebody\Edefop\defopx\defopheader\defoptype}
+%
+\def\defopheader#1#2#3{%
+ \dosubind{fn}{\code{#2}}{\putwordon\ \code{#1}}% function index entry
+ \begingroup
+ \defname{#2}{\defoptype\ \putwordon\ #1}%
+ \defunargs{#3}%
+ \endgroup
+}
+
+% @deftypeop CATEGORY CLASS TYPE OPERATION ARG...
+%
+\def\deftypeop #1 {\def\deftypeopcategory{#1}%
+ \deftypeopparsebody\Edeftypeop\deftypeopx\deftypeopheader
+ \deftypeopcategory}
+%
+% #1 is the class name, #2 the data type, #3 the operation name, #4 the args.
+\def\deftypeopheader#1#2#3#4{%
+ \dosubind{fn}{\code{#3}}{\putwordon\ \code{#1}}% entry in function index
+ \begingroup
+ \defname{\defheaderxcond#2\relax$.$#3}
+ {\deftypeopcategory\ \putwordon\ \code{#1}}%
+ \deftypefunargs{#4}%
+ \endgroup
+}
+
+% @deftypemethod CLASS TYPE METHOD ARG...
+%
+\def\deftypemethod{%
+ \deftypemethparsebody\Edeftypemethod\deftypemethodx\deftypemethodheader}
+%
+% #1 is the class name, #2 the data type, #3 the method name, #4 the args.
+\def\deftypemethodheader#1#2#3#4{%
+ \dosubind{fn}{\code{#3}}{\putwordon\ \code{#1}}% entry in function index
+ \begingroup
+ \defname{\defheaderxcond#2\relax$.$#3}{\putwordMethodon\ \code{#1}}%
+ \deftypefunargs{#4}%
+ \endgroup
+}
+
+% @deftypeivar CLASS TYPE VARNAME
+%
+\def\deftypeivar{%
+ \deftypemethparsebody\Edeftypeivar\deftypeivarx\deftypeivarheader}
+%
+% #1 is the class name, #2 the data type, #3 the variable name.
+\def\deftypeivarheader#1#2#3{%
+ \dosubind{vr}{\code{#3}}{\putwordof\ \code{#1}}% entry in variable index
+ \begingroup
+ \defname{\defheaderxcond#2\relax$.$#3}
+ {\putwordInstanceVariableof\ \code{#1}}%
+ \defvarargs{#3}%
+ \endgroup
+}
+
+% @defmethod == @defop Method
+%
+\def\defmethod{\defmethparsebody\Edefmethod\defmethodx\defmethodheader}
+%
+% #1 is the class name, #2 the method name, #3 the args.
+\def\defmethodheader#1#2#3{%
+ \dosubind{fn}{\code{#2}}{\putwordon\ \code{#1}}% entry in function index
+ \begingroup
+ \defname{#2}{\putwordMethodon\ \code{#1}}%
+ \defunargs{#3}%
+ \endgroup
+}
+
+% @defcv {Class Option} foo-class foo-flag
+
+\def\defcv #1 {\def\defcvtype{#1}%
+\defopvarparsebody\Edefcv\defcvx\defcvarheader\defcvtype}
+
+\def\defcvarheader #1#2#3{%
+ \dosubind{vr}{\code{#2}}{\putwordof\ \code{#1}}% variable index entry
+ \begingroup
+ \defname{#2}{\defcvtype\ \putwordof\ #1}%
+ \defvarargs{#3}%
+ \endgroup
+}
+
+% @defivar CLASS VARNAME == @defcv {Instance Variable} CLASS VARNAME
+%
+\def\defivar{\defvrparsebody\Edefivar\defivarx\defivarheader}
+%
+\def\defivarheader#1#2#3{%
+ \dosubind{vr}{\code{#2}}{\putwordof\ \code{#1}}% entry in var index
+ \begingroup
+ \defname{#2}{\putwordInstanceVariableof\ #1}%
+ \defvarargs{#3}%
+ \endgroup
+}
+
+% @defvar
+% First, define the processing that is wanted for arguments of @defvar.
+% This is actually simple: just print them in roman.
+% This must expand the args and terminate the paragraph they make up
+\def\defvarargs #1{\normalparens #1%
+ \defargscommonending
+}
+
+% @defvr Counter foo-count
+
+\def\defvr{\defvrparsebody\Edefvr\defvrx\defvrheader}
+
+\def\defvrheader #1#2#3{\doind {vr}{\code{#2}}%
+\begingroup\defname {#2}{#1}\defvarargs{#3}\endgroup}
+
+% @defvar == @defvr Variable
+
+\def\defvar{\defvarparsebody\Edefvar\defvarx\defvarheader}
+
+\def\defvarheader #1#2{\doind {vr}{\code{#1}}% Make entry in var index
+\begingroup\defname {#1}{\putwordDefvar}%
+\defvarargs {#2}\endgroup %
+}
+
+% @defopt == @defvr {User Option}
+
+\def\defopt{\defvarparsebody\Edefopt\defoptx\defoptheader}
+
+\def\defoptheader #1#2{\doind {vr}{\code{#1}}% Make entry in var index
+\begingroup\defname {#1}{\putwordDefopt}%
+\defvarargs {#2}\endgroup %
+}
+
+% @deftypevar int foobar
+
+\def\deftypevar{\defvarparsebody\Edeftypevar\deftypevarx\deftypevarheader}
+
+% #1 is the data type. #2 is the name, perhaps followed by text that
+% is actually part of the data type, which should not be put into the index.
+\def\deftypevarheader #1#2{%
+\dovarind#2 \relax% Make entry in variables index
+\begingroup\defname {\defheaderxcond#1\relax$.$#2}{\putwordDeftypevar}%
+ \defargscommonending
+\endgroup}
+\def\dovarind#1 #2\relax{\doind{vr}{\code{#1}}}
+
+% @deftypevr {Global Flag} int enable
+
+\def\deftypevr{\defvrparsebody\Edeftypevr\deftypevrx\deftypevrheader}
+
+\def\deftypevrheader #1#2#3{\dovarind#3 \relax%
+\begingroup\defname {\defheaderxcond#2\relax$.$#3}{#1}
+ \defargscommonending
+\endgroup}
+
+% Now define @deftp
+% Args are printed in bold, a slight difference from @defvar.
+
+\def\deftpargs #1{\bf \defvarargs{#1}}
+
+% @deftp Class window height width ...
+
+\def\deftp{\deftpparsebody\Edeftp\deftpx\deftpheader}
+
+\def\deftpheader #1#2#3{\doind {tp}{\code{#2}}%
+\begingroup\defname {#2}{#1}\deftpargs{#3}\endgroup}
+
+% These definitions are used if you use @defunx (etc.)
+% anywhere other than immediately after a @defun or @defunx.
+%
+\def\defcvx#1 {\errmessage{@defcvx in invalid context}}
+\def\deffnx#1 {\errmessage{@deffnx in invalid context}}
+\def\defivarx#1 {\errmessage{@defivarx in invalid context}}
+\def\defmacx#1 {\errmessage{@defmacx in invalid context}}
+\def\defmethodx#1 {\errmessage{@defmethodx in invalid context}}
+\def\defoptx #1 {\errmessage{@defoptx in invalid context}}
+\def\defopx#1 {\errmessage{@defopx in invalid context}}
+\def\defspecx#1 {\errmessage{@defspecx in invalid context}}
+\def\deftpx#1 {\errmessage{@deftpx in invalid context}}
+\def\deftypefnx#1 {\errmessage{@deftypefnx in invalid context}}
+\def\deftypefunx#1 {\errmessage{@deftypefunx in invalid context}}
+\def\deftypeivarx#1 {\errmessage{@deftypeivarx in invalid context}}
+\def\deftypemethodx#1 {\errmessage{@deftypemethodx in invalid context}}
+\def\deftypeopx#1 {\errmessage{@deftypeopx in invalid context}}
+\def\deftypevarx#1 {\errmessage{@deftypevarx in invalid context}}
+\def\deftypevrx#1 {\errmessage{@deftypevrx in invalid context}}
+\def\defunx#1 {\errmessage{@defunx in invalid context}}
+\def\defvarx#1 {\errmessage{@defvarx in invalid context}}
+\def\defvrx#1 {\errmessage{@defvrx in invalid context}}
+
+
+\message{macros,}
+% @macro.
+
+% To do this right we need a feature of e-TeX, \scantokens,
+% which we arrange to emulate with a temporary file in ordinary TeX.
+\ifx\eTeXversion\undefined
+ \newwrite\macscribble
+ \def\scanmacro#1{%
+ \begingroup \newlinechar`\^^M
+ % Undo catcode changes of \startcontents and \doprintindex
+ \catcode`\@=0 \catcode`\\=\other \escapechar=`\@
+ % Append \endinput to make sure that TeX does not see the ending newline.
+ \toks0={#1\endinput}%
+ \immediate\openout\macscribble=\jobname.tmp
+ \immediate\write\macscribble{\the\toks0}%
+ \immediate\closeout\macscribble
+ \let\xeatspaces\eatspaces
+ \input \jobname.tmp
+ \endgroup
+}
+\else
+\def\scanmacro#1{%
+\begingroup \newlinechar`\^^M
+% Undo catcode changes of \startcontents and \doprintindex
+\catcode`\@=0 \catcode`\\=\other \escapechar=`\@
+\let\xeatspaces\eatspaces\scantokens{#1\endinput}\endgroup}
+\fi
+
+\newcount\paramno % Count of parameters
+\newtoks\macname % Macro name
+\newif\ifrecursive % Is it recursive?
+\def\macrolist{} % List of all defined macros in the form
+ % \do\macro1\do\macro2...
+
+% Utility routines.
+% Thisdoes \let #1 = #2, except with \csnames.
+\def\cslet#1#2{%
+\expandafter\expandafter
+\expandafter\let
+\expandafter\expandafter
+\csname#1\endcsname
+\csname#2\endcsname}
+
+% Trim leading and trailing spaces off a string.
+% Concepts from aro-bend problem 15 (see CTAN).
+{\catcode`\@=11
+\gdef\eatspaces #1{\expandafter\trim@\expandafter{#1 }}
+\gdef\trim@ #1{\trim@@ @#1 @ #1 @ @@}
+\gdef\trim@@ #1@ #2@ #3@@{\trim@@@\empty #2 @}
+\def\unbrace#1{#1}
+\unbrace{\gdef\trim@@@ #1 } #2@{#1}
+}
+
+% Trim a single trailing ^^M off a string.
+{\catcode`\^^M=\other \catcode`\Q=3%
+\gdef\eatcr #1{\eatcra #1Q^^MQ}%
+\gdef\eatcra#1^^MQ{\eatcrb#1Q}%
+\gdef\eatcrb#1Q#2Q{#1}%
+}
+
+% Macro bodies are absorbed as an argument in a context where
+% all characters are catcode 10, 11 or 12, except \ which is active
+% (as in normal texinfo). It is necessary to change the definition of \.
+
+% It's necessary to have hard CRs when the macro is executed. This is
+% done by making ^^M (\endlinechar) catcode 12 when reading the macro
+% body, and then making it the \newlinechar in \scanmacro.
+
+\def\macrobodyctxt{%
+ \catcode`\~=\other
+ \catcode`\^=\other
+ \catcode`\_=\other
+ \catcode`\|=\other
+ \catcode`\<=\other
+ \catcode`\>=\other
+ \catcode`\+=\other
+ \catcode`\{=\other
+ \catcode`\}=\other
+ \catcode`\@=\other
+ \catcode`\^^M=\other
+ \usembodybackslash}
+
+\def\macroargctxt{%
+ \catcode`\~=\other
+ \catcode`\^=\other
+ \catcode`\_=\other
+ \catcode`\|=\other
+ \catcode`\<=\other
+ \catcode`\>=\other
+ \catcode`\+=\other
+ \catcode`\@=\other
+ \catcode`\\=\other}
+
+% \mbodybackslash is the definition of \ in @macro bodies.
+% It maps \foo\ => \csname macarg.foo\endcsname => #N
+% where N is the macro parameter number.
+% We define \csname macarg.\endcsname to be \realbackslash, so
+% \\ in macro replacement text gets you a backslash.
+
+{\catcode`@=0 @catcode`@\=@active
+ @gdef@usembodybackslash{@let\=@mbodybackslash}
+ @gdef@mbodybackslash#1\{@csname macarg.#1@endcsname}
+}
+\expandafter\def\csname macarg.\endcsname{\realbackslash}
+
+\def\macro{\recursivefalse\parsearg\macroxxx}
+\def\rmacro{\recursivetrue\parsearg\macroxxx}
+
+\def\macroxxx#1{%
+ \getargs{#1}% now \macname is the macname and \argl the arglist
+ \ifx\argl\empty % no arguments
+ \paramno=0%
+ \else
+ \expandafter\parsemargdef \argl;%
+ \fi
+ \if1\csname ismacro.\the\macname\endcsname
+ \message{Warning: redefining \the\macname}%
+ \else
+ \expandafter\ifx\csname \the\macname\endcsname \relax
+ \else \errmessage{Macro name \the\macname\space already defined}\fi
+ \global\cslet{macsave.\the\macname}{\the\macname}%
+ \global\expandafter\let\csname ismacro.\the\macname\endcsname=1%
+ % Add the macroname to \macrolist
+ \toks0 = \expandafter{\macrolist\do}%
+ \xdef\macrolist{\the\toks0
+ \expandafter\noexpand\csname\the\macname\endcsname}%
+ \fi
+ \begingroup \macrobodyctxt
+ \ifrecursive \expandafter\parsermacbody
+ \else \expandafter\parsemacbody
+ \fi}
+
+\def\unmacro{\parsearg\dounmacro}
+\def\dounmacro#1{%
+ \if1\csname ismacro.#1\endcsname
+ \global\cslet{#1}{macsave.#1}%
+ \global\expandafter\let \csname ismacro.#1\endcsname=0%
+ % Remove the macro name from \macrolist:
+ \begingroup
+ \expandafter\let\csname#1\endcsname \relax
+ \let\do\unmacrodo
+ \xdef\macrolist{\macrolist}%
+ \endgroup
+ \else
+ \errmessage{Macro #1 not defined}%
+ \fi
+}
+
+% Called by \do from \dounmacro on each macro. The idea is to omit any
+% macro definitions that have been changed to \relax.
+%
+\def\unmacrodo#1{%
+ \ifx#1\relax
+ % remove this
+ \else
+ \noexpand\do \noexpand #1%
+ \fi
+}
+
+% This makes use of the obscure feature that if the last token of a
+% <parameter list> is #, then the preceding argument is delimited by
+% an opening brace, and that opening brace is not consumed.
+\def\getargs#1{\getargsxxx#1{}}
+\def\getargsxxx#1#{\getmacname #1 \relax\getmacargs}
+\def\getmacname #1 #2\relax{\macname={#1}}
+\def\getmacargs#1{\def\argl{#1}}
+
+% Parse the optional {params} list. Set up \paramno and \paramlist
+% so \defmacro knows what to do. Define \macarg.blah for each blah
+% in the params list, to be ##N where N is the position in that list.
+% That gets used by \mbodybackslash (above).
+
+% We need to get `macro parameter char #' into several definitions.
+% The technique used is stolen from LaTeX: let \hash be something
+% unexpandable, insert that wherever you need a #, and then redefine
+% it to # just before using the token list produced.
+%
+% The same technique is used to protect \eatspaces till just before
+% the macro is used.
+
+\def\parsemargdef#1;{\paramno=0\def\paramlist{}%
+ \let\hash\relax\let\xeatspaces\relax\parsemargdefxxx#1,;,}
+\def\parsemargdefxxx#1,{%
+ \if#1;\let\next=\relax
+ \else \let\next=\parsemargdefxxx
+ \advance\paramno by 1%
+ \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname
+ {\xeatspaces{\hash\the\paramno}}%
+ \edef\paramlist{\paramlist\hash\the\paramno,}%
+ \fi\next}
+
+% These two commands read recursive and nonrecursive macro bodies.
+% (They're different since rec and nonrec macros end differently.)
+
+\long\def\parsemacbody#1@end macro%
+{\xdef\temp{\eatcr{#1}}\endgroup\defmacro}%
+\long\def\parsermacbody#1@end rmacro%
+{\xdef\temp{\eatcr{#1}}\endgroup\defmacro}%
+
+% This defines the macro itself. There are six cases: recursive and
+% nonrecursive macros of zero, one, and many arguments.
+% Much magic with \expandafter here.
+% \xdef is used so that macro definitions will survive the file
+% they're defined in; @include reads the file inside a group.
+\def\defmacro{%
+ \let\hash=##% convert placeholders to macro parameter chars
+ \ifrecursive
+ \ifcase\paramno
+ % 0
+ \expandafter\xdef\csname\the\macname\endcsname{%
+ \noexpand\scanmacro{\temp}}%
+ \or % 1
+ \expandafter\xdef\csname\the\macname\endcsname{%
+ \bgroup\noexpand\macroargctxt
+ \noexpand\braceorline
+ \expandafter\noexpand\csname\the\macname xxx\endcsname}%
+ \expandafter\xdef\csname\the\macname xxx\endcsname##1{%
+ \egroup\noexpand\scanmacro{\temp}}%
+ \else % many
+ \expandafter\xdef\csname\the\macname\endcsname{%
+ \bgroup\noexpand\macroargctxt
+ \noexpand\csname\the\macname xx\endcsname}%
+ \expandafter\xdef\csname\the\macname xx\endcsname##1{%
+ \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
+ \expandafter\expandafter
+ \expandafter\xdef
+ \expandafter\expandafter
+ \csname\the\macname xxx\endcsname
+ \paramlist{\egroup\noexpand\scanmacro{\temp}}%
+ \fi
+ \else
+ \ifcase\paramno
+ % 0
+ \expandafter\xdef\csname\the\macname\endcsname{%
+ \noexpand\norecurse{\the\macname}%
+ \noexpand\scanmacro{\temp}\egroup}%
+ \or % 1
+ \expandafter\xdef\csname\the\macname\endcsname{%
+ \bgroup\noexpand\macroargctxt
+ \noexpand\braceorline
+ \expandafter\noexpand\csname\the\macname xxx\endcsname}%
+ \expandafter\xdef\csname\the\macname xxx\endcsname##1{%
+ \egroup
+ \noexpand\norecurse{\the\macname}%
+ \noexpand\scanmacro{\temp}\egroup}%
+ \else % many
+ \expandafter\xdef\csname\the\macname\endcsname{%
+ \bgroup\noexpand\macroargctxt
+ \expandafter\noexpand\csname\the\macname xx\endcsname}%
+ \expandafter\xdef\csname\the\macname xx\endcsname##1{%
+ \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
+ \expandafter\expandafter
+ \expandafter\xdef
+ \expandafter\expandafter
+ \csname\the\macname xxx\endcsname
+ \paramlist{%
+ \egroup
+ \noexpand\norecurse{\the\macname}%
+ \noexpand\scanmacro{\temp}\egroup}%
+ \fi
+ \fi}
+
+\def\norecurse#1{\bgroup\cslet{#1}{macsave.#1}}
+
+% \braceorline decides whether the next nonwhitespace character is a
+% {. If so it reads up to the closing }, if not, it reads the whole
+% line. Whatever was read is then fed to the next control sequence
+% as an argument (by \parsebrace or \parsearg)
+\def\braceorline#1{\let\next=#1\futurelet\nchar\braceorlinexxx}
+\def\braceorlinexxx{%
+ \ifx\nchar\bgroup\else
+ \expandafter\parsearg
+ \fi \next}
+
+% We mant to disable all macros during \shipout so that they are not
+% expanded by \write.
+\def\turnoffmacros{\begingroup \def\do##1{\let\noexpand##1=\relax}%
+ \edef\next{\macrolist}\expandafter\endgroup\next}
+
+
+% @alias.
+% We need some trickery to remove the optional spaces around the equal
+% sign. Just make them active and then expand them all to nothing.
+\def\alias{\begingroup\obeyspaces\parsearg\aliasxxx}
+\def\aliasxxx #1{\aliasyyy#1\relax}
+\def\aliasyyy #1=#2\relax{\ignoreactivespaces
+\edef\next{\global\let\expandafter\noexpand\csname#1\endcsname=%
+ \expandafter\noexpand\csname#2\endcsname}%
+\expandafter\endgroup\next}
+
+
+\message{cross references,}
+% @xref etc.
+
+\newwrite\auxfile
+
+\newif\ifhavexrefs % True if xref values are known.
+\newif\ifwarnedxrefs % True if we warned once that they aren't known.
+
+% @inforef is relatively simple.
+\def\inforef #1{\inforefzzz #1,,,,**}
+\def\inforefzzz #1,#2,#3,#4**{\putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}},
+ node \samp{\ignorespaces#1{}}}
+
+% @node's job is to define \lastnode.
+\def\node{\ENVcheck\parsearg\nodezzz}
+\def\nodezzz#1{\nodexxx #1,\finishnodeparse}
+\def\nodexxx#1,#2\finishnodeparse{\gdef\lastnode{#1}}
+\let\nwnode=\node
+\let\lastnode=\relax
+
+% The sectioning commands (@chapter, etc.) call these.
+\def\donoderef{%
+ \ifx\lastnode\relax\else
+ \expandafter\expandafter\expandafter\setref{\lastnode}%
+ {Ysectionnumberandtype}%
+ \global\let\lastnode=\relax
+ \fi
+}
+\def\unnumbnoderef{%
+ \ifx\lastnode\relax\else
+ \expandafter\expandafter\expandafter\setref{\lastnode}{Ynothing}%
+ \global\let\lastnode=\relax
+ \fi
+}
+\def\appendixnoderef{%
+ \ifx\lastnode\relax\else
+ \expandafter\expandafter\expandafter\setref{\lastnode}%
+ {Yappendixletterandtype}%
+ \global\let\lastnode=\relax
+ \fi
+}
+
+
+% @anchor{NAME} -- define xref target at arbitrary point.
+%
+\newcount\savesfregister
+\gdef\savesf{\relax \ifhmode \savesfregister=\spacefactor \fi}
+\gdef\restoresf{\relax \ifhmode \spacefactor=\savesfregister \fi}
+\gdef\anchor#1{\savesf \setref{#1}{Ynothing}\restoresf \ignorespaces}
+
+% \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an
+% anchor), namely NAME-title (the corresponding @chapter/etc. name),
+% NAME-pg (the page number), and NAME-snt (section number and type).
+% Called from \foonoderef.
+%
+% We have to set \indexdummies so commands such as @code in a section
+% title aren't expanded. It would be nicer not to expand the titles in
+% the first place, but there's so many layers that that is hard to do.
+%
+% Likewise, use \turnoffactive so that punctuation chars such as underscore
+% and backslash work in node names.
+%
+\def\setref#1#2{{%
+ \atdummies
+ \pdfmkdest{#1}%
+ %
+ \turnoffactive
+ \dosetq{#1-title}{Ytitle}%
+ \dosetq{#1-pg}{Ypagenumber}%
+ \dosetq{#1-snt}{#2}%
+}}
+
+% @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is
+% the node name, #2 the name of the Info cross-reference, #3 the printed
+% node name, #4 the name of the Info file, #5 the name of the printed
+% manual. All but the node name can be omitted.
+%
+\def\pxref#1{\putwordsee{} \xrefX[#1,,,,,,,]}
+\def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]}
+\def\ref#1{\xrefX[#1,,,,,,,]}
+\def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup
+ \unsepspaces
+ \def\printedmanual{\ignorespaces #5}%
+ \def\printednodename{\ignorespaces #3}%
+ \setbox1=\hbox{\printedmanual}%
+ \setbox0=\hbox{\printednodename}%
+ \ifdim \wd0 = 0pt
+ % No printed node name was explicitly given.
+ \expandafter\ifx\csname SETxref-automatic-section-title\endcsname\relax
+ % Use the node name inside the square brackets.
+ \def\printednodename{\ignorespaces #1}%
+ \else
+ % Use the actual chapter/section title appear inside
+ % the square brackets. Use the real section title if we have it.
+ \ifdim \wd1 > 0pt
+ % It is in another manual, so we don't have it.
+ \def\printednodename{\ignorespaces #1}%
+ \else
+ \ifhavexrefs
+ % We know the real title if we have the xref values.
+ \def\printednodename{\refx{#1-title}{}}%
+ \else
+ % Otherwise just copy the Info node name.
+ \def\printednodename{\ignorespaces #1}%
+ \fi%
+ \fi
+ \fi
+ \fi
+ %
+ % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not
+ % insert empty discretionaries after hyphens, which means that it will
+ % not find a line break at a hyphen in a node names. Since some manuals
+ % are best written with fairly long node names, containing hyphens, this
+ % is a loss. Therefore, we give the text of the node name again, so it
+ % is as if TeX is seeing it for the first time.
+ \ifpdf
+ \leavevmode
+ \getfilename{#4}%
+ {\turnoffactive \otherbackslash
+ \ifnum\filenamelength>0
+ \startlink attr{/Border [0 0 0]}%
+ goto file{\the\filename.pdf} name{#1}%
+ \else
+ \startlink attr{/Border [0 0 0]}%
+ goto name{#1}%
+ \fi
+ }%
+ \linkcolor
+ \fi
+ %
+ \ifdim \wd1 > 0pt
+ \putwordsection{} ``\printednodename'' \putwordin{} \cite{\printedmanual}%
+ \else
+ % _ (for example) has to be the character _ for the purposes of the
+ % control sequence corresponding to the node, but it has to expand
+ % into the usual \leavevmode...\vrule stuff for purposes of
+ % printing. So we \turnoffactive for the \refx-snt, back on for the
+ % printing, back off for the \refx-pg.
+ {\turnoffactive \otherbackslash
+ % Only output a following space if the -snt ref is nonempty; for
+ % @unnumbered and @anchor, it won't be.
+ \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
+ \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi
+ }%
+ % output the `[mynode]' via a macro.
+ \xrefprintnodename\printednodename
+ %
+ % But we always want a comma and a space:
+ ,\space
+ %
+ % output the `page 3'.
+ \turnoffactive \otherbackslash \putwordpage\tie\refx{#1-pg}{}%
+ \fi
+ \endlink
+\endgroup}
+
+% This macro is called from \xrefX for the `[nodename]' part of xref
+% output. It's a separate macro only so it can be changed more easily,
+% since not square brackets don't work in some documents. Particularly
+% one that Bob is working on :).
+%
+\def\xrefprintnodename#1{[#1]}
+
+% \dosetq is called from \setref to do the actual \write (\iflinks).
+%
+\def\dosetq#1#2{%
+ {\let\folio=0%
+ \edef\next{\write\auxfile{\internalsetq{#1}{#2}}}%
+ \iflinks \next \fi
+ }%
+}
+
+% \internalsetq{foo}{page} expands into
+% CHARACTERS @xrdef{foo}{...expansion of \page...}
+\def\internalsetq#1#2{@xrdef{#1}{\csname #2\endcsname}}
+
+% Things to be expanded by \internalsetq.
+%
+\def\Ypagenumber{\folio}
+\def\Ytitle{\thissection}
+\def\Ynothing{}
+\def\Ysectionnumberandtype{%
+ \ifnum\secno=0
+ \putwordChapter@tie \the\chapno
+ \else \ifnum\subsecno=0
+ \putwordSection@tie \the\chapno.\the\secno
+ \else \ifnum\subsubsecno=0
+ \putwordSection@tie \the\chapno.\the\secno.\the\subsecno
+ \else
+ \putwordSection@tie \the\chapno.\the\secno.\the\subsecno.\the\subsubsecno
+ \fi\fi\fi
+}
+
+\def\Yappendixletterandtype{%
+ \ifnum\secno=0
+ \putwordAppendix@tie @char\the\appendixno{}%
+ \else \ifnum\subsecno=0
+ \putwordSection@tie @char\the\appendixno.\the\secno
+ \else \ifnum\subsubsecno=0
+ \putwordSection@tie @char\the\appendixno.\the\secno.\the\subsecno
+ \else
+ \putwordSection@tie
+ @char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno
+ \fi\fi\fi
+}
+
+% Use TeX 3.0's \inputlineno to get the line number, for better error
+% messages, but if we're using an old version of TeX, don't do anything.
+%
+\ifx\inputlineno\thisisundefined
+ \let\linenumber = \empty % Pre-3.0.
+\else
+ \def\linenumber{\the\inputlineno:\space}
+\fi
+
+% Define \refx{NAME}{SUFFIX} to reference a cross-reference string named NAME.
+% If its value is nonempty, SUFFIX is output afterward.
+%
+\def\refx#1#2{%
+ {%
+ \indexnofonts
+ \otherbackslash
+ \expandafter\global\expandafter\let\expandafter\thisrefX
+ \csname X#1\endcsname
+ }%
+ \ifx\thisrefX\relax
+ % If not defined, say something at least.
+ \angleleft un\-de\-fined\angleright
+ \iflinks
+ \ifhavexrefs
+ \message{\linenumber Undefined cross reference `#1'.}%
+ \else
+ \ifwarnedxrefs\else
+ \global\warnedxrefstrue
+ \message{Cross reference values unknown; you must run TeX again.}%
+ \fi
+ \fi
+ \fi
+ \else
+ % It's defined, so just use it.
+ \thisrefX
+ \fi
+ #2% Output the suffix in any case.
+}
+
+% This is the macro invoked by entries in the aux file.
+%
+\def\xrdef#1{\expandafter\gdef\csname X#1\endcsname}
+
+% Read the last existing aux file, if any. No error if none exists.
+\def\readauxfile{\begingroup
+ \catcode`\^^@=\other
+ \catcode`\^^A=\other
+ \catcode`\^^B=\other
+ \catcode`\^^C=\other
+ \catcode`\^^D=\other
+ \catcode`\^^E=\other
+ \catcode`\^^F=\other
+ \catcode`\^^G=\other
+ \catcode`\^^H=\other
+ \catcode`\^^K=\other
+ \catcode`\^^L=\other
+ \catcode`\^^N=\other
+ \catcode`\^^P=\other
+ \catcode`\^^Q=\other
+ \catcode`\^^R=\other
+ \catcode`\^^S=\other
+ \catcode`\^^T=\other
+ \catcode`\^^U=\other
+ \catcode`\^^V=\other
+ \catcode`\^^W=\other
+ \catcode`\^^X=\other
+ \catcode`\^^Z=\other
+ \catcode`\^^[=\other
+ \catcode`\^^\=\other
+ \catcode`\^^]=\other
+ \catcode`\^^^=\other
+ \catcode`\^^_=\other
+ % It was suggested to set the catcode of ^ to 7, which would allow ^^e4 etc.
+ % in xref tags, i.e., node names. But since ^^e4 notation isn't
+ % supported in the main text, it doesn't seem desirable. Furthermore,
+ % that is not enough: for node names that actually contain a ^
+ % character, we would end up writing a line like this: 'xrdef {'hat
+ % b-title}{'hat b} and \xrdef does a \csname...\endcsname on the first
+ % argument, and \hat is not an expandable control sequence. It could
+ % all be worked out, but why? Either we support ^^ or we don't.
+ %
+ % The other change necessary for this was to define \auxhat:
+ % \def\auxhat{\def^{'hat }}% extra space so ok if followed by letter
+ % and then to call \auxhat in \setq.
+ %
+ \catcode`\^=\other
+ %
+ % Special characters. Should be turned off anyway, but...
+ \catcode`\~=\other
+ \catcode`\[=\other
+ \catcode`\]=\other
+ \catcode`\"=\other
+ \catcode`\_=\other
+ \catcode`\|=\other
+ \catcode`\<=\other
+ \catcode`\>=\other
+ \catcode`\$=\other
+ \catcode`\#=\other
+ \catcode`\&=\other
+ \catcode`\%=\other
+ \catcode`+=\other % avoid \+ for paranoia even though we've turned it off
+ %
+ % Make the characters 128-255 be printing characters
+ {%
+ \count 1=128
+ \def\loop{%
+ \catcode\count 1=\other
+ \advance\count 1 by 1
+ \ifnum \count 1<256 \loop \fi
+ }%
+ }%
+ %
+ % Turn off \ as an escape so we do not lose on
+ % entries which were dumped with control sequences in their names.
+ % For example, @xrdef{$\leq $-fun}{page ...} made by @defun ^^
+ % Reference to such entries still does not work the way one would wish,
+ % but at least they do not bomb out when the aux file is read in.
+ \catcode`\\=\other
+ %
+ % @ is our escape character in .aux files.
+ \catcode`\{=1
+ \catcode`\}=2
+ \catcode`\@=0
+ %
+ \openin 1 \jobname.aux
+ \ifeof 1 \else
+ \closein 1
+ \input \jobname.aux
+ \global\havexrefstrue
+ \global\warnedobstrue
+ \fi
+ % Open the new aux file. TeX will close it automatically at exit.
+ \openout\auxfile=\jobname.aux
+\endgroup}
+
+
+% Footnotes.
+
+\newcount \footnoteno
+
+% The trailing space in the following definition for supereject is
+% vital for proper filling; pages come out unaligned when you do a
+% pagealignmacro call if that space before the closing brace is
+% removed. (Generally, numeric constants should always be followed by a
+% space to prevent strange expansion errors.)
+\def\supereject{\par\penalty -20000\footnoteno =0 }
+
+% @footnotestyle is meaningful for info output only.
+\let\footnotestyle=\comment
+
+\let\ptexfootnote=\footnote
+
+{\catcode `\@=11
+%
+% Auto-number footnotes. Otherwise like plain.
+\gdef\footnote{%
+ \let\indent=\ptexindent
+ \global\advance\footnoteno by \@ne
+ \edef\thisfootno{$^{\the\footnoteno}$}%
+ %
+ % In case the footnote comes at the end of a sentence, preserve the
+ % extra spacing after we do the footnote number.
+ \let\@sf\empty
+ \ifhmode\edef\@sf{\spacefactor\the\spacefactor}\ptexslash\fi
+ %
+ % Remove inadvertent blank space before typesetting the footnote number.
+ \unskip
+ \thisfootno\@sf
+ \dofootnote
+}%
+
+% Don't bother with the trickery in plain.tex to not require the
+% footnote text as a parameter. Our footnotes don't need to be so general.
+%
+% Oh yes, they do; otherwise, @ifset and anything else that uses
+% \parseargline fail inside footnotes because the tokens are fixed when
+% the footnote is read. --karl, 16nov96.
+%
+% The start of the footnote looks usually like this:
+\gdef\startfootins{\insert\footins\bgroup}
+%
+% ... but this macro is redefined inside @multitable.
+%
+\gdef\dofootnote{%
+ \startfootins
+ % We want to typeset this text as a normal paragraph, even if the
+ % footnote reference occurs in (for example) a display environment.
+ % So reset some parameters.
+ \hsize=\pagewidth
+ \interlinepenalty\interfootnotelinepenalty
+ \splittopskip\ht\strutbox % top baseline for broken footnotes
+ \splitmaxdepth\dp\strutbox
+ \floatingpenalty\@MM
+ \leftskip\z@skip
+ \rightskip\z@skip
+ \spaceskip\z@skip
+ \xspaceskip\z@skip
+ \parindent\defaultparindent
+ %
+ \smallfonts \rm
+ %
+ % Because we use hanging indentation in footnotes, a @noindent appears
+ % to exdent this text, so make it be a no-op. makeinfo does not use
+ % hanging indentation so @noindent can still be needed within footnote
+ % text after an @example or the like (not that this is good style).
+ \let\noindent = \relax
+ %
+ % Hang the footnote text off the number. Use \everypar in case the
+ % footnote extends for more than one paragraph.
+ \everypar = {\hang}%
+ \textindent{\thisfootno}%
+ %
+ % Don't crash into the line above the footnote text. Since this
+ % expands into a box, it must come within the paragraph, lest it
+ % provide a place where TeX can split the footnote.
+ \footstrut
+ \futurelet\next\fo@t
+}
+}%end \catcode `\@=11
+
+% @| inserts a changebar to the left of the current line. It should
+% surround any changed text. This approach does *not* work if the
+% change spans more than two lines of output. To handle that, we would
+% have adopt a much more difficult approach (putting marks into the main
+% vertical list for the beginning and end of each change).
+%
+\def\|{%
+ % \vadjust can only be used in horizontal mode.
+ \leavevmode
+ %
+ % Append this vertical mode material after the current line in the output.
+ \vadjust{%
+ % We want to insert a rule with the height and depth of the current
+ % leading; that is exactly what \strutbox is supposed to record.
+ \vskip-\baselineskip
+ %
+ % \vadjust-items are inserted at the left edge of the type. So
+ % the \llap here moves out into the left-hand margin.
+ \llap{%
+ %
+ % For a thicker or thinner bar, change the `1pt'.
+ \vrule height\baselineskip width1pt
+ %
+ % This is the space between the bar and the text.
+ \hskip 12pt
+ }%
+ }%
+}
+
+% For a final copy, take out the rectangles
+% that mark overfull boxes (in case you have decided
+% that the text looks ok even though it passes the margin).
+%
+\def\finalout{\overfullrule=0pt}
+
+% @image. We use the macros from epsf.tex to support this.
+% If epsf.tex is not installed and @image is used, we complain.
+%
+% Check for and read epsf.tex up front. If we read it only at @image
+% time, we might be inside a group, and then its definitions would get
+% undone and the next image would fail.
+\openin 1 = epsf.tex
+\ifeof 1 \else
+ \closein 1
+ % Do not bother showing banner with epsf.tex v2.7k (available in
+ % doc/epsf.tex and on ctan).
+ \def\epsfannounce{\toks0 = }%
+ \input epsf.tex
+\fi
+%
+% We will only complain once about lack of epsf.tex.
+\newif\ifwarnednoepsf
+\newhelp\noepsfhelp{epsf.tex must be installed for images to
+ work. It is also included in the Texinfo distribution, or you can get
+ it from ftp://tug.org/tex/epsf.tex.}
+%
+\def\image#1{%
+ \ifx\epsfbox\undefined
+ \ifwarnednoepsf \else
+ \errhelp = \noepsfhelp
+ \errmessage{epsf.tex not found, images will be ignored}%
+ \global\warnednoepsftrue
+ \fi
+ \else
+ \imagexxx #1,,,,,\finish
+ \fi
+}
+%
+% Arguments to @image:
+% #1 is (mandatory) image filename; we tack on .eps extension.
+% #2 is (optional) width, #3 is (optional) height.
+% #4 is (ignored optional) html alt text.
+% #5 is (ignored optional) extension.
+% #6 is just the usual extra ignored arg for parsing this stuff.
+\newif\ifimagevmode
+\def\imagexxx#1,#2,#3,#4,#5,#6\finish{\begingroup
+ \catcode`\^^M = 5 % in case we're inside an example
+ \normalturnoffactive % allow _ et al. in names
+ % If the image is by itself, center it.
+ \ifvmode
+ \imagevmodetrue
+ \nobreak\bigskip
+ % Usually we'll have text after the image which will insert
+ % \parskip glue, so insert it here too to equalize the space
+ % above and below.
+ \nobreak\vskip\parskip
+ \nobreak
+ \line\bgroup\hss
+ \fi
+ %
+ % Output the image.
+ \ifpdf
+ \dopdfimage{#1}{#2}{#3}%
+ \else
+ % \epsfbox itself resets \epsf?size at each figure.
+ \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \epsfxsize=#2\relax \fi
+ \setbox0 = \hbox{\ignorespaces #3}\ifdim\wd0 > 0pt \epsfysize=#3\relax \fi
+ \epsfbox{#1.eps}%
+ \fi
+ %
+ \ifimagevmode \hss \egroup \bigbreak \fi % space after the image
+\endgroup}
+
+
+\message{localization,}
+% and i18n.
+
+% @documentlanguage is usually given very early, just after
+% @setfilename. If done too late, it may not override everything
+% properly. Single argument is the language abbreviation.
+% It would be nice if we could set up a hyphenation file here.
+%
+\def\documentlanguage{\parsearg\dodocumentlanguage}
+\def\dodocumentlanguage#1{%
+ \tex % read txi-??.tex file in plain TeX.
+ % Read the file if it exists.
+ \openin 1 txi-#1.tex
+ \ifeof1
+ \errhelp = \nolanghelp
+ \errmessage{Cannot read language file txi-#1.tex}%
+ \let\temp = \relax
+ \else
+ \def\temp{\input txi-#1.tex }%
+ \fi
+ \temp
+ \endgroup
+}
+\newhelp\nolanghelp{The given language definition file cannot be found or
+is empty. Maybe you need to install it? In the current directory
+should work if nowhere else does.}
+
+
+% @documentencoding should change something in TeX eventually, most
+% likely, but for now just recognize it.
+\let\documentencoding = \comment
+
+
+% Page size parameters.
+%
+\newdimen\defaultparindent \defaultparindent = 15pt
+
+\chapheadingskip = 15pt plus 4pt minus 2pt
+\secheadingskip = 12pt plus 3pt minus 2pt
+\subsecheadingskip = 9pt plus 2pt minus 2pt
+
+% Prevent underfull vbox error messages.
+\vbadness = 10000
+
+% Don't be so finicky about underfull hboxes, either.
+\hbadness = 2000
+
+% Following George Bush, just get rid of widows and orphans.
+\widowpenalty=10000
+\clubpenalty=10000
+
+% Use TeX 3.0's \emergencystretch to help line breaking, but if we're
+% using an old version of TeX, don't do anything. We want the amount of
+% stretch added to depend on the line length, hence the dependence on
+% \hsize. We call this whenever the paper size is set.
+%
+\def\setemergencystretch{%
+ \ifx\emergencystretch\thisisundefined
+ % Allow us to assign to \emergencystretch anyway.
+ \def\emergencystretch{\dimen0}%
+ \else
+ \emergencystretch = .15\hsize
+ \fi
+}
+
+% Parameters in order: 1) textheight; 2) textwidth; 3) voffset;
+% 4) hoffset; 5) binding offset; 6) topskip; 7) physical page height; 8)
+% physical page width.
+%
+% We also call \setleading{\textleading}, so the caller should define
+% \textleading. The caller should also set \parskip.
+%
+\def\internalpagesizes#1#2#3#4#5#6#7#8{%
+ \voffset = #3\relax
+ \topskip = #6\relax
+ \splittopskip = \topskip
+ %
+ \vsize = #1\relax
+ \advance\vsize by \topskip
+ \outervsize = \vsize
+ \advance\outervsize by 2\topandbottommargin
+ \pageheight = \vsize
+ %
+ \hsize = #2\relax
+ \outerhsize = \hsize
+ \advance\outerhsize by 0.5in
+ \pagewidth = \hsize
+ %
+ \normaloffset = #4\relax
+ \bindingoffset = #5\relax
+ %
+ \ifpdf
+ \pdfpageheight #7\relax
+ \pdfpagewidth #8\relax
+ \fi
+ %
+ \setleading{\textleading}
+ %
+ \parindent = \defaultparindent
+ \setemergencystretch
+}
+
+% @letterpaper (the default).
+\def\letterpaper{{\globaldefs = 1
+ \parskip = 3pt plus 2pt minus 1pt
+ \textleading = 13.2pt
+ %
+ % If page is nothing but text, make it come out even.
+ \internalpagesizes{46\baselineskip}{6in}%
+ {\voffset}{.25in}%
+ {\bindingoffset}{36pt}%
+ {11in}{8.5in}%
+}}
+
+% Use @smallbook to reset parameters for 7x9.5 (or so) format.
+\def\smallbook{{\globaldefs = 1
+ \parskip = 2pt plus 1pt
+ \textleading = 12pt
+ %
+ \internalpagesizes{7.5in}{5in}%
+ {\voffset}{.25in}%
+ {\bindingoffset}{16pt}%
+ {9.25in}{7in}%
+ %
+ \lispnarrowing = 0.3in
+ \tolerance = 700
+ \hfuzz = 1pt
+ \contentsrightmargin = 0pt
+ \defbodyindent = .5cm
+}}
+
+% Use @afourpaper to print on European A4 paper.
+\def\afourpaper{{\globaldefs = 1
+ \parskip = 3pt plus 2pt minus 1pt
+ \textleading = 13.2pt
+ %
+ % Double-side printing via postscript on Laserjet 4050
+ % prints double-sided nicely when \bindingoffset=10mm and \hoffset=-6mm.
+ % To change the settings for a different printer or situation, adjust
+ % \normaloffset until the front-side and back-side texts align. Then
+ % do the same for \bindingoffset. You can set these for testing in
+ % your texinfo source file like this:
+ % @tex
+ % \global\normaloffset = -6mm
+ % \global\bindingoffset = 10mm
+ % @end tex
+ \internalpagesizes{51\baselineskip}{160mm}
+ {\voffset}{\hoffset}%
+ {\bindingoffset}{44pt}%
+ {297mm}{210mm}%
+ %
+ \tolerance = 700
+ \hfuzz = 1pt
+ \contentsrightmargin = 0pt
+ \defbodyindent = 5mm
+}}
+
+% Use @afivepaper to print on European A5 paper.
+% From [email protected], 2 July 2000.
+% He also recommends making @example and @lisp be small.
+\def\afivepaper{{\globaldefs = 1
+ \parskip = 2pt plus 1pt minus 0.1pt
+ \textleading = 12.5pt
+ %
+ \internalpagesizes{160mm}{120mm}%
+ {\voffset}{\hoffset}%
+ {\bindingoffset}{8pt}%
+ {210mm}{148mm}%
+ %
+ \lispnarrowing = 0.2in
+ \tolerance = 800
+ \hfuzz = 1.2pt
+ \contentsrightmargin = 0pt
+ \defbodyindent = 2mm
+ \tableindent = 12mm
+}}
+
+% A specific text layout, 24x15cm overall, intended for A4 paper.
+\def\afourlatex{{\globaldefs = 1
+ \afourpaper
+ \internalpagesizes{237mm}{150mm}%
+ {\voffset}{4.6mm}%
+ {\bindingoffset}{7mm}%
+ {297mm}{210mm}%
+ %
+ % Must explicitly reset to 0 because we call \afourpaper.
+ \globaldefs = 0
+}}
+
+% Use @afourwide to print on A4 paper in landscape format.
+\def\afourwide{{\globaldefs = 1
+ \afourpaper
+ \internalpagesizes{241mm}{165mm}%
+ {\voffset}{-2.95mm}%
+ {\bindingoffset}{7mm}%
+ {297mm}{210mm}%
+ \globaldefs = 0
+}}
+
+% @pagesizes TEXTHEIGHT[,TEXTWIDTH]
+% Perhaps we should allow setting the margins, \topskip, \parskip,
+% and/or leading, also. Or perhaps we should compute them somehow.
+%
+\def\pagesizes{\parsearg\pagesizesxxx}
+\def\pagesizesxxx#1{\pagesizesyyy #1,,\finish}
+\def\pagesizesyyy#1,#2,#3\finish{{%
+ \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \hsize=#2\relax \fi
+ \globaldefs = 1
+ %
+ \parskip = 3pt plus 2pt minus 1pt
+ \setleading{\textleading}%
+ %
+ \dimen0 = #1
+ \advance\dimen0 by \voffset
+ %
+ \dimen2 = \hsize
+ \advance\dimen2 by \normaloffset
+ %
+ \internalpagesizes{#1}{\hsize}%
+ {\voffset}{\normaloffset}%
+ {\bindingoffset}{44pt}%
+ {\dimen0}{\dimen2}%
+}}
+
+% Set default to letter.
+%
+\letterpaper
+
+
+\message{and turning on texinfo input format.}
+
+% Define macros to output various characters with catcode for normal text.
+\catcode`\"=\other
+\catcode`\~=\other
+\catcode`\^=\other
+\catcode`\_=\other
+\catcode`\|=\other
+\catcode`\<=\other
+\catcode`\>=\other
+\catcode`\+=\other
+\catcode`\$=\other
+\def\normaldoublequote{"}
+\def\normaltilde{~}
+\def\normalcaret{^}
+\def\normalunderscore{_}
+\def\normalverticalbar{|}
+\def\normalless{<}
+\def\normalgreater{>}
+\def\normalplus{+}
+\def\normaldollar{$}%$ font-lock fix
+
+% This macro is used to make a character print one way in ttfont
+% where it can probably just be output, and another way in other fonts,
+% where something hairier probably needs to be done.
+%
+% #1 is what to print if we are indeed using \tt; #2 is what to print
+% otherwise. Since all the Computer Modern typewriter fonts have zero
+% interword stretch (and shrink), and it is reasonable to expect all
+% typewriter fonts to have this, we can check that font parameter.
+%
+\def\ifusingtt#1#2{\ifdim \fontdimen3\font=0pt #1\else #2\fi}
+
+% Same as above, but check for italic font. Actually this also catches
+% non-italic slanted fonts since it is impossible to distinguish them from
+% italic fonts. But since this is only used by $ and it uses \sl anyway
+% this is not a problem.
+\def\ifusingit#1#2{\ifdim \fontdimen1\font>0pt #1\else #2\fi}
+
+% Turn off all special characters except @
+% (and those which the user can use as if they were ordinary).
+% Most of these we simply print from the \tt font, but for some, we can
+% use math or other variants that look better in normal text.
+
+\catcode`\"=\active
+\def\activedoublequote{{\tt\char34}}
+\let"=\activedoublequote
+\catcode`\~=\active
+\def~{{\tt\char126}}
+\chardef\hat=`\^
+\catcode`\^=\active
+\def^{{\tt \hat}}
+
+\catcode`\_=\active
+\def_{\ifusingtt\normalunderscore\_}
+% Subroutine for the previous macro.
+\def\_{\leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em }
+
+\catcode`\|=\active
+\def|{{\tt\char124}}
+\chardef \less=`\<
+\catcode`\<=\active
+\def<{{\tt \less}}
+\chardef \gtr=`\>
+\catcode`\>=\active
+\def>{{\tt \gtr}}
+\catcode`\+=\active
+\def+{{\tt \char 43}}
+\catcode`\$=\active
+\def${\ifusingit{{\sl\$}}\normaldollar}%$ font-lock fix
+
+% Set up an active definition for =, but don't enable it most of the time.
+{\catcode`\==\active
+\global\def={{\tt \char 61}}}
+
+\catcode`+=\active
+\catcode`\_=\active
+
+% If a .fmt file is being used, characters that might appear in a file
+% name cannot be active until we have parsed the command line.
+% So turn them off again, and have \everyjob (or @setfilename) turn them on.
+% \otherifyactive is called near the end of this file.
+\def\otherifyactive{\catcode`+=\other \catcode`\_=\other}
+
+\catcode`\@=0
+
+% \rawbackslashxx outputs one backslash character in current font,
+% as in \char`\\.
+\global\chardef\rawbackslashxx=`\\
+
+% \rawbackslash defines an active \ to do \rawbackslashxx.
+% \otherbackslash defines an active \ to be a literal `\' character with
+% catcode other.
+{\catcode`\\=\active
+ @gdef@rawbackslash{@let\=@rawbackslashxx}
+ @gdef@otherbackslash{@let\=@realbackslash}
+}
+
+% \realbackslash is an actual character `\' with catcode other.
+{\catcode`\\=\other @gdef@realbackslash{\}}
+
+% \normalbackslash outputs one backslash in fixed width font.
+\def\normalbackslash{{\tt\rawbackslashxx}}
+
+\catcode`\\=\active
+
+% Used sometimes to turn off (effectively) the active characters
+% even after parsing them.
+@def@turnoffactive{%
+ @let"=@normaldoublequote
+ @let\=@realbackslash
+ @let~=@normaltilde
+ @let^=@normalcaret
+ @let_=@normalunderscore
+ @let|=@normalverticalbar
+ @let<=@normalless
+ @let>=@normalgreater
+ @let+=@normalplus
+ @let$=@normaldollar %$ font-lock fix
+}
+
+% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
+% the literal character `\'. (Thus, \ is not expandable when this is in
+% effect.)
+%
+@def@normalturnoffactive{@turnoffactive @let\=@normalbackslash}
+
+% Make _ and + \other characters, temporarily.
+% This is canceled by @fixbackslash.
+@otherifyactive
+
+% If a .fmt file is being used, we don't want the `\input texinfo' to show up.
+% That is what \eatinput is for; after that, the `\' should revert to printing
+% a backslash.
+%
+@gdef@eatinput input texinfo{@fixbackslash}
+@global@let\ = @eatinput
+
+% On the other hand, perhaps the file did not have a `\input texinfo'. Then
+% the first `\{ in the file would cause an error. This macro tries to fix
+% that, assuming it is called before the first `\' could plausibly occur.
+% Also back turn on active characters that might appear in the input
+% file name, in case not using a pre-dumped format.
+%
+@gdef@fixbackslash{%
+ @ifx\@eatinput @let\ = @normalbackslash @fi
+ @catcode`+=@active
+ @catcode`@_=@active
+}
+
+% Say @foo, not \foo, in error messages.
+@escapechar = `@@
+
+% These look ok in all fonts, so just make them not special.
+@catcode`@& = @other
+@catcode`@# = @other
+@catcode`@% = @other
+
+@c Set initial fonts.
+@textfonts
+@rm
+
+
+@c Local variables:
+@c eval: (add-hook 'write-file-hooks 'time-stamp)
+@c page-delimiter: "^\\\\message"
+@c time-stamp-start: "def\\\\texinfoversion{"
+@c time-stamp-format: "%:y-%02m-%02d.%02H"
+@c time-stamp-end: "}"
+@c End: