aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2001-04-17 16:20:32 +0000
committerWerner Koch <[email protected]>2001-04-17 16:20:32 +0000
commit64ddc393e1e5b86dbc43342a6de3a35e3b7642f9 (patch)
tree1b8fb8b7763cf71d932ebec3011c4ec1c674113e
parentReleased snapshot 1.0.4g (diff)
downloadgnupg-64ddc393e1e5b86dbc43342a6de3a35e3b7642f9.tar.gz
gnupg-64ddc393e1e5b86dbc43342a6de3a35e3b7642f9.zip
Estonian translation, .texi man pages.
-rw-r--r--AUTHORS2
-rw-r--r--BUGS2
-rw-r--r--ChangeLog9
-rw-r--r--NEWS2
-rw-r--r--NOTES2
-rw-r--r--THANKS3
-rw-r--r--VERSION2
-rw-r--r--acinclude.m416
-rw-r--r--cipher/ChangeLog11
-rw-r--r--cipher/dynload.c56
-rw-r--r--cipher/rndunix.c1
-rw-r--r--configure.in21
-rw-r--r--doc/ChangeLog14
-rw-r--r--doc/HACKING59
-rw-r--r--doc/Makefile.am39
-rw-r--r--doc/gpg.sgml10
-rw-r--r--g10/ChangeLog14
-rw-r--r--g10/export.c2
-rw-r--r--g10/getkey.c45
-rw-r--r--g10/sig-check.c6
-rw-r--r--include/ChangeLog4
-rw-r--r--include/iobuf.h1
-rw-r--r--mpi/ChangeLog4
-rw-r--r--mpi/g10m.c2
-rw-r--r--mpi/generic/mpih-add1.c10
-rw-r--r--mpi/generic/mpih-lshift.c9
-rw-r--r--mpi/generic/mpih-mul1.c10
-rw-r--r--mpi/generic/mpih-mul2.c10
-rw-r--r--mpi/generic/mpih-mul3.c10
-rw-r--r--mpi/generic/mpih-rshift.c3
-rw-r--r--mpi/generic/mpih-sub1.c10
-rw-r--r--mpi/generic/udiv-w-sdiv.c5
-rw-r--r--mpi/longlong.h5
-rw-r--r--mpi/mpi-add.c2
-rw-r--r--mpi/mpi-bit.c2
-rw-r--r--mpi/mpi-cmp.c2
-rw-r--r--mpi/mpi-div.c2
-rw-r--r--mpi/mpi-gcd.c2
-rw-r--r--mpi/mpi-inline.c2
-rw-r--r--mpi/mpi-inline.h2
-rw-r--r--mpi/mpi-internal.h2
-rw-r--r--mpi/mpi-inv.c2
-rw-r--r--mpi/mpi-mpow.c2
-rw-r--r--mpi/mpi-mul.c2
-rw-r--r--mpi/mpi-pow.c2
-rw-r--r--mpi/mpi-scan.c2
-rw-r--r--mpi/mpicoder.c2
-rw-r--r--mpi/mpih-cmp.c2
-rw-r--r--mpi/mpih-div.c2
-rw-r--r--mpi/mpih-mul.c3
-rw-r--r--mpi/mpiutil.c2
-rw-r--r--po/ChangeLog10
-rw-r--r--po/da.po8
-rw-r--r--po/de.po31
-rw-r--r--po/eo.po8
-rw-r--r--po/es_ES.po8
-rw-r--r--po/et.po3798
-rw-r--r--po/fr.po8
-rw-r--r--po/id.po8
-rw-r--r--po/it.po8
-rw-r--r--po/ja.po8
-rw-r--r--po/nl.po8
-rw-r--r--po/pl.po8
-rw-r--r--po/pt_BR.po8
-rw-r--r--po/pt_PT.po350
-rw-r--r--po/ru.po8
-rw-r--r--po/sv.po8
-rw-r--r--po/tr.po8
-rw-r--r--util/ChangeLog10
-rw-r--r--util/iobuf.c33
-rw-r--r--util/strgutil.c12
71 files changed, 4338 insertions, 446 deletions
diff --git a/AUTHORS b/AUTHORS
index 4ca466b44..f8cd5aa59 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -48,6 +48,8 @@ Tedi Heriyanto <[email protected]> Translations [id]
Thiago Jung Bauermann <[email protected]> Translations [pt_BR]
+Toomas Soome <[email protected]> Translations [et]
+
Urko Lusa <[email protected]> Translations [es_ES]
Walter Koch <[email protected]> Translations [de]
diff --git a/BUGS b/BUGS
index df428bde4..baa6fc14c 100644
--- a/BUGS
+++ b/BUGS
@@ -2,7 +2,7 @@ Please see
http://www.gnupg.org/buglist.html
-for a list know bugs in GnuPG. We don't distribute this list anymore
+for a list of know bugs in GnuPG. We don't distribute this list anymore
with the package because a more current one with notes in which version
the bug is fixed can be found online.
diff --git a/ChangeLog b/ChangeLog
index e6fcf4f32..c2dd19c62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-04-17 Werner Koch <[email protected]>
+
+ * acinclude.m4 (GNUPG_CHECK_DOCBOOK_TO_TEXI): New.
+ * configure.in: Use it here.
+
+ * configure.in (ALL_LINGUAS): Add Estonian translation by Toomas Soome.
+ (use_m_debug): Removed --enable-m-debug because it does not work
+ anymore.
+
2001-04-06 Werner Koch <[email protected]>
* configure.in (ALL_LINGUAS): Add Turkish translation. Thanks
diff --git a/NEWS b/NEWS
index c12315b76..17df5e6e7 100644
--- a/NEWS
+++ b/NEWS
@@ -138,7 +138,7 @@ Noteworthy changes in version 1.0.2 (2000-07-12)
entirely. This option should not yet be used.
* New option --no-auto-key-retrieve to disable retrieving of
- a missing public key from a keyerver, when a keyerver has been set.
+ a missing public key from a keyserver, when a keyserver has been set.
* Danish translation
diff --git a/NOTES b/NOTES
index 73e400dea..34d5e887d 100644
--- a/NOTES
+++ b/NOTES
@@ -1,8 +1,6 @@
Checking ElGamal signatures is really slow and the reason for the long
running time on parts o my keyring. Because somekeys are also checked at startup, this is even worser. I should invalidate my self signature with algo 16 or 20.
-Further problem: It seems that the caching does only work in part.
-
SCO UnixWare/7.1.0 reported by Allan Clark <[email protected]> for 0.9.8
diff --git a/THANKS b/THANKS
index 6fd875f95..159e1e907 100644
--- a/THANKS
+++ b/THANKS
@@ -68,6 +68,7 @@ Huy Le [email protected]
Ian McKellar [email protected]
Ivo Timmermans [email protected]
Jan Krueger [email protected]
+Jan Niehusmann [email protected]
Janusz A. Urbanowicz [email protected]
James Troup [email protected]
Jean-loup Gailly [email protected]
@@ -90,10 +91,12 @@ Karl Fogel [email protected]
Karsten Thygesen [email protected]
Katsuhiro Kondou [email protected]
Kazu Yamamoto [email protected]
+Keith Clayton [email protected]
Kevin Ryde [email protected]
Klaus Singvogel [email protected]
Lars Kellogg-Stedman [email protected]
L. Sassaman [email protected]
Marco d'Itri [email protected]
Mark Adler [email protected]
Mark Elbrecht [email protected]
diff --git a/VERSION b/VERSION
index 52bed12f0..770d18542 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.4g
+1.0.4h
diff --git a/acinclude.m4 b/acinclude.m4
index 8c505766d..5c7e01bcd 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -88,6 +88,22 @@ dnl ***]])
dnl fi
])
+dnl GNUPG_CHECK_DOCBOOK_TO_TEXI
+dnl
+AC_DEFUN(GNUPG_CHECK_DOCBOOK_TO_TEXI,
+ [
+ AC_CHECK_PROG(DOCBOOK_TO_TEXI, docbook2texi, yes, no)
+ AC_MSG_CHECKING(for sgml to texi tools)
+ working_sgmltotexi=no
+ if test "$ac_cv_prog_DOCBOOK_TO_MAN" = yes; then
+ if sgml2xml -v /dev/null 2>&1 | grep 'SP version' >/dev/null 2>&1 ; then
+ working_sgmltotexi=yes
+ fi
+ fi
+ AC_MSG_RESULT($working_sgmltotexi)
+ AM_CONDITIONAL(HAVE_DOCBOOK_TO_TEXI, test "$working_sgmltotexi" = "yes" )
+ ])
+
dnl GNUPG_LINK_FILES( SRC, DEST )
dnl same as AC_LINK_FILES, but collect the files to link in
diff --git a/cipher/ChangeLog b/cipher/ChangeLog
index 7692ef62d..133b3bc80 100644
--- a/cipher/ChangeLog
+++ b/cipher/ChangeLog
@@ -1,3 +1,14 @@
+2001-04-17 Werner Koch <[email protected]>
+
+ * rndunix.c: Add a signal.h header to avoid warnings on SOlaris 7
+ and 8.
+
+2001-04-16 Werner Koch <[email protected]>
+
+ * dynload.c [__MINGW32__]: Applied patch from Timo Schulz to make
+ it work under W32. This patches is based on the one from
+
2001-04-06 Werner Koch <[email protected]>
* rijndael.c, des.c, blowfish.c, twofish.c, cast5.c (burn_stack):
diff --git a/cipher/dynload.c b/cipher/dynload.c
index 879d2ec6d..01992942a 100644
--- a/cipher/dynload.c
+++ b/cipher/dynload.c
@@ -71,20 +71,52 @@ dlsym(void *handle, char *name)
#endif /*HAVE_DL_SHL_LOAD*/
#ifdef __MINGW32__
-#warning Needs some more work. Based on [email protected] patch.
+#define HAVE_DL_DLOPEN
+#define USE_DYNAMIC_LINKING
-#define dlopen(PATHNAME,MODE) ((void *)LoadLibrary(PATHNAME))
-#define dlclose(HANDLE) FreeLibrary(HANDLE)
-char *dlerror(void)
+static int last_error = 0;
+
+void*
+dlopen(const char *pathname, int mode)
{
- static char dlerrstr[10];
- int err=GetLastError();
- if (!err)
- return NULL;
- sprintf(dlerrstr, "%u", err);
- return dlerrstr;
+ void *h = LoadLibrary( pathname );
+ if (!h) {
+ log_error( "LoadLibrary failed ec=%d\n", (int)GetLastError() );
+ last_error = 1;
+ return NULL;
+ }
+ return h;
+}
+
+int
+dlclose( void *handle )
+{
+ last_error = 0;
+ return FreeLibrary( handle );
+}
+
+char*
+dlerror(void)
+{
+ static char dlerrstr[10];
+ if (last_error) {
+ sprintf(dlerrstr, "%d", (int)GetLastError() );
+ return dlerrstr;
+ }
+ return NULL;
+}
+
+void*
+dlsym( void *handle, const char *name )
+{
+ void *h = GetProcAddress( handle, name );
+ if (!h) {
+ log_error( "GetProcAddress failed ec=%d\n", (int)GetLastError() );
+ last_error = 1;
+ return NULL;
+ }
+ return h;
}
-#define dlsym(HANDLE,NAME) GetProcAddress(HANDLE,NAME)
#endif /*__MINGW32__*/
@@ -241,9 +273,11 @@ load_extension( EXTLIST el )
int rc;
#endif
+ #ifndef __MINGW32__
/* make sure we are not setuid */
if( getuid() != geteuid() )
log_bug("trying to load an extension while still setuid\n");
+ #endif
/* now that we are not setuid anymore, we can safely load modules */
#ifdef HAVE_DL_DLOPEN
diff --git a/cipher/rndunix.c b/cipher/rndunix.c
index 7a3d76d87..87e832785 100644
--- a/cipher/rndunix.c
+++ b/cipher/rndunix.c
@@ -80,6 +80,7 @@
#endif /* _AIX || __QNX__ */
#ifndef __QNX__
#include <sys/shm.h>
+#include <signal.h>
#include <sys/signal.h>
#endif /* __QNX__ */
#include <sys/stat.h>
diff --git a/configure.in b/configure.in
index 69757c6a8..4e1a832f2 100644
--- a/configure.in
+++ b/configure.in
@@ -31,7 +31,7 @@ AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE(gnupg,`cat $srcdir/VERSION`)
-ALL_LINGUAS="da de eo es_ES fr id it ja nl pl pt_BR pt_PT ru sv tr"
+ALL_LINGUAS="da de eo es_ES et fr id it ja nl pl pt_BR pt_PT ru sv tr"
static_modules="sha1 md5 rmd160"
static_random_module=""
@@ -97,21 +97,11 @@ AC_ARG_ENABLE(asm,
try_asm_modules=$enableval, try_asm_modules=yes)
AC_MSG_RESULT($try_asm_modules)
-AC_MSG_CHECKING([whether memory debugging is requested])
-AC_ARG_ENABLE(m-debug,
-[ --enable-m-debug enable debugging of memory allocation],
-use_m_debug=$enableval, use_m_debug=no)
-AC_MSG_RESULT($use_m_debug)
-if test "$use_m_debug" = yes; then
- AC_DEFINE(M_DEBUG)
- use_m_guard=yes
-else
- AC_MSG_CHECKING([whether memory guard is requested])
- AC_ARG_ENABLE(m-guard,
+AC_MSG_CHECKING([whether memory guard is requested])
+AC_ARG_ENABLE(m-guard,
[ --enable-m-guard enable memory guard facility],
use_m_guard=$enableval, use_m_guard=no)
- AC_MSG_RESULT($use_m_guard)
-fi
+AC_MSG_RESULT($use_m_guard)
if test "$use_m_guard" = yes ; then
AC_DEFINE(M_GUARD)
fi
@@ -161,7 +151,7 @@ AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-dnl AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
+AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
AC_PROG_CC
AC_PROG_CPP
AC_ISC_POSIX
@@ -171,6 +161,7 @@ AC_PROG_AWK
AC_CHECK_PROG(DOCBOOK_TO_MAN, docbook-to-man, yes, no)
AM_CONDITIONAL(HAVE_DOCBOOK_TO_MAN, test "$ac_cv_prog_DOCBOOK_TO_MAN" = yes)
GNUPG_CHECK_FAQPROG
+GNUPG_CHECK_DOCBOOK_TO_TEXI
MPI_OPT_FLAGS=""
diff --git a/doc/ChangeLog b/doc/ChangeLog
index b50c01fe7..558423932 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,17 @@
+2001-04-17 Werner Koch <[email protected]>
+
+ * Makefile.am (%.texi): Add rules to create .texi from .sgml.
+ However we can't automate this because automake does not like
+ .texi files as BUILT_SOURCES.
+ (%.dvi,%.ps): Removed these rules, because they are not needed
+ and get in the way of automake's dvi target
+
+ * HACKING: Changed CVS description.
+
+2001-04-06 Werner Koch <[email protected]>
+
+ * gpg.sgml: Small typo fixes by Florian Weimer.
+
2001-03-27 Werner Koch <[email protected]>
* gpg.sgml: Add --no-sig-cache and --no-sig-create-check.
diff --git a/doc/HACKING b/doc/HACKING
index 70bfe65dd..811179e53 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -10,12 +10,13 @@ CVS Access
==========
Anonymous read-only CVS access is available:
- cvs -z6 -d :pserver:[email protected]:/home/koch/cvs login
+ cvs -z3 -d :pserver:[email protected]:/cvs/gnupg login
-use the password "anonymous". To check out the the complete
+use the password "anoncvs". To check out the the complete
archive use:
- cvs -z6 -d :pserver:[email protected]:/home/koch/cvs checkout gnupg
+ cvs -z3 -d :pserver:[email protected]:/cvs/gnupg \
+ checkout -R STABLE-BRANCH-1-0 gnupg
This service is provided to help you in hunting bugs and not to deliver
stable snapshots; it may happen that it even does not compile, so please
@@ -117,46 +118,48 @@ Detailed Roadmap
g10/g10.c Main module with option parsing and all the stuff you have
to do on startup. Also has the exout handler and some
helper functions.
-g10/sign.c
+g10/sign.c Create signature and optionally encrypt
g10/parse-packet.c
g10/build-packet.c
g10/free-packet.c
Parsing and creating of OpenPGP message packets.
-g10/getkey.c
-g10/pkclist.c
-g10/skclist.c
-g10/ringedit.c
+g10/getkey.c Key selection code
+g10/pkclist.c Build a list of public keys
+g10/skclist.c Build a list of secret keys
+g10/ringedit.c Keyring I/O
g10/keydb.h
g10/keyid.c Helper functions to get the keyid, fingerprint etc.
-g10/trustdb.c
+g10/trustdb.c
g10/trustdb.h
g10/tdbdump.c
-
-g10/compress.c
-g10/filter.h
-g10/delkey.c
-g10/kbnode.c
-g10/main.h
-g10/mainproc.c
-g10/armor.c
-g10/mdfilter.c
-g10/textfilter.c
-g10/cipher.c
-g10/misc.c
-g10/options.h
-g10/openfile.c
-g10/tdbio.c
+ Management of the trustdb.gpg
+
+g10/compress.c Filter to handle compression
+g10/filter.h Declarations for all filter functions
+g10/delkey.c Delete a key
+g10/kbnode.c Helper for the KBNODE linked list
+g10/main.h Prototypes and some constants
+g10/mainproc.c Message processing
+g10/armor.c Ascii armor filter
+g10/mdfilter.c Filter to calculate hashs
+g10/textfilter.c Filter to handle CR/LF and trailing white space
+g10/cipher.c En-/Decryption filter
+g10/misc.c Utlity functions
+g10/options.h Structure with all the command line options
+ and related constants
+g10/openfile.c Create/Open Files
+g10/tdbio.c I/O handling for the trustdb.gpg
g10/tdbio.h
-g10/hkp.h
+g10/hkp.h Keyserver access
g10/hkp.c
-g10/packet.h
-g10/passphrase.c
-g10/pubkey-enc.c
+g10/packet.h Defintion of OpenPGP structures.
+g10/passphrase.c Passphrase handling code
+g10/pubkey-enc.c
g10/seckey-cert.c
g10/seskey.c
g10/import.c
diff --git a/doc/Makefile.am b/doc/Makefile.am
index cd92d0e0c..e7ceb48f1 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -18,18 +18,43 @@
## Process this file with automake to create Makefile.in
+AUTOMAKE_OPTIONS = no-texinfo.tex
+
EXTRA_DIST = DETAILS gpg.sgml gpg.1 gpgv.sgml gpgv.1 faq.raw FAQ faq.html \
HACKING OpenPGP README.W32
man_MANS = gpg.1 gpgv.1
+info_TEXINFOS = gpg.texi gpgv.texi
+
+# Need this to avoid building of dvis with automake 1.4
+DVIS =
+
pkgdata_DATA = FAQ faq.html
-BUILT_SOURCES = FAQ faq.html
+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
+CLEANFILES = faq.raw.xref gpg.xml gpgv.xml
+%.texi : %.xml
+if HAVE_DOCBOOK_TO_TEXI
+ docbook2texi $< | sed 's,--,---,' >$@
+else
+ : Warning: missing docbook to texinfo tools, cannot make $@
+ touch $@
+endif
+
+%.xml : %.sgml
+if HAVE_DOCBOOK_TO_TEXI
+ sgml2xml -x lower $< >$@
+else
+ : Warning: missing docbook to texinfo tools, cannot make $@
+ touch $@
+endif
+
%.1 : %.sgml
if HAVE_DOCBOOK_TO_MAN
@@ -47,16 +72,6 @@ FAQ : faq.raw
faq.html : faq.raw
$(FAQPROG) -h -f $< $@ 2>&1 || $(FAQPROG) -h -f $< $@
-%.dvi: %.sgml
- db2dvi $<
-
-%.ps: %.dvi
- dvips -o $@ $<
-
-%/%.html: %.sgml
- -db2html $<
-
-
dist-hook:
@if test `wc -c < gpg.1` -lt 200; then \
echo 'ERROR: dummy man page'; false; fi
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index abadb1382..150b35ba4 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -1108,9 +1108,9 @@ will still get disabled.
<varlistentry>
<term>--no-sig-cache</term>
<listitem><para>
-Does not 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 saved against write
+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.
@@ -1122,9 +1122,9 @@ can be done if someone else has write access to your public keyring.
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%
-fro DSA keys), and so this option can be used to disable it.
+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 setting.
+interaction, this performance penalty does not matter in most settings.
</para></listitem></varlistentry>
<varlistentry>
diff --git a/g10/ChangeLog b/g10/ChangeLog
index fd516b458..1940576fd 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,17 @@
+2001-04-14 Werner Koch <[email protected]>
+
+ * getkey.c (fixup_uidnode): Removed check for !sig which is
+ pointless here. Thanks to Jan Niehusmann.
+
+2001-04-10 Werner Koch <[email protected]>
+
+ * sig-check.c (check_key_signature2): Use log_info instead of
+ log_error so that messed up keys do not let gpg return an error.
+ Suggested by Christian Kurz.
+
+ * getkey.c (merge_selfsigs_main): Do a fixup_uidnode only if we
+ have both, uid and sig. Thanks to M Taylor.
+
2001-04-05 Werner Koch <[email protected]>
* armor.c (unarmor_pump_new,unarmor_pump_release): New.
diff --git a/g10/export.c b/g10/export.c
index 17f76ca24..d156d1ccd 100644
--- a/g10/export.c
+++ b/g10/export.c
@@ -200,7 +200,7 @@ do_export_stream( IOBUF out, STRLIST users, int secret, int onlyrfc, int *any )
/* delete our verification cache */
delete_sig_subpkt (node->pkt->pkt.signature->unhashed_data,
- SIGSUBPKT_PRIV_VERIFY_CACHE);
+ SIGSUBPKT_PRIV_VERIFY_CACHE);
}
if( secret == 2 && node->pkt->pkttype == PKT_SECRET_KEY ) {
diff --git a/g10/getkey.c b/g10/getkey.c
index 975d567fe..f61482118 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -530,13 +530,16 @@ get_seckey( PKT_secret_key *sk, u32 *keyid )
/****************
- * Check whether the secret key is available
+ * Check whether the secret key is available. This is just a fast
+ * check and does not tell us whether the secret key is valid. It
+ * merely tells other whether there is some secret key.
* Returns: 0 := key is available
- * G10ERR_NO_SECKEY := not availabe
+ * G10ERR_NO_SECKEY := not availabe
*/
int
seckey_available( u32 *keyid )
{
+#if 0
int rc;
struct getkey_ctx_s ctx;
KBNODE kb = NULL;
@@ -552,6 +555,39 @@ seckey_available( u32 *keyid )
get_seckey_end( &ctx );
release_kbnode ( kb );
return rc;
+#endif
+ int rc;
+ int found = 0;
+ int oldmode = set_packet_list_mode (0);
+ KBNODE keyblock = NULL;
+ KBPOS kbpos;
+
+ rc = enum_keyblocks ( 5, &kbpos, NULL );
+ if ( !rc ) {
+ while ( !(rc = enum_keyblocks (1, &kbpos, &keyblock)) ) {
+ KBNODE k;
+
+ for (k=keyblock; k; k = k->next ) {
+ if ( k->pkt->pkttype == PKT_SECRET_KEY
+ || k->pkt->pkttype == PKT_SECRET_SUBKEY ) {
+ u32 aki[2];
+ keyid_from_sk (k->pkt->pkt.secret_key, aki );
+ if( aki[1] == keyid[1] && aki[0] == keyid[0] ) {
+ found = 1;
+ goto leave;
+ }
+ }
+ }
+ release_kbnode (keyblock); keyblock = NULL;
+ }
+ }
+ if( rc && rc != -1 )
+ log_error ("enum_keyblocks failed: %s\n", g10_errstr(rc));
+ leave:
+ release_kbnode (keyblock);
+ enum_keyblocks ( 2, &kbpos, NULL );
+ set_packet_list_mode (oldmode);
+ return found? 0 : G10ERR_NO_SECKEY;
}
@@ -1368,8 +1404,6 @@ fixup_uidnode ( KBNODE uidnode, KBNODE signode )
size_t n;
uid->created = 0; /* not created == invalid */
- if ( !signode )
- return; /* no self-signature */
if ( IS_UID_REV ( sig ) ) {
uid->is_revoked = 1;
return; /* has been revoked */
@@ -1517,7 +1551,7 @@ merge_selfsigs_main( KBNODE keyblock, int *r_revoked )
for(k=keyblock; k && k->pkt->pkttype != PKT_PUBLIC_SUBKEY; k = k->next ) {
if ( k->pkt->pkttype == PKT_USER_ID
|| k->pkt->pkttype == PKT_PHOTO_ID ) {
- if ( uidnode )
+ if ( uidnode && signode )
fixup_uidnode ( uidnode, signode );
uidnode = k;
signode = NULL;
@@ -2322,7 +2356,6 @@ lookup( GETKEY_CTX ctx, KBNODE *ret_keyblock, int secmode )
-
/****************
* FIXME: Replace by the generic function
* It does not work as it is right now - it is used at
diff --git a/g10/sig-check.c b/g10/sig-check.c
index 49cc72c32..660919241 100644
--- a/g10/sig-check.c
+++ b/g10/sig-check.c
@@ -546,7 +546,7 @@ check_key_signature2( KBNODE root, KBNODE node, int *is_selfsig,
md_close(md);
}
else {
- log_error("no subkey for subkey revocation packet\n");
+ log_info ("no subkey for subkey revocation packet\n");
rc = G10ERR_SIG_CLASS;
}
}
@@ -569,7 +569,7 @@ check_key_signature2( KBNODE root, KBNODE node, int *is_selfsig,
md_close(md);
}
else {
- log_error("no subkey for key signature packet\n");
+ log_info ("no subkey for key signature packet\n");
rc = G10ERR_SIG_CLASS;
}
}
@@ -602,7 +602,7 @@ check_key_signature2( KBNODE root, KBNODE node, int *is_selfsig,
md_close(md);
}
else {
- log_error("no user ID for key signature packet of class %02x\n",
+ log_info ("no user ID for key signature packet of class %02x\n",
sig->sig_class );
rc = G10ERR_SIG_CLASS;
}
diff --git a/include/ChangeLog b/include/ChangeLog
index 079c38a12..6d5ab6f9c 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-13 Werner Koch <[email protected]>
+
+ * iobuf.h: Removed iobuf_fopen.
+
2001-03-01 Werner Koch <[email protected]>
* errors.h (G10ERR_UNU_SECKEY,G10ERR_UNU_PUBKEY): New
diff --git a/include/iobuf.h b/include/iobuf.h
index f13ba154b..5e02a3ae0 100644
--- a/include/iobuf.h
+++ b/include/iobuf.h
@@ -80,7 +80,6 @@ IOBUF iobuf_temp_with_content( const char *buffer, size_t length );
IOBUF iobuf_open( const char *fname );
IOBUF iobuf_fdopen( int fd, const char *mode );
IOBUF iobuf_sockopen( int fd, const char *mode );
-IOBUF iobuf_fopen( const char *fname, const char *mode );
IOBUF iobuf_create( const char *fname );
IOBUF iobuf_append( const char *fname );
IOBUF iobuf_openrw( const char *fname );
diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index 9fbb36ab0..bb059f889 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-17 Werner Koch <[email protected]>
+
+ Updated copyright notices.
+
2001-03-24 Werner Koch <[email protected]>
* mpi-mul.c (mpi_mul): Make sure that secret temporary results are
diff --git a/mpi/g10m.c b/mpi/g10m.c
index c43e067a7..34a92185c 100644
--- a/mpi/g10m.c
+++ b/mpi/g10m.c
@@ -1,5 +1,5 @@
/* g10m.c - Wrapper for MPI
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/generic/mpih-add1.c b/mpi/generic/mpih-add1.c
index e66c6686c..c7b924c28 100644
--- a/mpi/generic/mpih-add1.c
+++ b/mpi/generic/mpih-add1.c
@@ -1,15 +1,15 @@
/* mpihelp-add_1.c - MPI helper functions
- * Copyright (c) 1997 by Werner Koch (dd9jn)
- * Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ * Copyright (C) 1994, 1996, 1997, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
- * This file is part of G10.
+ * This file is part of GnuPG.
*
- * G10 is free software; you can redistribute it and/or modify
+ * GnuPG 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.
*
- * G10 is distributed in the hope that it will be useful,
+ * GnuPG 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.
diff --git a/mpi/generic/mpih-lshift.c b/mpi/generic/mpih-lshift.c
index 698cd38d8..6c45f3b0f 100644
--- a/mpi/generic/mpih-lshift.c
+++ b/mpi/generic/mpih-lshift.c
@@ -1,14 +1,15 @@
/* mpihelp-lshift.c - MPI helper functions
- * Copyright (C) 1994, 1996, 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1994, 1996, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
- * This file is part of G10.
+ * This file is part of GnuPG.
*
- * G10 is free software; you can redistribute it and/or modify
+ * GnuPG 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.
*
- * G10 is distributed in the hope that it will be useful,
+ * GnuPG 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.
diff --git a/mpi/generic/mpih-mul1.c b/mpi/generic/mpih-mul1.c
index e84eccce2..97e196aeb 100644
--- a/mpi/generic/mpih-mul1.c
+++ b/mpi/generic/mpih-mul1.c
@@ -1,15 +1,15 @@
/* mpihelp-mul_1.c - MPI helper functions
- * Copyright (c) 1997 by Werner Koch (dd9jn)
- * Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ * Copyright (C) 1994, 1996, 1997, 1998, 1999
+ * 2000, 2001 Free Software Foundation, Inc.
*
- * This file is part of G10.
+ * This file is part of GnuPG.
*
- * G10 is free software; you can redistribute it and/or modify
+ * GnuPG 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.
*
- * G10 is distributed in the hope that it will be useful,
+ * GnuPG 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.
diff --git a/mpi/generic/mpih-mul2.c b/mpi/generic/mpih-mul2.c
index d77ec8022..84df43f40 100644
--- a/mpi/generic/mpih-mul2.c
+++ b/mpi/generic/mpih-mul2.c
@@ -1,15 +1,15 @@
/* mpihelp-mul_2.c - MPI helper functions
- * Copyright (c) 1997 by Werner Koch (dd9jn)
- * Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ * Copyright (C) 1994, 1996, 1997, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
- * This file is part of G10.
+ * This file is part of GnuPG.
*
- * G10 is free software; you can redistribute it and/or modify
+ * GnuPG 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.
*
- * G10 is distributed in the hope that it will be useful,
+ * GnuPG 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.
diff --git a/mpi/generic/mpih-mul3.c b/mpi/generic/mpih-mul3.c
index c7c4e1899..40c272632 100644
--- a/mpi/generic/mpih-mul3.c
+++ b/mpi/generic/mpih-mul3.c
@@ -1,15 +1,15 @@
/* mpihelp-mul_3.c - MPI helper functions
- * Copyright (c) 1997 by Werner Koch (dd9jn)
- * Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ * Copyright (C) 1994, 1996, 1997, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
- * This file is part of G10.
+ * This file is part of GnuPG.
*
- * G10 is free software; you can redistribute it and/or modify
+ * GnuPG 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.
*
- * G10 is distributed in the hope that it will be useful,
+ * GnuPG 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.
diff --git a/mpi/generic/mpih-rshift.c b/mpi/generic/mpih-rshift.c
index d8ca35f16..be73adfb8 100644
--- a/mpi/generic/mpih-rshift.c
+++ b/mpi/generic/mpih-rshift.c
@@ -1,5 +1,6 @@
/* mpih-rshift.c - MPI helper functions
- * Copyright (C) 1994, 1996, 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1994, 1996, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GNUPG
*
diff --git a/mpi/generic/mpih-sub1.c b/mpi/generic/mpih-sub1.c
index 2c38ff061..41e247149 100644
--- a/mpi/generic/mpih-sub1.c
+++ b/mpi/generic/mpih-sub1.c
@@ -1,15 +1,15 @@
/* mpihelp-add_2.c - MPI helper functions
- * Copyright (c) 1997 by Werner Koch (dd9jn)
- * Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ * Copyright (C) 1994, 1996, 1997, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
- * This file is part of G10.
+ * This file is part of GnuPG.
*
- * G10 is free software; you can redistribute it and/or modify
+ * GnuPG 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.
*
- * G10 is distributed in the hope that it will be useful,
+ * GnuPG 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.
diff --git a/mpi/generic/udiv-w-sdiv.c b/mpi/generic/udiv-w-sdiv.c
index 7ffec0999..efa2deb8f 100644
--- a/mpi/generic/udiv-w-sdiv.c
+++ b/mpi/generic/udiv-w-sdiv.c
@@ -1,10 +1,9 @@
/* mpihelp_udiv_w_sdiv -- implement udiv_qrnnd on machines with only signed
* division.
- *
+ * Copyright (C) 1992, 1994, 1996, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
* Contributed by Peter L. Montgomery.
*
- * Copyright (C) 1992, 1994, 1996, 1998 Free Software Foundation, Inc.
- *
* This file is part of GnuPG.
*
* GnuPG is free software; you can redistribute it and/or modify
diff --git a/mpi/longlong.h b/mpi/longlong.h
index e36beae49..a47008ac7 100644
--- a/mpi/longlong.h
+++ b/mpi/longlong.h
@@ -1,7 +1,8 @@
/* longlong.h -- definitions for mixed size 32/64 bit arithmetic.
- Note: I added some stuff for use with g10
+ Note: I added some stuff for use with gnupg
-Copyright (C) 1991, 1992, 1993, 1994, 1996 Free Software Foundation, Inc.
+Copyright (C) 1991, 1992, 1993, 1994, 1996, 1998,
+ 1999, 2000, 2001 Free Software Foundation, Inc.
This file is free software; you can redistribute it and/or modify
it under the terms of the GNU Library General Public License as published by
diff --git a/mpi/mpi-add.c b/mpi/mpi-add.c
index 3dd22eb0e..bbd1ac70e 100644
--- a/mpi/mpi-add.c
+++ b/mpi/mpi-add.c
@@ -1,5 +1,5 @@
/* mpi-add.c - MPI functions
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
* Copyright (C) 1994, 1996 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
diff --git a/mpi/mpi-bit.c b/mpi/mpi-bit.c
index f1eff8636..ade11afdc 100644
--- a/mpi/mpi-bit.c
+++ b/mpi/mpi-bit.c
@@ -1,5 +1,5 @@
/* mpi-bit.c - MPI bit level fucntions
- * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/mpi-cmp.c b/mpi/mpi-cmp.c
index 2a6cdbf1c..c04710660 100644
--- a/mpi/mpi-cmp.c
+++ b/mpi/mpi-cmp.c
@@ -1,5 +1,5 @@
/* mpi-cmp.c - MPI functions
- * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/mpi-div.c b/mpi/mpi-div.c
index 6e50456d4..926527644 100644
--- a/mpi/mpi-div.c
+++ b/mpi/mpi-div.c
@@ -1,5 +1,5 @@
/* mpi-div.c - MPI functions
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
* Copyright (C) 1994, 1996 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
diff --git a/mpi/mpi-gcd.c b/mpi/mpi-gcd.c
index 226faf15a..efd703b32 100644
--- a/mpi/mpi-gcd.c
+++ b/mpi/mpi-gcd.c
@@ -1,5 +1,5 @@
/* mpi-gcd.c - MPI functions
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/mpi-inline.c b/mpi/mpi-inline.c
index 7a2e7a4fd..787d897dd 100644
--- a/mpi/mpi-inline.c
+++ b/mpi/mpi-inline.c
@@ -1,5 +1,5 @@
/* mpi-inline.c
- * Copyright (C) 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/mpi-inline.h b/mpi/mpi-inline.h
index 8c7cedb60..3866f106b 100644
--- a/mpi/mpi-inline.h
+++ b/mpi/mpi-inline.h
@@ -1,5 +1,5 @@
/* mpi-inline.h - Internal to the Multi Precision Integers
- * Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
* Copyright (C) 1994, 1996 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
diff --git a/mpi/mpi-internal.h b/mpi/mpi-internal.h
index 2b521c952..02169c2fc 100644
--- a/mpi/mpi-internal.h
+++ b/mpi/mpi-internal.h
@@ -1,5 +1,5 @@
/* mpi-internal.h - Internal to the Multi Precision Integers
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
* Copyright (C) 1994, 1996 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
diff --git a/mpi/mpi-inv.c b/mpi/mpi-inv.c
index 667571235..ad41cf2a5 100644
--- a/mpi/mpi-inv.c
+++ b/mpi/mpi-inv.c
@@ -1,5 +1,5 @@
/* mpi-inv.c - MPI functions
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/mpi-mpow.c b/mpi/mpi-mpow.c
index 001802191..868a7995a 100644
--- a/mpi/mpi-mpow.c
+++ b/mpi/mpi-mpow.c
@@ -1,5 +1,5 @@
/* mpi-mpow.c - MPI functions
- * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/mpi-mul.c b/mpi/mpi-mul.c
index e19ef5c6d..d94aca48d 100644
--- a/mpi/mpi-mul.c
+++ b/mpi/mpi-mul.c
@@ -1,5 +1,5 @@
/* mpi-mul.c - MPI functions
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
* Copyright (C) 1994, 1996 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
diff --git a/mpi/mpi-pow.c b/mpi/mpi-pow.c
index fbd2cb8ef..82617fbde 100644
--- a/mpi/mpi-pow.c
+++ b/mpi/mpi-pow.c
@@ -1,5 +1,5 @@
/* mpi-pow.c - MPI functions
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
* Copyright (C) 1994, 1996, 2000 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
diff --git a/mpi/mpi-scan.c b/mpi/mpi-scan.c
index ea5673f4f..abebe2208 100644
--- a/mpi/mpi-scan.c
+++ b/mpi/mpi-scan.c
@@ -1,5 +1,5 @@
/* mpi-scan.c - MPI functions
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/mpicoder.c b/mpi/mpicoder.c
index dae6eb4e1..b3a62453c 100644
--- a/mpi/mpicoder.c
+++ b/mpi/mpicoder.c
@@ -1,5 +1,5 @@
/* mpicoder.c - Coder for the external representation of MPIs
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/mpih-cmp.c b/mpi/mpih-cmp.c
index 9c9cb4a6c..143f87a85 100644
--- a/mpi/mpih-cmp.c
+++ b/mpi/mpih-cmp.c
@@ -1,5 +1,5 @@
/* mpihelp-sub.c - MPI helper functions
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
* Copyright (C) 1994, 1996 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
diff --git a/mpi/mpih-div.c b/mpi/mpih-div.c
index bb837208b..9205b51bc 100644
--- a/mpi/mpih-div.c
+++ b/mpi/mpih-div.c
@@ -1,5 +1,5 @@
/* mpihelp-div.c - MPI helper functions
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
* Copyright (C) 1994, 1996 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
diff --git a/mpi/mpih-mul.c b/mpi/mpih-mul.c
index e1bfef55b..e944eab04 100644
--- a/mpi/mpih-mul.c
+++ b/mpi/mpih-mul.c
@@ -1,5 +1,6 @@
/* mpihelp-mul.c - MPI helper functions
- * Copyright (C) 1994, 1996, 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1994, 1996, 1998, 1999,
+ * 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/mpi/mpiutil.c b/mpi/mpiutil.c
index 62cb882d6..da0c78480 100644
--- a/mpi/mpiutil.c
+++ b/mpi/mpiutil.c
@@ -1,5 +1,5 @@
/* mpiutil.ac - Utility functions for MPI
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
diff --git a/po/ChangeLog b/po/ChangeLog
index d850e87d0..02d3231eb 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,13 @@
+2001-04-17 Werner Koch <[email protected]>
+
+ * et.po: New.
+
+ * de.po: Updated.
+
+2001-04-16 Werner Koch <[email protected]>
+
+ * pt_PT.po: Updated.
+
2001-04-06 Werner Koch <[email protected]>
* tr.po: New.
diff --git a/po/da.po b/po/da.po
index 8fe6e0e5d..5df4234f8 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2001-04-06 10:29+0200\n"
+"POT-Creation-Date: 2001-04-17 11:40+0200\n"
"PO-Revision-Date: 2000-03-07 22:51+01:00\n"
"Last-Translator: Birger Langkjer <[email protected]>\n"
"Language-Team: Danish <[email protected]>\n"
@@ -1625,17 +1625,17 @@ msgstr ""
msgid "too many entries in unk cache - disabled\n"
msgstr ""
-#: g10/getkey.c:2169
+#: g10/getkey.c:2203
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "bruger sekund�r n�gle %08lX istedetfor prim�r n�gle %08lX\n"
-#: g10/getkey.c:2211 g10/trustdb.c:577
+#: g10/getkey.c:2245 g10/trustdb.c:577
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr ""
-#: g10/getkey.c:2499
+#: g10/getkey.c:2532
#, fuzzy
msgid "[User id not found]"
msgstr "%s: bruger ikke fundet\n"
diff --git a/po/de.po b/po/de.po
index eb4024292..6fa4d00cb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,8 +4,8 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.0.4\n"
-"POT-Creation-Date: 2001-04-06 10:29+0200\n"
-"PO-Revision-Date: 2001-02-20 21:20+0200\n"
+"POT-Creation-Date: 2001-04-17 11:40+0200\n"
+"PO-Revision-Date: 2001-04-16 14:20+0200\n"
"Last-Translator: Walter Koch <[email protected]>\n"
"Language-Team: German <[email protected]>\n"
"MIME-Version: 1.0\n"
@@ -249,14 +249,12 @@ msgstr "nicht bearbeitet"
#. the key cannot be used for a specific usage
#: util/errors.c:105
-#, fuzzy
msgid "unusable public key"
-msgstr "Falscher �ffentlicher Sch�ssel"
+msgstr "unbrauchbarer �ffentlicher Sch�ssel"
#: util/errors.c:106
-#, fuzzy
msgid "unusable secret key"
-msgstr "Falscher geheimer Schl�ssel"
+msgstr "unbrauchbarer geheimer Schl�ssel"
#: util/logger.c:224
#, c-format
@@ -1352,6 +1350,7 @@ msgstr ""
#: g10/keygen.c:580
msgid "The use of this algorithm is deprecated - create anyway? "
msgstr ""
+"Von der Benutzung dieses Verfahrens ist abzuraten - Trotzdem erzeugen? "
#: g10/keygen.c:594
msgid "Invalid selection.\n"
@@ -1713,20 +1712,20 @@ msgstr "zu viele Eintr�ge im pk-Lager - abgeschaltet\n"
msgid "too many entries in unk cache - disabled\n"
msgstr "zu viele Eintr�ge im unk-Lager - abgeschaltet\n"
-#: g10/getkey.c:2169
+#: g10/getkey.c:2203
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr ""
"der Zweitschl�ssel %08lX wird anstelle des Hauptschl�ssels %08lX verwendet\n"
-#: g10/getkey.c:2211 g10/trustdb.c:577
+#: g10/getkey.c:2245 g10/trustdb.c:577
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr ""
"Schl�ssel %08lX: geheimer Schl�ssel, aber ohne �ffentlichen Schl�ssel - "
"�bersprungen\n"
-#: g10/getkey.c:2499
+#: g10/getkey.c:2532
msgid "[User id not found]"
msgstr "[User-ID nicht gefunden]"
@@ -2671,9 +2670,8 @@ msgstr "Unterschriften-�berpr�fung unterdr�ckt\n"
#. plaintext before signatures but no one-pass packets
#: g10/mainproc.c:1235 g10/mainproc.c:1245
-#, fuzzy
msgid "can't handle these multiple signatures\n"
-msgstr "keine abgetrennte Unterschrift\n"
+msgstr "diese Mehrfachunterschriften k�nnen nicht behandelt werden\n"
# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
#: g10/mainproc.c:1256
@@ -2963,9 +2961,9 @@ msgstr ""
"Vermutlich eine FALSCHE Unterschrift, wegen unbekanntem \"critical bit\"\n"
#: g10/sign.c:152
-#, fuzzy, c-format
+#, c-format
msgid "checking created signature failed: %s\n"
-msgstr "Unterschrift kann nicht gepr�ft werden: %s\n"
+msgstr "Pr�fung der erstellten Unterschrift ist fehlgeschlagen: %s\n"
#: g10/sign.c:161
#, c-format
@@ -3466,9 +3464,9 @@ msgstr ""
"echten Zufallsgenerator verwendbar\n"
#: g10/skclist.c:138
-#, fuzzy, c-format
+#, c-format
msgid "skipped `%s': duplicated\n"
-msgstr "�bersprungen '%s': %s\n"
+msgstr "�bersprungen '%s': doppelt\n"
#: g10/skclist.c:145 g10/skclist.c:153
#, c-format
@@ -3476,9 +3474,8 @@ msgid "skipped `%s': %s\n"
msgstr "�bersprungen '%s': %s\n"
#: g10/skclist.c:149
-#, fuzzy
msgid "skipped: secret key already present\n"
-msgstr "%s: �bersprungen: �ffentlicher Schl�ssel bereits vorhanden\n"
+msgstr "%s: �bersprungen: geheimer Schl�ssel bereits vorhanden\n"
#: g10/skclist.c:160
#, c-format
diff --git a/po/eo.po b/po/eo.po
index 48204af67..78887b061 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.1e\n"
-"POT-Creation-Date: 2001-04-06 10:29+0200\n"
+"POT-Creation-Date: 2001-04-17 11:40+0200\n"
"PO-Revision-Date: 2000-08-16 23:19+01:00\n"
"Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
"Language-Team: Esperanto <[email protected]>\n"
@@ -1683,17 +1683,17 @@ msgstr "tro da registroj en pk-staplo - mal�altas\n"
msgid "too many entries in unk cache - disabled\n"
msgstr "tro da registroj en unk-staplo - mal�altas\n"
-#: g10/getkey.c:2169
+#: g10/getkey.c:2203
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "uzas flankan �losilon %08lX anstata� la �efa �losilo %08lX\n"
-#: g10/getkey.c:2211 g10/trustdb.c:577
+#: g10/getkey.c:2245 g10/trustdb.c:577
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
-#: g10/getkey.c:2499
+#: g10/getkey.c:2532
msgid "[User id not found]"
msgstr "[Uzantidentigilo ne trovita]"
diff --git a/po/es_ES.po b/po/es_ES.po
index ade62c3e1..646c0a449 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@
# GPG version: 1.0.0
msgid ""
msgstr ""
-"POT-Creation-Date: 2001-04-06 10:29+0200\n"
+"POT-Creation-Date: 2001-04-17 11:40+0200\n"
"PO-Revision-Date: 1999-10-27 06:35+0200\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Date: 1998-11-13 10:49:25+0100\n"
@@ -1710,17 +1710,17 @@ msgstr "demasiados registros en la cache pk - anulada\n"
msgid "too many entries in unk cache - disabled\n"
msgstr "demasiados registros en la cache unk - anulada\n"
-#: g10/getkey.c:2169
+#: g10/getkey.c:2203
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n"
-#: g10/getkey.c:2211 g10/trustdb.c:577
+#: g10/getkey.c:2245 g10/trustdb.c:577
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "clave %08lX: clave secreta sin clave p�blica - ignorada\n"
-#: g10/getkey.c:2499
+#: g10/getkey.c:2532
#, fuzzy
msgid "[User id not found]"
msgstr "%s: usuario no encontrado\n"
diff --git a/po/et.po b/po/et.po
new file mode 100644
index 000000000..4ceecca11
--- /dev/null
+++ b/po/et.po
@@ -0,0 +1,3798 @@
+# Estonian translations for gnupg.
+# Copyright (C) 2001 Free Software Foundation, Inc.
+# Toomas Soome <[email protected]>, 2000.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnupg 1.0.4\n"
+"POT-Creation-Date: 2001-04-17 11:40+0200\n"
+"PO-Revision-Date: 2001-01-04 12:01+02:00\n"
+"Last-Translator: Toomas Soome <[email protected]>\n"
+"Language-Team: Estonian <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8-bit\n"
+
+#: util/secmem.c:79
+msgid "Warning: using insecure memory!\n"
+msgstr "Hoiatus: kasutan ebaturvalist m�lu!\n"
+
+#: util/secmem.c:299
+msgid "operation is not possible without initialized secure memory\n"
+msgstr "initsialiseerimata turvalise m�luta ei ole operatsioon v�imalik\n"
+
+#: util/secmem.c:300
+msgid "(you may have used the wrong program for this task)\n"
+msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
+
+#: util/miscutil.c:277 util/miscutil.c:306
+msgid "yes"
+msgstr "jah"
+
+#: util/miscutil.c:278 util/miscutil.c:309
+msgid "yY"
+msgstr "jJ"
+
+#: util/miscutil.c:279 util/miscutil.c:307
+msgid "no"
+msgstr "ei"
+
+#: util/miscutil.c:280 util/miscutil.c:310
+msgid "nN"
+msgstr "eE"
+
+#: g10/keyedit.c:581 util/miscutil.c:308
+msgid "quit"
+msgstr "v�lju"
+
+#: util/miscutil.c:311
+msgid "qQ"
+msgstr "vV"
+
+#: util/errors.c:54
+msgid "general error"
+msgstr "�ldine viga"
+
+#: util/errors.c:55
+msgid "unknown packet type"
+msgstr "tundmatu paketi t��p"
+
+#: util/errors.c:56
+msgid "unknown version"
+msgstr "tundmatu versioon"
+
+#: util/errors.c:57
+msgid "unknown pubkey algorithm"
+msgstr "tundmatu avaliku v�tme algoritm"
+
+#: util/errors.c:58
+msgid "unknown digest algorithm"
+msgstr "tundmatu l�hendi algoritm"
+
+#: util/errors.c:59
+msgid "bad public key"
+msgstr "halb avalik v�ti"
+
+#: util/errors.c:60
+msgid "bad secret key"
+msgstr "halb salajane v�ti"
+
+#: util/errors.c:61
+msgid "bad signature"
+msgstr "halb allkiri"
+
+#: util/errors.c:62
+msgid "checksum error"
+msgstr "kontrollsumma viga"
+
+#: util/errors.c:63
+msgid "bad passphrase"
+msgstr "halb parool"
+
+#: util/errors.c:64
+msgid "public key not found"
+msgstr "ei leia avalikku v�tit"
+
+#: util/errors.c:65
+msgid "unknown cipher algorithm"
+msgstr "tundmatu �iffri algoritm"
+
+#: util/errors.c:66
+msgid "can't open the keyring"
+msgstr "v�tmehoidlat ei �nnestu avada"
+
+#: util/errors.c:67
+msgid "invalid packet"
+msgstr "vigane pakett"
+
+#: util/errors.c:68
+msgid "invalid armor"
+msgstr "vigane pakend"
+
+#: util/errors.c:69
+msgid "no such user id"
+msgstr "sellist kasutaja id pole"
+
+#: util/errors.c:70
+msgid "secret key not available"
+msgstr "salajane v�ti ei ole k�ttesaadav"
+
+#: util/errors.c:71
+msgid "wrong secret key used"
+msgstr "kasutati valet salajast v�tit"
+
+#: util/errors.c:72
+msgid "not supported"
+msgstr "ei ole toetatud"
+
+#: util/errors.c:73
+msgid "bad key"
+msgstr "halb v�ti"
+
+#: util/errors.c:74
+msgid "file read error"
+msgstr "viga faili lugemisel"
+
+#: util/errors.c:75
+msgid "file write error"
+msgstr "viga faili kirjutamisel"
+
+#: util/errors.c:76
+msgid "unknown compress algorithm"
+msgstr "tundmatu pakkimise algoritm"
+
+#: util/errors.c:77
+msgid "file open error"
+msgstr "viga faili avamisel"
+
+#: util/errors.c:78
+msgid "file create error"
+msgstr "viga faili loomisel"
+
+#: util/errors.c:79
+msgid "invalid passphrase"
+msgstr "vigane parool"
+
+#: util/errors.c:80
+msgid "unimplemented pubkey algorithm"
+msgstr "realiseerimata avaliku v�tme algoritm"
+
+#: util/errors.c:81
+msgid "unimplemented cipher algorithm"
+msgstr "realiseerimata �iffri algoritm"
+
+#: util/errors.c:82
+msgid "unknown signature class"
+msgstr "tundmatu allkirja klass"
+
+#: util/errors.c:83
+msgid "trust database error"
+msgstr "usalduse andmebaasi viga"
+
+#: util/errors.c:84
+msgid "bad MPI"
+msgstr "halb MPI"
+
+#: util/errors.c:85
+msgid "resource limit"
+msgstr "ressursi limiit"
+
+#: util/errors.c:86
+msgid "invalid keyring"
+msgstr "vigane v�tmehoidla"
+
+#: util/errors.c:87
+msgid "bad certificate"
+msgstr "halb sertifikaat"
+
+#: util/errors.c:88
+msgid "malformed user id"
+msgstr "vigane kasutaja id"
+
+#: util/errors.c:89
+msgid "file close error"
+msgstr "viga faili sulgemisel"
+
+#: util/errors.c:90
+msgid "file rename error"
+msgstr "viga faili �mber nimetamisel"
+
+#: util/errors.c:91
+msgid "file delete error"
+msgstr "viga faili kustutamisel"
+
+#: util/errors.c:92
+msgid "unexpected data"
+msgstr "ootamatud andmed"
+
+#: util/errors.c:93
+msgid "timestamp conflict"
+msgstr "ajatemplite konflikt"
+
+#: util/errors.c:94
+msgid "unusable pubkey algorithm"
+msgstr "mittekasutatav avaliku v�tme algoritm"
+
+#: util/errors.c:95
+msgid "file exists"
+msgstr "fail on olemas"
+
+#: util/errors.c:96
+msgid "weak key"
+msgstr "n�rk v�ti"
+
+#: util/errors.c:97
+msgid "invalid argument"
+msgstr "vigane argument"
+
+#: util/errors.c:98
+msgid "bad URI"
+msgstr "halb URI"
+
+#: util/errors.c:99
+msgid "unsupported URI"
+msgstr "mittetoetatud URI"
+
+#: util/errors.c:100
+msgid "network error"
+msgstr "v�rgu viga"
+
+#: util/errors.c:102
+msgid "not encrypted"
+msgstr "kr�ptimata"
+
+#: util/errors.c:103
+msgid "not processed"
+msgstr "ei t��deldud"
+
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "halb avalik v�ti"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "halb salajane v�ti"
+
+#: util/logger.c:224
+#, c-format
+msgid "... this is a bug (%s:%d:%s)\n"
+msgstr "... see on viga (%s:%d:%s)\n"
+
+#: util/logger.c:230
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "te leidsite vea ... (%s:%d)\n"
+
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
+#, c-format
+msgid "can't open `%s': %s\n"
+msgstr "`%s' ei saa avada: %s\n"
+
+#: cipher/random.c:324
+#, c-format
+msgid "can't stat `%s': %s\n"
+msgstr "ei �nnestu lugeda `%s' atribuute: %s\n"
+
+#: cipher/random.c:329
+#, c-format
+msgid "`%s' is not a regular file - ignored\n"
+msgstr "`%s' ei ole tavaline fail - ignoreerin\n"
+
+#: cipher/random.c:334
+msgid "note: random_seed file is empty\n"
+msgstr "m�rkus: random_seed fail on t�hi\n"
+
+#: cipher/random.c:340
+msgid "warning: invalid size of random_seed file - not used\n"
+msgstr "hoiatus: vigane random_seed faili suurus - ei kasuta\n"
+
+#: cipher/random.c:348
+#, c-format
+msgid "can't read `%s': %s\n"
+msgstr "`%s' ei saa lugeda: %s\n"
+
+#: cipher/random.c:386
+msgid "note: random_seed file not updated\n"
+msgstr "m�rkus: random_seed faili ei uuendatud\n"
+
+#: cipher/random.c:406
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "`%s' ei saa luua: %s\n"
+
+#: cipher/random.c:413
+#, c-format
+msgid "can't write `%s': %s\n"
+msgstr "`%s' ei saa kirjutada: %s\n"
+
+#: cipher/random.c:416
+#, c-format
+msgid "can't close `%s': %s\n"
+msgstr "`%s' ei saa sulgeda: %s\n"
+
+#: cipher/random.c:427
+#, c-format
+msgid "too many random bits requested; the limit is %d\n"
+msgstr "sooviti liiga palju juhuslikke bitte; piirang on %d\n"
+
+#: cipher/random.c:659
+msgid "WARNING: using insecure random number generator!!\n"
+msgstr "HOIATUS: kasutan ebaturvalist juhuarvude generaatorit!!\n"
+
+#: cipher/random.c:660
+msgid ""
+"The random number generator is only a kludge to let\n"
+"it run - it is in no way a strong RNG!\n"
+"\n"
+"DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
+"\n"
+msgstr ""
+"Juhuarvude generaator on ainult t�hi kest, et programmid\n"
+"k�iks - see EI OLE tugev juhuargude generaator!\n"
+"\n"
+"�RGE KASUTAGE SELLE PROGRAMMI PIILT GENEREERITUD ANDMEID!!\n"
+"\n"
+
+#: cipher/rndlinux.c:142
+#, c-format
+msgid ""
+"\n"
+"Not enough random bytes available. Please do some other work to give\n"
+"the OS a chance to collect more entropy! (Need %d more bytes)\n"
+msgstr ""
+"\n"
+"Juhuslikke baite ei ole piisavalt. Palun tehke arvutiga muid t�id,\n"
+"et anda masinal v�imalust koguda enam entroopiat! (Vajatakse %d baiti)\n"
+
+#: g10/g10.c:216
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@K�sud:\n"
+" "
+
+#: g10/g10.c:218
+msgid "|[file]|make a signature"
+msgstr "|[fail]|loo allkiri"
+
+#: g10/g10.c:219
+msgid "|[file]|make a clear text signature"
+msgstr "|[fail]|loo avateksti allkiri"
+
+#: g10/g10.c:220
+msgid "make a detached signature"
+msgstr "loo eraldiseisev allkiri"
+
+#: g10/g10.c:221
+msgid "encrypt data"
+msgstr "kr�pti andmed"
+
+#: g10/g10.c:222
+msgid "encryption only with symmetric cipher"
+msgstr "kr�ptimine kasutades s�mmeetrilist �iffrit"
+
+#: g10/g10.c:223
+msgid "store only"
+msgstr "salvesta ainult"
+
+#: g10/g10.c:224
+msgid "decrypt data (default)"
+msgstr "dekr�pti andmed (vaikimisi)"
+
+#: g10/g10.c:225
+msgid "verify a signature"
+msgstr "kontrolli allkirja"
+
+#: g10/g10.c:227
+msgid "list keys"
+msgstr "n�ita v�tmeid"
+
+#: g10/g10.c:229
+msgid "list keys and signatures"
+msgstr "n�ita v�tmeid ja allkirju"
+
+#: g10/g10.c:230
+msgid "check key signatures"
+msgstr "kontrolli v�tmete allkirju"
+
+#: g10/g10.c:231
+msgid "list keys and fingerprints"
+msgstr "n�ita v�tmeid ja s�rmej�lgi"
+
+#: g10/g10.c:232
+msgid "list secret keys"
+msgstr "n�ita salajasi v�tmeid"
+
+#: g10/g10.c:233
+msgid "generate a new key pair"
+msgstr "genereeri uus v�tmepaar"
+
+#: g10/g10.c:234
+msgid "remove key from the public keyring"
+msgstr "eemalda v�ti avalike v�tmete hoidlast"
+
+#: g10/g10.c:236
+msgid "remove key from the secret keyring"
+msgstr "eemalda v�ti salajaste v�tmete hoidlast"
+
+#: g10/g10.c:237
+msgid "sign a key"
+msgstr "allkirjasta v�ti"
+
+#: g10/g10.c:238
+msgid "sign a key locally"
+msgstr "allkirjasta v�ti lokaalselt"
+
+#: g10/g10.c:239
+msgid "sign or edit a key"
+msgstr "allkirjasta v�i toimeta v�tit"
+
+#: g10/g10.c:240
+msgid "generate a revocation certificate"
+msgstr "genereeri t�histamise sertifikaat"
+
+#: g10/g10.c:241
+msgid "export keys"
+msgstr "ekspordi v�tmed"
+
+#: g10/g10.c:242
+msgid "export keys to a key server"
+msgstr "ekspordi v�tmed v�tmeserverisse"
+
+#: g10/g10.c:243
+msgid "import keys from a key server"
+msgstr "impordi v�tmed v�tmeserverist"
+
+#: g10/g10.c:247
+msgid "import/merge keys"
+msgstr "impordi/mesti v�tmed"
+
+#: g10/g10.c:249
+msgid "list only the sequence of packets"
+msgstr "n�ita ainult pakettide j�rjendeid"
+
+#: g10/g10.c:251
+msgid "export the ownertrust values"
+msgstr "ekspordi usalduse v��rtused"
+
+#: g10/g10.c:253
+msgid "import ownertrust values"
+msgstr "impordi usalduse v��rtused"
+
+#: g10/g10.c:255
+msgid "update the trust database"
+msgstr "uuenda usalduse andmebaasi"
+
+#: g10/g10.c:257
+msgid "|[NAMES]|check the trust database"
+msgstr "|[NIMED]|kontrolli usalduse andmebaasi"
+
+#: g10/g10.c:258
+msgid "fix a corrupted trust database"
+msgstr "paranda vigane usalduse andmebaas"
+
+#: g10/g10.c:259
+msgid "De-Armor a file or stdin"
+msgstr "Pakenda fail v�i standardsisend lahti"
+
+#: g10/g10.c:261
+msgid "En-Armor a file or stdin"
+msgstr "Pakenda fail v�i standardsisend"
+
+#: g10/g10.c:263
+msgid "|algo [files]|print message digests"
+msgstr "|algo [failid]|tr�ki teatel�hendid"
+
+#: g10/g10.c:267
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"V�tmed:\n"
+" "
+
+#: g10/g10.c:269
+msgid "create ascii armored output"
+msgstr "loo ascii pakendis v�ljund"
+
+#: g10/g10.c:271
+msgid "|NAME|encrypt for NAME"
+msgstr "|NIMI|kr�pti NIMEle"
+
+#: g10/g10.c:274
+msgid "|NAME|use NAME as default recipient"
+msgstr "|NIMI|kasuta NIME vaikimisi saajana"
+
+#: g10/g10.c:276
+msgid "use the default key as default recipient"
+msgstr "kasuta vaikimisi saajana vaikimisi v�tit"
+
+#: g10/g10.c:280
+msgid "use this user-id to sign or decrypt"
+msgstr "kasuta seda kasutaja IDd"
+
+#: g10/g10.c:281
+msgid "|N|set compress level N (0 disables)"
+msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
+
+#: g10/g10.c:283
+msgid "use canonical text mode"
+msgstr "kasuta kanoonilist tekstimoodi"
+
+#: g10/g10.c:284
+msgid "use as output file"
+msgstr "kasuta v�ljundfailina"
+
+#: g10/g10.c:285
+msgid "verbose"
+msgstr "ole jutukas"
+
+#: g10/g10.c:286
+msgid "be somewhat more quiet"
+msgstr "ole m�nev�rra vaiksem"
+
+#: g10/g10.c:287
+msgid "don't use the terminal at all"
+msgstr "�ra kasuta terminali"
+
+#: g10/g10.c:288
+msgid "force v3 signatures"
+msgstr "kasuta v3 allkirju"
+
+#: g10/g10.c:289
+msgid "always use a MDC for encryption"
+msgstr "kr�ptimisel kasuta alati MDC"
+
+#: g10/g10.c:290
+msgid "do not make any changes"
+msgstr "�ra tee mingeid muutuseid"
+
+#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
+#: g10/g10.c:292
+msgid "use the gpg-agent"
+msgstr ""
+
+#: g10/g10.c:293
+msgid "batch mode: never ask"
+msgstr "pakettmood: �ra k�si kunagi"
+
+#: g10/g10.c:294
+msgid "assume yes on most questions"
+msgstr "eelda enamus k�simustele jah vastust"
+
+#: g10/g10.c:295
+msgid "assume no on most questions"
+msgstr "eelda enamus k�simustele ei vastust"
+
+#: g10/g10.c:296
+msgid "add this keyring to the list of keyrings"
+msgstr "lisa see v�tmehoidla v�tmehoidlate nimekirja"
+
+#: g10/g10.c:297
+msgid "add this secret keyring to the list"
+msgstr "lisa see salajaste v�tmete hoidla nimekirja"
+
+#: g10/g10.c:298
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
+
+#: g10/g10.c:299
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr "|HOST|kasuta seda v�tmeserverit"
+
+#: g10/g10.c:300
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|NIMI|terminali kooditabel on NIMI"
+
+#: g10/g10.c:301
+msgid "read options from file"
+msgstr "loe v�tmed failist"
+
+#: g10/g10.c:305
+msgid "|FD|write status info to this FD"
+msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
+
+#: g10/g10.c:310
+msgid "|KEYID|ulimately trust this key"
+msgstr "|V�TMEID|usalda seda v�tit t�ielikult"
+
+#: g10/g10.c:311
+msgid "|FILE|load extension module FILE"
+msgstr "|FAIL|lae laiendusmoodul FAIL"
+
+#: g10/g10.c:312
+msgid "emulate the mode described in RFC1991"
+msgstr "emuleeri dokumendis RFC1991 kirjeldatud moodi"
+
+#: g10/g10.c:313
+msgid "set all packet, cipher and digest options to OpenPGP behavior"
+msgstr "kasuta k�ikides tegevustes OpenPGP v�tmeid"
+
+#: g10/g10.c:314
+msgid "|N|use passphrase mode N"
+msgstr "|N|kasuta parooli moodi N"
+
+#: g10/g10.c:316
+msgid "|NAME|use message digest algorithm NAME for passphrases"
+msgstr "|NIMI|kasuta paroolidega l�hendialgoritmi NIMI"
+
+#: g10/g10.c:318
+msgid "|NAME|use cipher algorithm NAME for passphrases"
+msgstr "|NIMI|kasuta paroolidega �iffri algoritmi NIMI"
+
+#: g10/g10.c:319
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NIMI|kasuta �iffri algoritmi NIMI"
+
+#: g10/g10.c:320
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NIMI|kasuta teatel�hendi algoritmi NIMI"
+
+#: g10/g10.c:321
+msgid "|N|use compress algorithm N"
+msgstr "|N|kasuta pakkimisalgoritmi N"
+
+#: g10/g10.c:322
+msgid "throw keyid field of encrypted packets"
+msgstr "�ra lisa kr�ptimisel v�tme id"
+
+#: g10/g10.c:323
+msgid "|NAME=VALUE|use this notation data"
+msgstr "|NIMI=V��RTUS|kasuta neid noteerimise andmeid"
+
+#: g10/g10.c:326
+msgid ""
+"@\n"
+"(See the man page for a complete listing of all commands and options)\n"
+msgstr ""
+"@\n"
+"(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
+
+#: g10/g10.c:329
+msgid ""
+"@\n"
+"Examples:\n"
+"\n"
+" -se -r Bob [file] sign and encrypt for user Bob\n"
+" --clearsign [file] make a clear text signature\n"
+" --detach-sign [file] make a detached signature\n"
+" --list-keys [names] show keys\n"
+" --fingerprint [names] show fingerprints\n"
+msgstr ""
+"@\n"
+"N�ited:\n"
+"\n"
+" -se -r Bob [fail] allkirjasta ja kr�pti kasutajale Bob\n"
+" --clearsign [fail] loo avateksti allkiri\n"
+" --detach-sign [fail] loo eraldiseisev allkiri\n"
+" --list-keys [nimed] n�ita v�tmeid\n"
+" --fingerprint [nimed] n�ita s�rmej�lgi\n"
+
+#: g10/g10.c:438
+msgid "Please report bugs to <[email protected]>.\n"
+msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
+
+#: g10/g10.c:442
+msgid "Usage: gpg [options] [files] (-h for help)"
+msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
+
+#: g10/g10.c:445
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"sign, check, encrypt or decrypt\n"
+"default operation depends on the input data\n"
+msgstr ""
+"S�ntaks: gpg [v�tmed] [failid]\n"
+"allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
+"vaikimisi operatsioon s�ltub sisendandmetest\n"
+
+#: g10/g10.c:452
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"Toetatud algoritmid:\n"
+
+#: g10/g10.c:531
+msgid "usage: gpg [options] "
+msgstr "kasuta: gpg [v�tmed] "
+
+#: g10/g10.c:584
+msgid "conflicting commands\n"
+msgstr "konfliktsed k�sud\n"
+
+#: g10/g10.c:734
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
+
+#: g10/g10.c:738
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "v�tmete fail `%s': %s\n"
+
+#: g10/g10.c:745
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "loen v�tmeid failist `%s'\n"
+
+#: g10/g10.c:950
+#, c-format
+msgid "%s is not a valid character set\n"
+msgstr "%s ei ole lubatud kooditabel\n"
+
+#: g10/g10.c:1024
+msgid "WARNING: program may create a core file!\n"
+msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
+
+#: g10/g10.c:1028 g10/g10.c:1037
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
+
+#: g10/g10.c:1030
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s ja %s ei ole koos lubatud!\n"
+
+#: g10/g10.c:1033
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s ja %s ei oma koos m�tet!\n"
+
+#: g10/g10.c:1053 g10/g10.c:1065
+msgid "selected cipher algorithm is invalid\n"
+msgstr "valitud �iffri algoritm ei ole lubatud\n"
+
+#: g10/g10.c:1059 g10/g10.c:1071
+msgid "selected digest algorithm is invalid\n"
+msgstr "valitud l�hendi algoritm ei ole lubatud\n"
+
+#: g10/g10.c:1075
+msgid "the given policy URL is invalid\n"
+msgstr "anti vigane poliisi URL\n"
+
+#: g10/g10.c:1078
+#, c-format
+msgid "compress algorithm must be in range %d..%d\n"
+msgstr "pakkimise algoritm peab olema vahemikust %d..%d\n"
+
+#: g10/g10.c:1080
+msgid "completes-needed must be greater than 0\n"
+msgstr "completes-needed peab olema suurem, kui 0\n"
+
+#: g10/g10.c:1082
+msgid "marginals-needed must be greater than 1\n"
+msgstr "marginals-needed peab olema suurem, kui 1\n"
+
+#: g10/g10.c:1084
+msgid "max-cert-depth must be in range 1 to 255\n"
+msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
+
+#: g10/g10.c:1087
+msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
+msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
+
+#: g10/g10.c:1091
+msgid "invalid S2K mode; must be 0, 1 or 3\n"
+msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
+
+#: g10/g10.c:1176
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
+
+#: g10/g10.c:1182
+msgid "--store [filename]"
+msgstr "--store [failinimi]"
+
+#: g10/g10.c:1189
+msgid "--symmetric [filename]"
+msgstr "--symmetric [failinimi]"
+
+#: g10/g10.c:1197
+msgid "--encrypt [filename]"
+msgstr "--encrypt [failinimi]"
+
+#: g10/g10.c:1210
+msgid "--sign [filename]"
+msgstr "--sign [failinimi]"
+
+#: g10/g10.c:1223
+msgid "--sign --encrypt [filename]"
+msgstr "--sign --encrypt [failinimi]"
+
+#: g10/g10.c:1237
+msgid "--clearsign [filename]"
+msgstr "--clearsign [failinimi]"
+
+#: g10/g10.c:1254
+msgid "--decrypt [filename]"
+msgstr "--decrypt [failinimi]"
+
+#: g10/g10.c:1262
+msgid "--sign-key user-id"
+msgstr "--sign-key kasutaja-id"
+
+#: g10/g10.c:1270
+msgid "--lsign-key user-id"
+msgstr "--lsign-key kasutaja-id"
+
+#: g10/g10.c:1278
+msgid "--edit-key user-id [commands]"
+msgstr "--edit-key kasutaja-id [k�sud]"
+
+#: g10/g10.c:1294
+msgid "--delete-secret-key user-id"
+msgstr "--delete-secret-key kasutaja-id"
+
+#: g10/g10.c:1297
+msgid "--delete-key user-id"
+msgstr "--delete-key kasutaja-id"
+
+#: g10/g10.c:1305
+#, fuzzy
+msgid "--delete-secret-and-public-key user-id"
+msgstr "--delete-secret-key kasutaja-id"
+
+#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "%s ei saa avada: %s\n"
+
+#: g10/g10.c:1357
+msgid "-k[v][v][v][c] [user-id] [keyring]"
+msgstr "-k[v][v][v][c] [kasutaja-id] [v�tmehoidla]"
+
+#: g10/g10.c:1423
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "lahtipakendamine eba�nnestus: %s\n"
+
+#: g10/g10.c:1431
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "pakendamine eba�nnestus: %s\n"
+
+#: g10/g10.c:1502
+#, c-format
+msgid "invalid hash algorithm `%s'\n"
+msgstr "vigane teatel�hendi algoritm `%s'\n"
+
+#: g10/g10.c:1589
+msgid "[filename]"
+msgstr "[failinimi]"
+
+#: g10/g10.c:1593
+msgid "Go ahead and type your message ...\n"
+msgstr "Kirjutage n��d oma teade ...\n"
+
+#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
+#, c-format
+msgid "can't open `%s'\n"
+msgstr "`%s' ei saa avada\n"
+
+#: g10/g10.c:1805
+msgid ""
+"the first character of a notation name must be a letter or an underscore\n"
+msgstr "esimene s�mbol noteerimise nimes peab olema t�ht v�i alakriips\n"
+
+#: g10/g10.c:1811
+msgid ""
+"a notation name must have only letters, digits, dots or underscores and end "
+"with an '='\n"
+msgstr ""
+"noteerimise nimes v�ivad olla ainult t�hed, numbrid, punktid ja alakriipsud\n"
+"ning l�pus peab olema '='\n"
+
+#: g10/g10.c:1817
+msgid "dots in a notation name must be surrounded by other characters\n"
+msgstr ""
+"punktid noteerimise nimes peavad olema �mbritsetud teiste s�mbolitega\n"
+
+#: g10/g10.c:1825
+msgid "a notation value must not use any control characters\n"
+msgstr "noteerimise v��rtus ei v�i sisaldada kontroll s�mboleid\n"
+
+#: g10/armor.c:306
+#, c-format
+msgid "armor: %s\n"
+msgstr "pakend: %s\n"
+
+#: g10/armor.c:335
+msgid "invalid armor header: "
+msgstr "vigane pakendi p�is: "
+
+#: g10/armor.c:342
+msgid "armor header: "
+msgstr "pakendi p�is: "
+
+#: g10/armor.c:353
+msgid "invalid clearsig header\n"
+msgstr "vigane avateksti allkirja p�is\n"
+
+#: g10/armor.c:405
+msgid "nested clear text signatures\n"
+msgstr "avateksti allkirjad �ksteise sees\n"
+
+#: g10/armor.c:529
+msgid "invalid dash escaped line: "
+msgstr "vigane kriipsudega m�rgitud rida: "
+
+#: g10/armor.c:541
+msgid "unexpected armor:"
+msgstr "ootamatu pakend:"
+
+#: g10/armor.c:667 g10/armor.c:1235
+#, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "j�tsin vigase radix64 s�mboli %02x vahele\n"
+
+#: g10/armor.c:710
+msgid "premature eof (no CRC)\n"
+msgstr "enneaegne failil�pp (puudub CRC)\n"
+
+#: g10/armor.c:744
+msgid "premature eof (in CRC)\n"
+msgstr "enneaegne failil�pp (poolik CRC)\n"
+
+#: g10/armor.c:748
+msgid "malformed CRC\n"
+msgstr "vigane CRC\n"
+
+#: g10/armor.c:752 g10/armor.c:1272
+#, c-format
+msgid "CRC error; %06lx - %06lx\n"
+msgstr "CRC viga; %06lx - %06lx\n"
+
+#: g10/armor.c:772
+msgid "premature eof (in Trailer)\n"
+msgstr "enneaegne failil�pp (l�petaval real)\n"
+
+#: g10/armor.c:776
+msgid "error in trailer line\n"
+msgstr "viga l�petaval real\n"
+
+#: g10/armor.c:922
+msgid "For info see http://www.gnupg.org"
+msgstr "Infot saate lehelt http://www.gnupg.org"
+
+#: g10/armor.c:1050
+msgid "no valid OpenPGP data found.\n"
+msgstr "OpenPGP andmeid pole.\n"
+
+#: g10/armor.c:1055
+#, 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:1059
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
+msgstr ""
+"kvooditud s�mbol pakendis - t�en�oliselt on kasutatud vigast MTA programmi\n"
+
+#. Translators: this shoud fit into 24 bytes to that the fingerprint
+#. * data is properly aligned with the user ID
+#: g10/keyedit.c:1190 g10/pkclist.c:53
+msgid " Fingerprint:"
+msgstr " S�rmej�lg:"
+
+#: g10/pkclist.c:80
+msgid "Fingerprint:"
+msgstr "S�rmej�lg:"
+
+#: g10/pkclist.c:116
+msgid "No reason specified"
+msgstr "P�hjus puudub"
+
+#: g10/pkclist.c:118
+msgid "Key is superseded"
+msgstr "V�ti on asendatud"
+
+#: g10/pkclist.c:120
+msgid "Key has been compromised"
+msgstr "V�ti on kompromiteeritud"
+
+#: g10/pkclist.c:122
+msgid "Key is no longer used"
+msgstr "V�ti ei ole enam kasutusel"
+
+#: g10/pkclist.c:124
+msgid "User ID is no longer valid"
+msgstr "Kasutaja ID ei ole enam kehtiv"
+
+#: g10/pkclist.c:128
+msgid "Reason for revocation: "
+msgstr "T�histamise p�hjus: "
+
+#: g10/pkclist.c:145
+msgid "Revocation comment: "
+msgstr "T�histamise kommentaar: "
+
+#. a string with valid answers
+#: g10/pkclist.c:303
+msgid "sSmMqQ"
+msgstr "iImMvV"
+
+#: g10/pkclist.c:307
+#, c-format
+msgid ""
+"No trust value assigned to %lu:\n"
+"%4u%c/%08lX %s \""
+msgstr ""
+"%lu usalduse v��rtus puudub:\n"
+"%4u%c/%08lX %s \""
+
+#: g10/pkclist.c:319
+msgid ""
+"Please decide how far you trust this user to correctly\n"
+"verify other users' keys (by looking at passports,\n"
+"checking fingerprints from different sources...)?\n"
+"\n"
+" 1 = Don't know\n"
+" 2 = I do NOT trust\n"
+" 3 = I trust marginally\n"
+" 4 = I trust fully\n"
+" s = please show me more information\n"
+msgstr ""
+"Palun otsustage, kuiv�rd te usaldate seda kasutajat\n"
+"teiste kasutajate v�tmete kontrollimisel.\n"
+"\n"
+" 1 = Ma ei tea\n"
+" 2 = Ma EI usalda\n"
+" 3 = Ma usaldan m�neti\n"
+" 4 = Ma usaldan t�iesti\n"
+" i = palun n�ita mulle veel informatsiooni\n"
+
+#: g10/pkclist.c:328
+msgid " m = back to the main menu\n"
+msgstr " m = tagasi p�himen��sse\n"
+
+#: g10/pkclist.c:330
+msgid " q = quit\n"
+msgstr " v = v�lju\n"
+
+#: g10/pkclist.c:336
+msgid "Your decision? "
+msgstr "Teie otsus? "
+
+#: g10/pkclist.c:358
+msgid "Certificates leading to an ultimately trusted key:\n"
+msgstr "Sertifikaadid t�iesti usaldatava v�tmeni:\n"
+
+#: g10/pkclist.c:429
+msgid ""
+"Could not find a valid trust path to the key. Let's see whether we\n"
+"can assign some missing owner trust values.\n"
+"\n"
+msgstr ""
+"Ei leia kehtivat usaldusteed teie v�tmeni. Vaatame, kas on\n"
+"v�imalik lisada m�ni puuduv usalduse v��rtus.\n"
+"\n"
+
+#: g10/pkclist.c:435
+msgid ""
+"No path leading to one of our keys found.\n"
+"\n"
+msgstr ""
+"Ei leia teed �he meie v�tmeni.\n"
+"\n"
+
+#: g10/pkclist.c:437
+msgid ""
+"No certificates with undefined trust found.\n"
+"\n"
+msgstr ""
+"M��ramata usaldusev��rtusega sertifikaate pole.\n"
+"\n"
+
+#: g10/pkclist.c:439
+msgid ""
+"No trust values changed.\n"
+"\n"
+msgstr ""
+"Usalduse v��rtust ei muudetud.\n"
+"\n"
+
+#: g10/pkclist.c:457
+#, c-format
+msgid "key %08lX: key has been revoked!\n"
+msgstr "v�ti %08lX: v�ti on t�histatud!\n"
+
+#: g10/pkclist.c:464 g10/pkclist.c:476 g10/pkclist.c:598
+msgid "Use this key anyway? "
+msgstr "Kasutan seda v�tit ikka? "
+
+#: g10/pkclist.c:469
+#, c-format
+msgid "key %08lX: subkey has been revoked!\n"
+msgstr "v�ti %08lX: alamv�ti on t�histatud!\n"
+
+#: g10/pkclist.c:512
+#, c-format
+msgid "%08lX: key has expired\n"
+msgstr "%08lX: v�ti on aegunud\n"
+
+#: g10/pkclist.c:518
+#, c-format
+msgid "%08lX: no info to calculate a trust probability\n"
+msgstr "%08lX: usaldusv��rsuse arvutamiseks napib infot\n"
+
+#: g10/pkclist.c:533
+#, c-format
+msgid "%08lX: We do NOT trust this key\n"
+msgstr "%08lX: Me EI usalda seda v�tit\n"
+
+#: g10/pkclist.c:539
+#, c-format
+msgid ""
+"%08lX: It is not sure that this key really belongs to the owner\n"
+"but it is accepted anyway\n"
+msgstr ""
+"%08lX: Ei ole kindel, et see v�ti t�esti kuulub omanikule,\n"
+"aktsepteerime seda siiski\n"
+
+#: g10/pkclist.c:545
+msgid "This key probably belongs to the owner\n"
+msgstr "See v�ti kuulub ilmselt omanikule\n"
+
+#: g10/pkclist.c:550
+msgid "This key belongs to us\n"
+msgstr "See v�ti kuulub meile\n"
+
+#: g10/pkclist.c:593
+msgid ""
+"It is NOT certain that the key belongs to its owner.\n"
+"If you *really* know what you are doing, you may answer\n"
+"the next question with yes\n"
+"\n"
+msgstr ""
+"EI ole kindel, et see v�ti kuulub tema omanikule.\n"
+"Kui te *t�esti* teate, mida te teete, v�ite j�rgnevale\n"
+"k�simusele vastata jaatavalt\n"
+"\n"
+
+#: g10/pkclist.c:607 g10/pkclist.c:630
+msgid "WARNING: Using untrusted key!\n"
+msgstr "HOIATUS: Kasutan mitteusaldatavat v�tit!\n"
+
+#: g10/pkclist.c:651
+msgid "WARNING: This key has been revoked by its owner!\n"
+msgstr "HOIATUS: See v�ti on omaniku poolt t�histatud!\n"
+
+#: g10/pkclist.c:652
+msgid " This could mean that the signature is forgery.\n"
+msgstr " See v�ib t�hendada, et allkiri on v�ltsing.\n"
+
+#: g10/pkclist.c:657
+msgid "WARNING: This subkey has been revoked by its owner!\n"
+msgstr "HOIATUS: See alamv�ti on omaniku poolt t�histatud!\n"
+
+#: g10/pkclist.c:679
+msgid "Note: This key has expired!\n"
+msgstr "M�rkus: See v�ti on aegunud!\n"
+
+#: g10/pkclist.c:687
+msgid "WARNING: This key is not certified with a trusted signature!\n"
+msgstr "HOIATUS: seda v�tit ei ole sertifitseeritud usaldatava allkirjaga\n"
+
+#: g10/pkclist.c:689
+msgid ""
+" There is no indication that the signature belongs to the owner.\n"
+msgstr " Ei ole midagi, mis n�itaks, et allkiri kuulub omanikule.\n"
+
+#: g10/pkclist.c:706
+msgid "WARNING: We do NOT trust this key!\n"
+msgstr "HOIATUS: Me EI usalda seda v�tit!\n"
+
+#: g10/pkclist.c:707
+msgid " The signature is probably a FORGERY.\n"
+msgstr " Allkiri on t�en�oliselt V�LTSING.\n"
+
+#: g10/pkclist.c:714
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgstr ""
+"HOIATUS: Seda v�tit ei ole sertifitseerinud piisavalt usaldatav allkiri!\n"
+
+#: g10/pkclist.c:717
+msgid " It is not certain that the signature belongs to the owner.\n"
+msgstr " Ei ole kindel, et allkiri kuulub omanikule.\n"
+
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
+#, c-format
+msgid "%s: skipped: %s\n"
+msgstr "%s: j�tsin vahele: %s\n"
+
+#: g10/pkclist.c:826 g10/pkclist.c:993
+#, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: j�tsin vahele: avalik v�ti on juba olemas\n"
+
+#: g10/pkclist.c:853
+msgid ""
+"You did not specify a user ID. (you may use \"-r\")\n"
+"\n"
+msgstr ""
+"Te ei m��ranud kasutaja IDd. (te v�ite kasutada v�tit \"-r\")\n"
+"\n"
+
+#: g10/pkclist.c:863
+msgid "Enter the user ID: "
+msgstr "Sisestage kasutaja ID: "
+
+#: g10/pkclist.c:875
+msgid "No such user ID.\n"
+msgstr "Sellist kasutaja ID pole.\n"
+
+#: g10/pkclist.c:880
+msgid "skipped: public key already set as default recipient\n"
+msgstr "j�tsin vahele: avalik v�ti on juba vaikimisi saaja\n"
+
+#: g10/pkclist.c:903
+msgid "Public key is disabled.\n"
+msgstr "Avalik v�ti on blokeeritud.\n"
+
+#: g10/pkclist.c:910
+msgid "skipped: public key already set with --encrypt-to\n"
+msgstr "j�tsin vahele: avalik v�ti on juba seatud v�tmega --encrypt-to\n"
+
+#: g10/pkclist.c:941
+#, c-format
+msgid "unknown default recipient `%s'\n"
+msgstr "tundmatu vaikimisi saaja `%s'\n"
+
+#: g10/pkclist.c:974
+#, c-format
+msgid "%s: error checking key: %s\n"
+msgstr "%s: viga v�tme kontrollimisel: %s\n"
+
+#: g10/pkclist.c:979
+#, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr "%s: j�tsin vahele: avalik v�ti on blokeeritud\n"
+
+#: g10/pkclist.c:1017
+msgid "no valid addressees\n"
+msgstr "kehtivaid aadresse pole\n"
+
+#: g10/keygen.c:176
+msgid "writing self signature\n"
+msgstr "kirjutan iseenda allkirja\n"
+
+#: g10/keygen.c:217
+msgid "writing key binding signature\n"
+msgstr "kirjutan v�tit siduva allkirja\n"
+
+#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
+#, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr "vigane v�tme suurus; kasutan %u bitti\n"
+
+#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
+#, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr "v�tme suurus �mardatud �les %u bitini\n"
+
+#: g10/keygen.c:549
+msgid "Please select what kind of key you want:\n"
+msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
+
+#: g10/keygen.c:551
+#, c-format
+msgid " (%d) DSA and ElGamal (default)\n"
+msgstr " (%d) DSA ja ElGamal (vaikimisi)\n"
+
+#: g10/keygen.c:552
+#, c-format
+msgid " (%d) DSA (sign only)\n"
+msgstr " (%d) DSA (ainult allkirjastamiseks)\n"
+
+#: g10/keygen.c:554
+#, c-format
+msgid " (%d) ElGamal (encrypt only)\n"
+msgstr " (%d) ElGamal (ainult kr�ptimiseks)\n"
+
+#: g10/keygen.c:555
+#, c-format
+msgid " (%d) ElGamal (sign and encrypt)\n"
+msgstr " (%d) ElGamal (allkirjastamiseks ja kr�ptimiseks)\n"
+
+#: g10/keygen.c:557
+#, c-format
+msgid " (%d) RSA (sign and encrypt)\n"
+msgstr " (%d) RSA (allkirjastamiseks ja kr�ptimiseks)\n"
+
+#: g10/keygen.c:561
+msgid "Your selection? "
+msgstr "Teie valik? "
+
+#: g10/keygen.c:572
+msgid "Do you really want to create a sign and encrypt key? "
+msgstr "Kas te soovite t�esti luua allkirjastamise ja kr�ptimise v�tit? "
+
+#: g10/keygen.c:580
+msgid "The use of this algorithm is deprecated - create anyway? "
+msgstr ""
+
+#: g10/keygen.c:594
+msgid "Invalid selection.\n"
+msgstr "Vigane valik.\n"
+
+#: g10/keygen.c:606
+#, c-format
+msgid ""
+"About to generate a new %s keypair.\n"
+" minimum keysize is 768 bits\n"
+" default keysize is 1024 bits\n"
+" highest suggested keysize is 2048 bits\n"
+msgstr ""
+"Enne uue %s v�tmepaari genereerimist.\n"
+" minimaalne v�tmepikkus on 768 bitti\n"
+" vaikimisi v�tmepikkus on 1024 bitti\n"
+" suurim soovitatav v�tmepikkus on 2048 bitti\n"
+
+#: g10/keygen.c:613
+msgid "What keysize do you want? (1024) "
+msgstr "Millist v�tmepikkust te soovite? (1024) "
+
+#: g10/keygen.c:618
+msgid "DSA only allows keysizes from 512 to 1024\n"
+msgstr "DSA lubab v�tmepikkuseid ainult alates 512 kuni 1024\n"
+
+#: g10/keygen.c:620
+msgid "keysize too small; 768 is smallest value allowed.\n"
+msgstr "v�tmepikkus on liiga v�ike; 768 on v�ikseim lubatud v��rtus.\n"
+
+#: g10/keygen.c:622
+msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+msgstr "v�tmepikkus on liiga v�ike; RSA korral on v�ikseim v��rtus 1024.\n"
+
+#. It is ridiculous and an annoyance to use larger key sizes!
+#. * GnuPG can handle much larger sizes; but it takes an eternity
+#. * to create such a key (but less than the time the Sirius
+#. * Computer Corporation needs to process one of the usual
+#. * complaints) and {de,en}cryption although needs some time.
+#. * So, before you complain about this limitation, I suggest that
+#. * you start a discussion with Marvin about this theme and then
+#. * do whatever you want.
+#: g10/keygen.c:633
+#, c-format
+msgid "keysize too large; %d is largest value allowed.\n"
+msgstr "v�rmepikkus on liiga suur; suurim lubatud v��rtus on %d.\n"
+
+#: g10/keygen.c:638
+msgid ""
+"Keysizes larger than 2048 are not suggested because\n"
+"computations take REALLY long!\n"
+msgstr ""
+"Suuremad v�tmepikkused kui 2048 ei ole soovitatavad, kuna\n"
+"arvutused v�tavad V�GA palju aega!\n"
+
+#: g10/keygen.c:641
+msgid "Are you sure that you want this keysize? "
+msgstr "Olete kindel, et soovite sellist v�tmepikkust? "
+
+#: g10/keygen.c:642
+msgid ""
+"Okay, but keep in mind that your monitor and keyboard radiation is also very "
+"vulnerable to attacks!\n"
+msgstr ""
+"Olgu, kuid pidage meeles, et ka teie monitor ja klaviatuur on samuti\n"
+"v�imalikud r�ndeobjektid!\n"
+
+#: g10/keygen.c:650
+msgid "Do you really need such a large keysize? "
+msgstr "Kas te t�esti soovite nii pikka v�tit? "
+
+#: g10/keygen.c:656
+#, c-format
+msgid "Requested keysize is %u bits\n"
+msgstr "Soovitud v�tmepikkus on %u bitti\n"
+
+#: g10/keygen.c:659 g10/keygen.c:663
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "�mardatud �les %u bitini\n"
+
+#: g10/keygen.c:711
+msgid ""
+"Please specify how long the key should be valid.\n"
+" 0 = key does not expire\n"
+" <n> = key expires in n days\n"
+" <n>w = key expires in n weeks\n"
+" <n>m = key expires in n months\n"
+" <n>y = key expires in n years\n"
+msgstr ""
+"Palun m��rake, kui kaua on v�ti kehtiv.\n"
+" 0 = v�ti ei aegu\n"
+" <n> = v�ti aegub n p�evaga\n"
+" <n>w = v�ti aegub n n�dalaga\n"
+" <n>m = v�ti aegub n kuuga\n"
+" <n>y = v�ti aegub n aastaga\n"
+
+#: g10/keygen.c:726
+msgid "Key is valid for? (0) "
+msgstr "V�ti on kehtiv kuni? (0) "
+
+#: g10/keygen.c:731
+msgid "invalid value\n"
+msgstr "vigane v��rtus\n"
+
+#: g10/keygen.c:736
+msgid "Key does not expire at all\n"
+msgstr "V�ti ei aegu kunagi\n"
+
+#. print the date when the key expires
+#: g10/keygen.c:742
+#, c-format
+msgid "Key expires at %s\n"
+msgstr "V�ti aegub %s\n"
+
+#: g10/keygen.c:745
+msgid ""
+"Your system can't display dates beyond 2038.\n"
+"However, it will be correctly handled up to 2106.\n"
+msgstr ""
+"Teie s�steem ei saa esitada kuup�evi peale aastat 2038.\n"
+"Siiski k�sitletakse neid korrektselt aastani 2106.\n"
+
+#: g10/keygen.c:750
+msgid "Is this correct (y/n)? "
+msgstr "On see �ige (j/e)? "
+
+#: g10/keygen.c:793
+msgid ""
+"\n"
+"You need a User-ID to identify your key; the software constructs the user "
+"id\n"
+"from Real Name, Comment and Email Address in this form:\n"
+" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
+"\n"
+msgstr ""
+"\n"
+"V�tme identifitseerimiseks on vaja m��rata kasutaja; tarkvara konstrueerib\n"
+"kasutaja id kasutades p�risnime, kommentaari ja e-posti aadressi kujul:\n"
+" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
+"\n"
+
+#: g10/keygen.c:805
+msgid "Real name: "
+msgstr "P�risnimi: "
+
+#: g10/keygen.c:813
+msgid "Invalid character in name\n"
+msgstr "Lubamatu s�mbol nimes\n"
+
+#: g10/keygen.c:815
+msgid "Name may not start with a digit\n"
+msgstr "Nimi ei v�i alata numbriga\n"
+
+#: g10/keygen.c:817
+msgid "Name must be at least 5 characters long\n"
+msgstr "Nimes peab olema v�hemalt 5 s�mbolit\n"
+
+#: g10/keygen.c:825
+msgid "Email address: "
+msgstr "E-posti aadress: "
+
+#: g10/keygen.c:836
+msgid "Not a valid email address\n"
+msgstr "See ei ole kehtiv e-posti aadress\n"
+
+#: g10/keygen.c:844
+msgid "Comment: "
+msgstr "Kommentaar: "
+
+#: g10/keygen.c:850
+msgid "Invalid character in comment\n"
+msgstr "Lubamatu s�mbol kommentaaris\n"
+
+#: g10/keygen.c:873
+#, c-format
+msgid "You are using the `%s' character set.\n"
+msgstr "Te kasutate kooditabelit `%s'.\n"
+
+#: g10/keygen.c:879
+#, c-format
+msgid ""
+"You selected this USER-ID:\n"
+" \"%s\"\n"
+"\n"
+msgstr ""
+"Te valisite selle KASUTAJA-ID:\n"
+" \"%s\"\n"
+"\n"
+
+#: g10/keygen.c:883
+msgid "Please don't put the email address into the real name or the comment\n"
+msgstr "�rge palun kirjutage e-posti aadressi p�risnimesse ega kommentaari\n"
+
+#: g10/keygen.c:888
+msgid "NnCcEeOoQq"
+msgstr "NnKkEeOoVv"
+
+#: g10/keygen.c:898
+msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
+msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (V)�lju? "
+
+#: g10/keygen.c:899
+msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
+msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (O)k/(V)�lju? "
+
+#: g10/keygen.c:918
+msgid "Please correct the error first\n"
+msgstr "Palun parandage k�igepealt viga\n"
+
+#: g10/keygen.c:956
+msgid ""
+"You need a Passphrase to protect your secret key.\n"
+"\n"
+msgstr ""
+"Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
+"\n"
+
+#: g10/keyedit.c:469 g10/keygen.c:964
+msgid "passphrase not correctly repeated; try again.\n"
+msgstr "parooli ei korratud �ieti; proovige uuesti.\n"
+
+#: g10/keygen.c:970
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"I will do it anyway. You can change your passphrase at any time,\n"
+"using this program with the option \"--edit-key\".\n"
+"\n"
+msgstr ""
+"Te ei soovi parooli - see on t�en�oliselt *halb* idee!\n"
+"Ma siiski t�idan teie soovi. Te saate oma parooli alati muuta,\n"
+"kasutades seda programmi v�tmega \"--edit-key\".\n"
+"\n"
+
+#: g10/keygen.c:991
+msgid ""
+"We need to generate a lot of random bytes. It is a good idea to perform\n"
+"some other action (type on the keyboard, move the mouse, utilize the\n"
+"disks) during the prime generation; this gives the random number\n"
+"generator a better chance to gain enough entropy.\n"
+msgstr ""
+"Me peame genereerima palju juhuslikke baite. Praegu oleks hea teostada\n"
+"arvutil mingeid teisi tegevusi (kirjutada klaviatuuril, liigutada hiirt,\n"
+"kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
+"koguda paremat entroopiat.\n"
+
+#: g10/keygen.c:1440
+msgid "DSA keypair will have 1024 bits.\n"
+msgstr "DSA v�tmepaari pikkuseks saab 1024 bitti.\n"
+
+#: g10/keygen.c:1483
+msgid "Key generation canceled.\n"
+msgstr "V�tme genereerimine katkestati.\n"
+
+#: g10/keygen.c:1581
+#, c-format
+msgid "writing public key to `%s'\n"
+msgstr "kirjutan avaliku v�tme faili `%s'\n"
+
+#: g10/keygen.c:1582
+#, c-format
+msgid "writing secret key to `%s'\n"
+msgstr "kirjutan salajase v�tme faili `%s'\n"
+
+#: g10/keygen.c:1679
+msgid "public and secret key created and signed.\n"
+msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
+
+#: g10/keygen.c:1684
+msgid ""
+"Note that this key cannot be used for encryption. You may want to use\n"
+"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
+msgstr ""
+"Pidage silmas, et seda v�tit ei saa kasutada kr�ptimiseks. \n"
+"Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
+"kasutades v�tit \"--edit-key\".\n"
+
+#: g10/keygen.c:1701 g10/keygen.c:1807
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr "V�tme genereerimine eba�nnestus: %s\n"
+
+#: g10/keygen.c:1748 g10/sig-check.c:315 g10/sign.c:112
+#, c-format
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
+msgstr "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
+
+#: g10/keygen.c:1750 g10/sig-check.c:317 g10/sign.c:114
+#, c-format
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
+msgstr "v�ti loodi %lu sekundit tulevikus (ajah�pe v�i kella probleem)\n"
+
+#: g10/keygen.c:1783
+msgid "Really create? "
+msgstr "Loon t�esti? "
+
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
+#: g10/tdbio.c:515
+#, c-format
+msgid "%s: can't open: %s\n"
+msgstr "%s: ei saa avada: %s\n"
+
+#: g10/encode.c:113
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: g10/encode.c:171 g10/encode.c:327
+#, c-format
+msgid "%s: WARNING: empty file\n"
+msgstr "%s: HOIATUS: t�hi fail\n"
+
+#: g10/encode.c:274
+#, c-format
+msgid "reading from `%s'\n"
+msgstr "loen failist `%s'\n"
+
+#: g10/encode.c:497
+#, c-format
+msgid "%s/%s encrypted for: %s\n"
+msgstr "%s/%s kr�ptitud kasutajale: %s\n"
+
+#: g10/export.c:153
+#, c-format
+msgid "%s: user not found: %s\n"
+msgstr "%s: kasutajat ei leitud: %s\n"
+
+#: g10/export.c:162
+#, c-format
+msgid "certificate read problem: %s\n"
+msgstr "probleem sertifikaadi lugemisel: %s\n"
+
+#: g10/export.c:171
+#, c-format
+msgid "key %08lX: not a rfc2440 key - skipped\n"
+msgstr "v�ti %08lX: ei ole rfc2440 v�ti - j�tsin vahele\n"
+
+#: g10/export.c:182
+#, c-format
+msgid "key %08lX: not protected - skipped\n"
+msgstr "v�ti %08lX: ei ole kaitstud - j�tsin vahele\n"
+
+#: g10/export.c:236
+msgid "WARNING: nothing exported\n"
+msgstr "HOIATUS: midagi ei eksporditud\n"
+
+#: g10/getkey.c:214
+msgid "too many entries in pk cache - disabled\n"
+msgstr "avalike v�tmete puhvris on liiga palju v�tmeid - blokeerin\n"
+
+#: g10/getkey.c:449
+msgid "too many entries in unk cache - disabled\n"
+msgstr "unk puhvris on liiga palju elemente - blokeerin\n"
+
+#: g10/getkey.c:2203
+#, c-format
+msgid "using secondary key %08lX instead of primary key %08lX\n"
+msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
+
+#: g10/getkey.c:2245 g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "v�ti %08lX: salajane v�ti avaliku v�tmeta - j�tsin vahele\n"
+
+#: g10/getkey.c:2532
+msgid "[User id not found]"
+msgstr "[Kasutaja id ei leitud]"
+
+#: g10/import.c:184
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "j�tan bloki t��biga %d vahele\n"
+
+#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
+#, c-format
+msgid "%lu keys so far processed\n"
+msgstr "%lu v�tit on seni t��deldud\n"
+
+#: g10/import.c:196
+#, c-format
+msgid "error reading `%s': %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: g10/import.c:206
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "T��deldud kokku: %lu\n"
+
+#: g10/import.c:208
+#, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " vahele j�etud uusi v�tmeid: %lu\n"
+
+#: g10/import.c:211
+#, c-format
+msgid " w/o user IDs: %lu\n"
+msgstr " puudub kasutaja ID: %lu\n"
+
+#: g10/import.c:213
+#, c-format
+msgid " imported: %lu"
+msgstr " imporditud: %lu"
+
+#: g10/import.c:219
+#, c-format
+msgid " unchanged: %lu\n"
+msgstr " muutmata: %lu\n"
+
+#: g10/import.c:221
+#, c-format
+msgid " new user IDs: %lu\n"
+msgstr " uusi kasutajaid: %lu\n"
+
+#: g10/import.c:223
+#, c-format
+msgid " new subkeys: %lu\n"
+msgstr " uusi alamv�tmeid: %lu\n"
+
+#: g10/import.c:225
+#, c-format
+msgid " new signatures: %lu\n"
+msgstr " uusi allkirju: %lu\n"
+
+#: g10/import.c:227
+#, c-format
+msgid " new key revocations: %lu\n"
+msgstr " uusi t�histamisi: %lu\n"
+
+#: g10/import.c:229
+#, c-format
+msgid " secret keys read: %lu\n"
+msgstr " loetud salajasi v�tmeid: %lu\n"
+
+#: g10/import.c:231
+#, c-format
+msgid " secret keys imported: %lu\n"
+msgstr " salajasi v�tmeid imporditud: %lu\n"
+
+#: g10/import.c:233
+#, c-format
+msgid " secret keys unchanged: %lu\n"
+msgstr " muutmata salajasi v�tmeid: %lu\n"
+
+#: g10/import.c:408 g10/import.c:617
+#, c-format
+msgid "key %08lX: no user ID\n"
+msgstr "v�ti %08lX: kasutaja ID puudub\n"
+
+#: g10/import.c:422
+#, c-format
+msgid "key %08lX: no valid user IDs\n"
+msgstr "v�ti %08lX: puudub kehtiv kasutaja ID\n"
+
+#: g10/import.c:424
+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:435 g10/import.c:684
+#, c-format
+msgid "key %08lX: public key not found: %s\n"
+msgstr "v�ti %08lX: avalikku v�tit ei leitud: %s\n"
+
+#: g10/import.c:440
+#, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
+
+#: g10/import.c:448
+msgid "no default public keyring\n"
+msgstr "puudub avalike v�tmete vaikimisi v�tmehoidla\n"
+
+#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
+#, c-format
+msgid "writing to `%s'\n"
+msgstr "kirjutan faili `%s'\n"
+
+#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
+#, c-format
+msgid "can't lock keyring `%s': %s\n"
+msgstr "v�tmehoidlat `%s' ei saa lukustada: %s\n"
+
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
+#, c-format
+msgid "error writing keyring `%s': %s\n"
+msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
+
+#: g10/import.c:463
+#, c-format
+msgid "key %08lX: public key imported\n"
+msgstr "v�ti %08lX: avalik v�ti on imporditud\n"
+
+#: g10/import.c:480
+#, c-format
+msgid "key %08lX: doesn't match our copy\n"
+msgstr "v�ti %08lX: ei sobi meie koopiaga\n"
+
+#: g10/import.c:489 g10/import.c:692
+#, c-format
+msgid "key %08lX: can't locate original keyblock: %s\n"
+msgstr "v�ti %08lX: ei leia algset v�tmeblokki: %s\n"
+
+#: g10/import.c:495 g10/import.c:698
+#, c-format
+msgid "key %08lX: can't read original keyblock: %s\n"
+msgstr "v�ti %08lX: ei saa lugeda algset v�tmeblokki: %s\n"
+
+#: g10/import.c:522
+#, c-format
+msgid "key %08lX: 1 new user ID\n"
+msgstr "v�ti %08lX: 1 uus kasutaja ID\n"
+
+#: g10/import.c:525
+#, c-format
+msgid "key %08lX: %d new user IDs\n"
+msgstr "v�ti %08lX: %d uut kasutaja IDd\n"
+
+#: g10/import.c:528
+#, c-format
+msgid "key %08lX: 1 new signature\n"
+msgstr "v�ti %08lX: 1 uus allkiri\n"
+
+#: g10/import.c:531
+#, c-format
+msgid "key %08lX: %d new signatures\n"
+msgstr "v�ti %08lX: %d uut allkirja\n"
+
+#: g10/import.c:534
+#, c-format
+msgid "key %08lX: 1 new subkey\n"
+msgstr "v�ti %08lX: 1 uus alamv�ti\n"
+
+#: g10/import.c:537
+#, c-format
+msgid "key %08lX: %d new subkeys\n"
+msgstr "v�ti %08lX: %d uut alamv�tit\n"
+
+#: g10/import.c:547
+#, c-format
+msgid "key %08lX: not changed\n"
+msgstr "v�ti %08lX: ei muudetud\n"
+
+#: g10/import.c:610
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:640
+#, c-format
+msgid "key %08lX: secret key imported\n"
+msgstr "v�ti %08lX: salajane v�ti on imporditud\n"
+
+#. we can't merge secret keys
+#: g10/import.c:644
+#, c-format
+msgid "key %08lX: already in secret keyring\n"
+msgstr "v�ti %08lX: on juba salajaste v�tmete hoidlas\n"
+
+#: g10/import.c:649
+#, c-format
+msgid "key %08lX: secret key not found: %s\n"
+msgstr "v�ti %08lX: salajast v�tit ei leitud: %s\n"
+
+#: g10/import.c:678
+#, c-format
+msgid "key %08lX: 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:709
+#, c-format
+msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
+msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - l�kkasin tagasi\n"
+
+#: g10/import.c:741
+#, c-format
+msgid "key %08lX: revocation certificate imported\n"
+msgstr "v�ti %08lX: t�histamise sertifikaat imporditud\n"
+
+#: g10/import.c:783
+#, c-format
+msgid "key %08lX: no user ID for signature\n"
+msgstr "v�ti %08lX: allkirjal puudub kasutaja ID\n"
+
+#: g10/import.c:790 g10/import.c:814
+#, c-format
+msgid "key %08lX: unsupported public key algorithm\n"
+msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
+
+#: g10/import.c:791
+#, c-format
+msgid "key %08lX: invalid self-signature\n"
+msgstr "v�ti %08lX: vigane iseenda allkiri\n"
+
+#: g10/import.c:806
+#, c-format
+msgid "key %08lX: no subkey for key binding\n"
+msgstr "v�ti %08lX: v�tmeseosel puudub alamv�ti\n"
+
+#: g10/import.c:815
+#, c-format
+msgid "key %08lX: invalid subkey binding\n"
+msgstr "v�ti %08lX: vigane alamv�tme seos\n"
+
+#: g10/import.c:842
+#, c-format
+msgid "key %08lX: accepted non self-signed user ID '"
+msgstr "v�ti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '"
+
+#: g10/import.c:871
+#, c-format
+msgid "key %08lX: skipped user ID '"
+msgstr "v�ti %08lX: j�tsin vahele kasutaja ID '"
+
+#: g10/import.c:894
+#, c-format
+msgid "key %08lX: skipped subkey\n"
+msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
+
+#. here we violate the rfc a bit by still allowing
+#. * 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:919
+#, c-format
+msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
+msgstr "v�ti %08lX: mitte eksporditav allkiri (klass %02x) - j�tan vahele\n"
+
+#: g10/import.c:928
+#, c-format
+msgid "key %08lX: revocation certificate at wrong place - skipped\n"
+msgstr "v�ti %08lX: t�histamise sertifikaat on vales kohas - j�tan vahele\n"
+
+#: g10/import.c:936
+#, c-format
+msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
+msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - j�tan vahele\n"
+
+#: g10/import.c:1036
+#, c-format
+msgid "key %08lX: duplicated user ID detected - merged\n"
+msgstr "v�ti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
+
+#: g10/import.c:1088
+#, c-format
+msgid "key %08lX: revocation certificate added\n"
+msgstr "v�ti %08lX: t�histamise sertifikaat lisatud\n"
+
+#: g10/import.c:1202 g10/import.c:1255
+#, c-format
+msgid "key %08lX: our copy has no self-signature\n"
+msgstr "v�ti %08lX: meie koopial puudub iseenda allkiri\n"
+
+#: g10/delkey.c:67 g10/keyedit.c:94
+#, c-format
+msgid "%s: user not found\n"
+msgstr "%s: kasutajat ei leitud\n"
+
+#: g10/keyedit.c:156
+msgid "[revocation]"
+msgstr "[t�histamine]"
+
+#: g10/keyedit.c:157
+msgid "[self-signature]"
+msgstr "[iseenda allkiri]"
+
+#: g10/keyedit.c:221
+msgid "1 bad signature\n"
+msgstr "1 halb allkiri\n"
+
+#: g10/keyedit.c:223
+#, c-format
+msgid "%d bad signatures\n"
+msgstr "%d halba allkirja\n"
+
+#: g10/keyedit.c:225
+msgid "1 signature not checked due to a missing key\n"
+msgstr "1 allkiri j�i testimata, kuna v�ti puudub\n"
+
+#: g10/keyedit.c:227
+#, c-format
+msgid "%d signatures not checked due to missing keys\n"
+msgstr "%d allkirja j�i testimata, kuna v�tmed puuduvad\n"
+
+#: g10/keyedit.c:229
+msgid "1 signature not checked due to an error\n"
+msgstr "1 allkiri j�i vea t�ttu kontrollimata\n"
+
+#: g10/keyedit.c:231
+#, c-format
+msgid "%d signatures not checked due to errors\n"
+msgstr "%d allkirja j�i vigade t�ttu kontrollimata\n"
+
+#: g10/keyedit.c:233
+msgid "1 user ID without valid self-signature detected\n"
+msgstr "tuvastasin �he kehtiva iseenda allkirjata kasutaja ID\n"
+
+#: g10/keyedit.c:235
+#, c-format
+msgid "%d user IDs without valid self-signatures detected\n"
+msgstr "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
+
+#. Fixme: see whether there is a revocation in which
+#. * case we should allow to sign it again.
+#: g10/keyedit.c:317
+#, c-format
+msgid "Already signed by key %08lX\n"
+msgstr "On juba allkirjastatud v�tmega %08lX\n"
+
+#: g10/keyedit.c:325
+#, c-format
+msgid "Nothing to sign with key %08lX\n"
+msgstr "V�tmega %08lX pole midagi allkirjastada\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Are you really sure that you want to sign this key\n"
+"with your key: \""
+msgstr ""
+"Olete t�esti kindel, et soovite seda v�tit oma\n"
+"v�tmega allkirjastada: \""
+
+#: g10/keyedit.c:343
+msgid ""
+"The signature will be marked as non-exportable.\n"
+"\n"
+msgstr ""
+"Allkiri m�rgitakse mitte-eksporditavaks.\n"
+"\n"
+
+#: g10/keyedit.c:348
+msgid "Really sign? "
+msgstr "Allkirjastan t�esti? "
+
+#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:157
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "allkirjastamine eba�nnestus: %s\n"
+
+#: g10/keyedit.c:428
+msgid "This key is not protected.\n"
+msgstr "See v�ti ei ole kaitstud.\n"
+
+#: g10/keyedit.c:432
+msgid "Secret parts of primary key are not available.\n"
+msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
+
+#: g10/keyedit.c:436
+msgid "Key is protected.\n"
+msgstr "V�ti on kaitstud.\n"
+
+#: g10/keyedit.c:456
+#, c-format
+msgid "Can't edit this key: %s\n"
+msgstr "Seda v�tit ei saa toimetada: %s\n"
+
+#: g10/keyedit.c:461
+msgid ""
+"Enter the new passphrase for this secret key.\n"
+"\n"
+msgstr ""
+"Sisestage sellele salajasele v�tmele uus parool.\n"
+"\n"
+
+#: g10/keyedit.c:473
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"\n"
+msgstr ""
+"Te ei soovi parooli - see on t�en�oliselt *halb* idee!\n"
+"\n"
+
+#: g10/keyedit.c:476
+msgid "Do you really want to do this? "
+msgstr "Kas te t�esti soovite seda teha? "
+
+#: g10/keyedit.c:540
+msgid "moving a key signature to the correct place\n"
+msgstr "t�stan v�tme allkirja �igesse kohta\n"
+
+#: g10/keyedit.c:581
+msgid "quit this menu"
+msgstr "v�lju sellest men��st"
+
+#: g10/keyedit.c:582
+msgid "q"
+msgstr "v"
+
+#: g10/keyedit.c:583
+msgid "save"
+msgstr "save"
+
+#: g10/keyedit.c:583
+msgid "save and quit"
+msgstr "salvesta ja v�lju"
+
+#: g10/keyedit.c:584
+msgid "help"
+msgstr "help"
+
+#: g10/keyedit.c:584
+msgid "show this help"
+msgstr "n�ita seda abiinfot"
+
+#: g10/keyedit.c:586
+msgid "fpr"
+msgstr "fpr"
+
+#: g10/keyedit.c:586
+msgid "show fingerprint"
+msgstr "n�ita s�rmej�lge"
+
+#: g10/keyedit.c:587
+msgid "list"
+msgstr "list"
+
+#: g10/keyedit.c:587
+msgid "list key and user IDs"
+msgstr "n�ita v�tit ja kasutaja IDd"
+
+#: g10/keyedit.c:588
+msgid "l"
+msgstr "l"
+
+#: g10/keyedit.c:589
+msgid "uid"
+msgstr "uid"
+
+#: g10/keyedit.c:589
+msgid "select user ID N"
+msgstr "vali kasutaja ID N"
+
+#: g10/keyedit.c:590
+msgid "key"
+msgstr "key"
+
+#: g10/keyedit.c:590
+msgid "select secondary key N"
+msgstr "vali sekundaarne v�ti N"
+
+#: g10/keyedit.c:591
+msgid "check"
+msgstr "check"
+
+#: g10/keyedit.c:591
+msgid "list signatures"
+msgstr "n�ita allkirju"
+
+#: g10/keyedit.c:592
+msgid "c"
+msgstr "c"
+
+#: g10/keyedit.c:593
+msgid "sign"
+msgstr "sign"
+
+#: g10/keyedit.c:593
+msgid "sign the key"
+msgstr "allkirjasta v�ti"
+
+#: g10/keyedit.c:594
+msgid "s"
+msgstr "s"
+
+#: g10/keyedit.c:595
+msgid "lsign"
+msgstr "lsign"
+
+#: g10/keyedit.c:595
+msgid "sign the key locally"
+msgstr "allkirjasta v�ti lokaalselt"
+
+#: g10/keyedit.c:596
+msgid "debug"
+msgstr "debug"
+
+#: g10/keyedit.c:597
+msgid "adduid"
+msgstr "adduid"
+
+#: g10/keyedit.c:597
+msgid "add a user ID"
+msgstr "lisa kasutaja ID"
+
+#: g10/keyedit.c:598
+msgid "deluid"
+msgstr "deluid"
+
+#: g10/keyedit.c:598
+msgid "delete user ID"
+msgstr "kustuta kasutaja ID"
+
+#: g10/keyedit.c:599
+msgid "addkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:599
+msgid "add a secondary key"
+msgstr "lisa sekundaarne v�ti"
+
+#: g10/keyedit.c:600
+msgid "delkey"
+msgstr "delkey"
+
+#: g10/keyedit.c:600
+msgid "delete a secondary key"
+msgstr "kustuta sekundaarne v�ti"
+
+#: g10/keyedit.c:601
+msgid "delsig"
+msgstr "delsig"
+
+#: g10/keyedit.c:601
+msgid "delete signatures"
+msgstr "kustuta allkirjad"
+
+#: g10/keyedit.c:602
+msgid "expire"
+msgstr "expire"
+
+#: g10/keyedit.c:602
+msgid "change the expire date"
+msgstr "muuda aegumise kuup�eva"
+
+#: g10/keyedit.c:603
+msgid "toggle"
+msgstr "toggle"
+
+#: g10/keyedit.c:603
+msgid "toggle between secret and public key listing"
+msgstr "l�lita salajaste v�i avalike v�tmete loendi vahel"
+
+#: g10/keyedit.c:605
+msgid "t"
+msgstr "t"
+
+#: g10/keyedit.c:606
+msgid "pref"
+msgstr "pref"
+
+#: g10/keyedit.c:606
+msgid "list preferences"
+msgstr "n�ita eelistusi"
+
+#: g10/keyedit.c:607
+msgid "passwd"
+msgstr "passwd"
+
+#: g10/keyedit.c:607
+msgid "change the passphrase"
+msgstr "muuda parooli"
+
+#: g10/keyedit.c:608
+msgid "trust"
+msgstr "trust"
+
+#: g10/keyedit.c:608
+msgid "change the ownertrust"
+msgstr "muuda omaniku usaldust"
+
+#: g10/keyedit.c:609
+msgid "revsig"
+msgstr "revsig"
+
+#: g10/keyedit.c:609
+msgid "revoke signatures"
+msgstr "t�hista allkirjad"
+
+#: g10/keyedit.c:610
+msgid "revkey"
+msgstr "revkey"
+
+#: g10/keyedit.c:610
+msgid "revoke a secondary key"
+msgstr "t�hista sekundaarne v�ti"
+
+#: g10/keyedit.c:611
+msgid "disable"
+msgstr "disable"
+
+#: g10/keyedit.c:611
+msgid "disable a key"
+msgstr "blokeeri v�ti"
+
+#: g10/keyedit.c:612
+msgid "enable"
+msgstr "enable"
+
+#: g10/keyedit.c:612
+msgid "enable a key"
+msgstr "luba v�ti"
+
+#: g10/delkey.c:110 g10/keyedit.c:632
+msgid "can't do that in batchmode\n"
+msgstr "seda ei saa teha pakettmoodis\n"
+
+#. check that they match
+#. fixme: check that they both match
+#: g10/keyedit.c:670
+msgid "Secret key is available.\n"
+msgstr "Salajane v�ti on kasutatav.\n"
+
+#: g10/keyedit.c:699
+msgid "Command> "
+msgstr "K�sklus> "
+
+#: g10/keyedit.c:729
+msgid "Need the secret key to do this.\n"
+msgstr "Selle tegamiseks on vaja salajast v�tit.\n"
+
+#: g10/keyedit.c:733
+msgid "Please use the command \"toggle\" first.\n"
+msgstr "Palun kasutage k�igepealt k�sku \"toggle\".\n"
+
+#: g10/keyedit.c:780
+msgid "Really sign all user IDs? "
+msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
+
+#: g10/keyedit.c:781
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
+
+#: g10/keyedit.c:813 g10/keyedit.c:995
+#, c-format
+msgid "update of trustdb failed: %s\n"
+msgstr "trustdb uuendamine eba�nnestus: %s\n"
+
+#: g10/keyedit.c:824 g10/keyedit.c:845
+msgid "You must select at least one user ID.\n"
+msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
+
+#: g10/keyedit.c:826
+msgid "You can't delete the last user ID!\n"
+msgstr "Viimast kasutaja ID ei saa kustutada!\n"
+
+#: g10/keyedit.c:829
+msgid "Really remove all selected user IDs? "
+msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
+
+#: g10/keyedit.c:830
+msgid "Really remove this user ID? "
+msgstr "Kas eemaldan t�esti selle kasutaja ID? "
+
+#: g10/keyedit.c:866 g10/keyedit.c:888
+msgid "You must select at least one key.\n"
+msgstr "Te peata valima v�hemalt �he v�tme.\n"
+
+#: g10/keyedit.c:870
+msgid "Do you really want to delete the selected keys? "
+msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
+
+#: g10/keyedit.c:871
+msgid "Do you really want to delete this key? "
+msgstr "Kas te t�esti soovite seda v�tit kustutada? "
+
+#: g10/keyedit.c:892
+msgid "Do you really want to revoke the selected keys? "
+msgstr "Kas te t�esti soovite valitud v�tmeid t�histada? "
+
+#: g10/keyedit.c:893
+msgid "Do you really want to revoke this key? "
+msgstr "Kas te t�esti soovite seda v�tit t�histada? "
+
+#: g10/keyedit.c:959
+msgid "Save changes? "
+msgstr "Salvestan muutused? "
+
+#: g10/keyedit.c:962
+msgid "Quit without saving? "
+msgstr "V�ljun salvestamata? "
+
+#: g10/keyedit.c:973
+#, c-format
+msgid "update failed: %s\n"
+msgstr "uuendamine eba�nnestus: %s\n"
+
+#: g10/keyedit.c:980
+#, c-format
+msgid "update secret failed: %s\n"
+msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
+
+#: g10/keyedit.c:987
+msgid "Key not changed so no update needed.\n"
+msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
+
+#: g10/keyedit.c:1002
+msgid "Invalid command (try \"help\")\n"
+msgstr "Vigane k�sklus (proovige \"help\")\n"
+
+#: g10/keyedit.c:1082 g10/keyedit.c:1108
+#, c-format
+msgid "%s%c %4u%c/%08lX created: %s expires: %s"
+msgstr "%s%c %4u%c/%08lX loodud: %s aegub: %s"
+
+#: g10/keyedit.c:1091
+#, c-format
+msgid " trust: %c/%c"
+msgstr " usaldus: %c/%c"
+
+#: g10/keyedit.c:1095
+msgid "This key has been disabled"
+msgstr "See v�ti on blokeeritud"
+
+#: g10/keyedit.c:1124
+#, c-format
+msgid "rev! subkey has been revoked: %s\n"
+msgstr "rev! alamv�ti on t�histatud: %s\n"
+
+#: g10/keyedit.c:1127
+msgid "rev- faked revocation found\n"
+msgstr "rev- leitud v�ltsitud t�histamine\n"
+
+#: g10/keyedit.c:1129
+#, c-format
+msgid "rev? problem checking revocation: %s\n"
+msgstr "rev? probleem t�histamise kontrollimisel: %s\n"
+
+#: g10/keyedit.c:1367
+msgid "Delete this good signature? (y/N/q)"
+msgstr "Kustutan selle hea allkirja? (j/E/v)"
+
+#: g10/keyedit.c:1371
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "Kustutan selle vigase allkirja? (j/E/v)"
+
+#: g10/keyedit.c:1375
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
+
+#: g10/keyedit.c:1381
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
+
+#: g10/keyedit.c:1395
+#, c-format
+msgid "Deleted %d signature.\n"
+msgstr "Kustutatud %d allkiri.\n"
+
+#: g10/keyedit.c:1396
+#, c-format
+msgid "Deleted %d signatures.\n"
+msgstr "Kustutatud %d allkirja.\n"
+
+#: g10/keyedit.c:1399
+msgid "Nothing deleted.\n"
+msgstr "Midagi ei kustutatud.\n"
+
+#: g10/keyedit.c:1468
+msgid "Please remove selections from the secret keys.\n"
+msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
+
+#: g10/keyedit.c:1474
+msgid "Please select at most one secondary key.\n"
+msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
+
+#: g10/keyedit.c:1478
+msgid "Changing expiration time for a secondary key.\n"
+msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
+
+#: g10/keyedit.c:1480
+msgid "Changing expiration time for the primary key.\n"
+msgstr "Muudan primaarse v�tme aegumise aega.\n"
+
+#: g10/keyedit.c:1522
+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:1538
+msgid "No corresponding signature in secret ring\n"
+msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
+
+#: g10/keyedit.c:1599
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "Kasutaja ID numbriga %d puudub\n"
+
+#: g10/keyedit.c:1645
+#, c-format
+msgid "No secondary key with index %d\n"
+msgstr "Sekundaarne v�ti numbriga %d puudub\n"
+
+#: g10/keyedit.c:1743
+msgid "user ID: \""
+msgstr "kasutaja ID: \""
+
+#: g10/keyedit.c:1746
+#, c-format
+msgid ""
+"\"\n"
+"signed with your key %08lX at %s\n"
+msgstr ""
+"\"\n"
+"allkirjastatud teie v�tmega %08lX %s\n"
+
+#: g10/keyedit.c:1750
+msgid "Create a revocation certificate for this signature? (y/N)"
+msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E)"
+
+#. FIXME: detect duplicates here
+#: g10/keyedit.c:1774
+msgid "You have signed these user IDs:\n"
+msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
+
+#: g10/keyedit.c:1788 g10/keyedit.c:1823
+#, c-format
+msgid " signed by %08lX at %s\n"
+msgstr " allkirjastanud %08lX %s\n"
+
+#: g10/keyedit.c:1793
+#, c-format
+msgid " revoked by %08lX at %s\n"
+msgstr " t�histanud %08lX %s\n"
+
+#: g10/keyedit.c:1813
+msgid "You are about to revoke these signatures:\n"
+msgstr "Te asute t�histama j�rgmisi allkirju:\n"
+
+#: g10/keyedit.c:1831
+msgid "Really create the revocation certificates? (y/N)"
+msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E)"
+
+#: g10/keyedit.c:1860
+msgid "no secret key\n"
+msgstr "salajast v�tit pole\n"
+
+#. of subkey
+#: g10/keylist.c:279 g10/mainproc.c:851
+#, c-format
+msgid " [expires: %s]"
+msgstr " [aegub: %s]"
+
+#: g10/mainproc.c:269
+#, c-format
+msgid "public key is %08lX\n"
+msgstr "avalik v�ti on %08lX\n"
+
+#: g10/mainproc.c:314
+msgid "public key encrypted data: good DEK\n"
+msgstr "avaliku v�tmega kr�ptitud andmed: hea DEK\n"
+
+#: g10/mainproc.c:366
+#, c-format
+msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
+msgstr "kr�ptitud %u-bitise %s v�tmega, ID %08lX, loodud %s\n"
+
+#: g10/mainproc.c:376
+#, c-format
+msgid "encrypted with %s key, ID %08lX\n"
+msgstr "kr�ptitud %s v�tmega, ID %08lX\n"
+
+#: g10/mainproc.c:390
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "avaliku v�tmega lahtikr�ptimine eba�nnestus: %s\n"
+
+#: g10/mainproc.c:430
+msgid "decryption okay\n"
+msgstr "lahtikr�ptimine �nnestus\n"
+
+#: g10/mainproc.c:435
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "HOIATUS: kr�ptitud teadet on muudetud!\n"
+
+#: g10/mainproc.c:440
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr "lahtikr�ptimine eba�nnestus: %s\n"
+
+#: g10/mainproc.c:459
+msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
+msgstr "M�RKUS: saatja n�udis \"ainult-teie-silmadele\"\n"
+
+#: g10/mainproc.c:461
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr "algne failinimi on='%.*s'\n"
+
+#: g10/mainproc.c:632
+msgid "standalone revocation - use \"gpg --import\" to apply\n"
+msgstr "eraldiseisev t�histus - realiseerimiseks kasutage \"gpg --import\"\n"
+
+#: g10/mainproc.c:719 g10/mainproc.c:728
+msgid "WARNING: invalid notation data found\n"
+msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
+
+#: g10/mainproc.c:731
+msgid "Notation: "
+msgstr "Noteering: "
+
+#: g10/mainproc.c:740
+msgid "Policy: "
+msgstr "Poliis: "
+
+#: g10/mainproc.c:1193
+msgid "signature verification suppressed\n"
+msgstr "allkirja kontroll j�eti �ra\n"
+
+#. plaintext before signatures but no one-pass packets
+#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#, fuzzy
+msgid "can't handle these multiple signatures\n"
+msgstr "avateksti allkirjad �ksteise sees\n"
+
+#: g10/mainproc.c:1256
+#, c-format
+msgid "Signature made %.*s using %s key ID %08lX\n"
+msgstr "Allkirja l�i %.*s kasutades %s v�tit ID %08lX\n"
+
+#. just in case that we have no userid
+#: g10/mainproc.c:1284 g10/mainproc.c:1292
+msgid "BAD signature from \""
+msgstr "HALB allkiri kasutajalt \""
+
+#: g10/mainproc.c:1285 g10/mainproc.c:1293
+msgid "Good signature from \""
+msgstr "Hea allkiri kasutajalt \""
+
+#: g10/mainproc.c:1308
+msgid " aka \""
+msgstr " ka \""
+
+#: g10/mainproc.c:1358
+#, c-format
+msgid "Can't check signature: %s\n"
+msgstr "Allkirja ei saa kontrollida: %s\n"
+
+#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "loo eraldiseisev allkiri"
+
+#: g10/mainproc.c:1454
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
+
+#: g10/mainproc.c:1511
+msgid "old style (PGP 2.x) signature\n"
+msgstr "vana stiili (PGP 2.x) allkiri\n"
+
+#: g10/mainproc.c:1518
+msgid "invalid root packet detected in proc_tree()\n"
+msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
+
+#: g10/misc.c:98
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "ei �nnestu blokeerida m�lupildi salvestamist: %s\n"
+
+#: g10/misc.c:208
+msgid "Experimental algorithms should not be used!\n"
+msgstr "Eksperimentaalseid algoritme ei peaks kasutama!\n"
+
+#: g10/misc.c:238
+#, fuzzy
+msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
+msgstr ""
+"see �iffri algoritm ei ole soovitatav; kasutage palun m�nd standardsemat!\n"
+
+#: g10/parse-packet.c:119
+#, c-format
+msgid "can't handle public key algorithm %d\n"
+msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
+
+#: g10/parse-packet.c:1010
+#, c-format
+msgid "subpacket of type %d has critical bit set\n"
+msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
+
+#: g10/passphrase.c:223
+msgid "gpg-agent is not available in this session\n"
+msgstr ""
+
+#: g10/passphrase.c:229
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr ""
+
+#: g10/hkp.c:147 g10/passphrase.c:248
+#, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
+
+#: g10/passphrase.c:313 g10/passphrase.c:576
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr " (peamise v�tme ID %08lX)"
+
+#: g10/passphrase.c:323
+#, fuzzy, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"\n"
+"Te vajate kasutaja salajase v�tme lahtilukustamiseks\n"
+"parooli: \""
+
+#: g10/passphrase.c:344
+#, fuzzy
+msgid "Enter passphrase\n"
+msgstr "Sisestage parool: "
+
+#: g10/passphrase.c:346
+#, fuzzy
+msgid "Repeat passphrase\n"
+msgstr "Korrake parooli: "
+
+#: g10/passphrase.c:384
+msgid "passphrase too long\n"
+msgstr ""
+
+#: g10/passphrase.c:396
+msgid "invalid response from agent\n"
+msgstr ""
+
+#: g10/passphrase.c:405
+msgid "cancelled by user\n"
+msgstr ""
+
+#: g10/passphrase.c:408 g10/passphrase.c:477
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr ""
+
+#: g10/passphrase.c:562
+msgid ""
+"\n"
+"You need a passphrase to unlock the secret key for\n"
+"user: \""
+msgstr ""
+"\n"
+"Te vajate kasutaja salajase v�tme lahtilukustamiseks\n"
+"parooli: \""
+
+#: g10/passphrase.c:571
+#, c-format
+msgid "%u-bit %s key, ID %08lX, created %s"
+msgstr "%u-bitine %s v�ti, ID %08lX, loodud %s"
+
+#: g10/passphrase.c:609
+msgid "can't query password in batchmode\n"
+msgstr "pakettmoodis ei saa parooli k�sida\n"
+
+#: g10/passphrase.c:613
+msgid "Enter passphrase: "
+msgstr "Sisestage parool: "
+
+#: g10/passphrase.c:617
+msgid "Repeat passphrase: "
+msgstr "Korrake parooli: "
+
+#: g10/plaintext.c:67
+msgid "data not saved; use option \"--output\" to save it\n"
+msgstr "andmeid ei salvestatud; salvestamiseks kasutage v�tit \"--output\"\n"
+
+#: g10/plaintext.c:332
+msgid "Detached signature.\n"
+msgstr "Eraldiseisev allkiri.\n"
+
+#: g10/plaintext.c:336
+msgid "Please enter name of data file: "
+msgstr "Palun sisestage andmefaili nimi: "
+
+#: g10/plaintext.c:357
+msgid "reading stdin ...\n"
+msgstr "loen standardsisendit ...\n"
+
+#: g10/plaintext.c:391
+#, fuzzy
+msgid "no signed data\n"
+msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
+
+#: g10/plaintext.c:399
+#, c-format
+msgid "can't open signed data `%s'\n"
+msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
+
+#: g10/pubkey-enc.c:76
+#, c-format
+msgid "anonymous receiver; trying secret key %08lX ...\n"
+msgstr "anon��mne saaja; proovin salajast v�tit %08lX ...\n"
+
+#: g10/pubkey-enc.c:82
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "ok, me oleme anon��mne teate saaja.\n"
+
+#: g10/pubkey-enc.c:134
+msgid "old encoding of the DEK is not supported\n"
+msgstr "vana DEK kodeerimine ei ole toetatud\n"
+
+#: g10/pubkey-enc.c:153
+#, c-format
+msgid "cipher algorithm %d is unknown or disabled\n"
+msgstr "�iffri algoritm %d on tundmatu v�i blokeeritud\n"
+
+#: g10/pubkey-enc.c:192
+#, c-format
+msgid "NOTE: cipher algorithm %d not found in preferences\n"
+msgstr "M�RKUS: �iffri algoritm %d puudub eelistustes\n"
+
+#: g10/pubkey-enc.c:198
+#, c-format
+msgid "NOTE: secret key %08lX expired at %s\n"
+msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
+
+#: g10/hkp.c:59
+#, c-format
+msgid "requesting key %08lX from %s ...\n"
+msgstr "k�sin v�tit %08lX serverist %s ...\n"
+
+#: g10/hkp.c:72
+#, c-format
+msgid "can't get key from keyserver: %s\n"
+msgstr "v�tmeserverist ei saa v�tit: %s\n"
+
+#: g10/hkp.c:91 g10/hkp.c:125
+msgid "no keyserver known (use option --keyserver)\n"
+msgstr "v�tmeserver puudub (kasutage v�tit --keyserver)\n"
+
+#: g10/hkp.c:99
+#, c-format
+msgid "%s: not a valid key ID\n"
+msgstr "%s: ei ole kehtiv v�tme ID\n"
+
+#: g10/hkp.c:171
+#, c-format
+msgid "error sending to `%s': %s\n"
+msgstr "viga teate saatmisel serverile `%s': %s\n"
+
+#: g10/hkp.c:183
+#, c-format
+msgid "success sending to `%s' (status=%u)\n"
+msgstr "teate saatmine serverile `%s' �nnestus (olek=%u)\n"
+
+#: g10/hkp.c:186
+#, c-format
+msgid "failed sending to `%s': status=%u\n"
+msgstr "teate saatmine serverile `%s' eba�nnestus: olek=%u\n"
+
+#: g10/seckey-cert.c:53
+msgid "secret key parts are not available\n"
+msgstr "salajase v�tme komponendid ei ole k�ttesaadavad\n"
+
+#: g10/seckey-cert.c:59
+#, c-format
+msgid "protection algorithm %d is not supported\n"
+msgstr "algoritm %d ei ole toetatud\n"
+
+#: g10/seckey-cert.c:184
+msgid "Invalid passphrase; please try again ...\n"
+msgstr "Vigane parool; palun proovige uuesti ...\n"
+
+#: g10/seckey-cert.c:240
+msgid "WARNING: Weak key detected - please change passphrase again.\n"
+msgstr "HOIATUS: Tuvastasin n�rga v�tme - palun muutke uuesti parooli.\n"
+
+#: g10/sig-check.c:199
+msgid "assuming bad MDC due to an unknown critical bit\n"
+msgstr "oletan tundmatu kriitilise biti t�ttu vigast MDC\n"
+
+#: g10/sig-check.c:297
+msgid ""
+"this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
+msgstr ""
+"see on PGP genereeritud ElGamal v�ti ja EI OLE allkirjastamiseks turvaline!\n"
+
+#: g10/sig-check.c:305
+#, c-format
+msgid "public key is %lu second newer than the signature\n"
+msgstr "avalik v�ti on %lu sekund uuem, kui allkiri\n"
+
+#: g10/sig-check.c:306
+#, c-format
+msgid "public key is %lu seconds newer than the signature\n"
+msgstr "avalik v�ti on %lu sekundit uuem, kui allkiri\n"
+
+#: g10/sig-check.c:328
+#, fuzzy, c-format
+msgid "NOTE: signature key %08lX expired %s\n"
+msgstr "M�RKUS: allkirja v�ti aegus %s\n"
+
+#: g10/sig-check.c:398
+msgid "assuming bad signature due to an unknown critical bit\n"
+msgstr "eeldan tundmatu kriitilise biti t�ttu vigast allkirja\n"
+
+#: g10/sign.c:152
+#, fuzzy, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "Allkirja ei saa kontrollida: %s\n"
+
+#: g10/sign.c:161
+#, c-format
+msgid "%s signature from: %s\n"
+msgstr "%s allkiri kasutajalt: %s\n"
+
+#: g10/sign.c:307 g10/sign.c:630
+#, c-format
+msgid "can't create %s: %s\n"
+msgstr "%s ei saa luua: %s\n"
+
+#: g10/sign.c:405
+msgid "signing:"
+msgstr "allkirjastan:"
+
+#: g10/sign.c:448
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "HOIATUS: `%s' on t�hi fail\n"
+
+#: g10/textfilter.c:134
+#, c-format
+msgid "can't handle text lines longer than %d characters\n"
+msgstr "ei suuda k�sitleda tekstiridu mis on pikemad, kui %d s�mbolit\n"
+
+#: g10/textfilter.c:231
+#, c-format
+msgid "input line longer than %d characters\n"
+msgstr "sisendrida on pikem, kui %d s�mbolit\n"
+
+#: g10/tdbio.c:116 g10/tdbio.c:1623
+#, c-format
+msgid "trustdb rec %lu: lseek failed: %s\n"
+msgstr "trustdb kirje %lu: lseek eba�nnestus: %s\n"
+
+#: g10/tdbio.c:122 g10/tdbio.c:1630
+#, c-format
+msgid "trustdb rec %lu: write failed (n=%d): %s\n"
+msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
+
+#: g10/tdbio.c:232
+msgid "trustdb transaction too large\n"
+msgstr "trustdb transaktsioon on liiga suur\n"
+
+#: g10/tdbio.c:424
+#, c-format
+msgid "%s: can't access: %s\n"
+msgstr "%s: ei saa kasutada: %s\n"
+
+#: g10/tdbio.c:438
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: kataloogi ei ole!\n"
+
+#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s: ei saa luua: %s\n"
+
+#: g10/tdbio.c:459 g10/tdbio.c:508
+#, c-format
+msgid "%s: can't create lock\n"
+msgstr "%s: lukku ei �nnestu luua\n"
+
+#: g10/tdbio.c:473
+#, c-format
+msgid "%s: failed to create version record: %s"
+msgstr "%s: versioonikirje loomine ei �nnestu: %s"
+
+#: g10/tdbio.c:477
+#, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr "%s: loodi vigane usalduse andmebaas\n"
+
+#: g10/tdbio.c:480
+#, c-format
+msgid "%s: trustdb created\n"
+msgstr "%s: trustdb on loodud\n"
+
+#: g10/tdbio.c:517
+#, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "%s: vigane trustdb\n"
+
+#: g10/tdbio.c:550
+#, c-format
+msgid "%s: failed to create hashtable: %s\n"
+msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
+
+#: g10/tdbio.c:558
+#, c-format
+msgid "%s: error updating version record: %s\n"
+msgstr "%s: viga versioonikirje uuendamisel: %s\n"
+
+#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
+#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
+#, c-format
+msgid "%s: error reading version record: %s\n"
+msgstr "%s: viga versioonikirje lugemisel: %s\n"
+
+#: g10/tdbio.c:587 g10/tdbio.c:646
+#, c-format
+msgid "%s: error writing version record: %s\n"
+msgstr "%s: viga versioonikirje kirjutamisel: %s\n"
+
+#: g10/tdbio.c:1235
+#, c-format
+msgid "trustdb: lseek failed: %s\n"
+msgstr "trustdb: lseek eba�nnestus: %s\n"
+
+#: g10/tdbio.c:1243
+#, c-format
+msgid "trustdb: read failed (n=%d): %s\n"
+msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
+
+#: g10/tdbio.c:1264
+#, c-format
+msgid "%s: not a trustdb file\n"
+msgstr "%s: ei ole trustdb fail\n"
+
+#: g10/tdbio.c:1280
+#, c-format
+msgid "%s: version record with recnum %lu\n"
+msgstr "%s: versioonikirje kirje numbriga %lu\n"
+
+#: g10/tdbio.c:1285
+#, c-format
+msgid "%s: invalid file version %d\n"
+msgstr "%s: vigane faili versioon %d\n"
+
+#: g10/tdbio.c:1589
+#, c-format
+msgid "%s: error reading free record: %s\n"
+msgstr "%s: viga vaba kirje lugemisel: %s\n"
+
+#: g10/tdbio.c:1597
+#, c-format
+msgid "%s: error writing dir record: %s\n"
+msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
+
+#: g10/tdbio.c:1607
+#, c-format
+msgid "%s: failed to zero a record: %s\n"
+msgstr "%s: kirje nullimine eba�nnestus: %s\n"
+
+#: g10/tdbio.c:1637
+#, c-format
+msgid "%s: failed to append a record: %s\n"
+msgstr "%s: kirje lisamine eba�nnestus: %s\n"
+
+#: g10/tdbio.c:1748
+msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+msgstr "trustdb on vigane; palun k�ivitage \"gpg --fix-trustdb\".\n"
+
+#: g10/trustdb.c:169
+#, c-format
+msgid "trust record %lu, req type %d: read failed: %s\n"
+msgstr "usalduse kirje %lu, p�ringu t��p %d: lugemine eba�nnestus: %s\n"
+
+#: g10/trustdb.c:184
+#, c-format
+msgid "trust record %lu, type %d: write failed: %s\n"
+msgstr "usalduse kirje %lu, t��p %d: kirjutamine eba�nnestus: %s\n"
+
+#: g10/trustdb.c:198
+#, c-format
+msgid "trust record %lu: delete failed: %s\n"
+msgstr "usalduse kirje %lu: kustutamine eba�nnestus: %s\n"
+
+#: g10/trustdb.c:212
+#, c-format
+msgid "trustdb: sync failed: %s\n"
+msgstr "trustdb: sync eba�nnestus: %s\n"
+
+#: g10/trustdb.c:377
+#, c-format
+msgid "error reading dir record for LID %lu: %s\n"
+msgstr "viga LID %lu kataloogikirje lugemisel: %s\n"
+
+#: g10/trustdb.c:384
+#, c-format
+msgid "lid %lu: expected dir record, got type %d\n"
+msgstr "lid %lu: ootasin kataloogikirjet, sain t��bi %d\n"
+
+#: g10/trustdb.c:389
+#, c-format
+msgid "no primary key for LID %lu\n"
+msgstr "LID %lu primaarne v�ti puudub\n"
+
+#: g10/trustdb.c:394
+#, c-format
+msgid "error reading primary key for LID %lu: %s\n"
+msgstr "viga LID %lu primaarse v�tme lugemisel: %s\n"
+
+#: g10/trustdb.c:433
+#, c-format
+msgid "get_dir_record: search_record failed: %s\n"
+msgstr "get_dir_record: search_record eba�nnestus: %s\n"
+
+#: g10/trustdb.c:474
+#, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "'%s' ei ole kehtiv pikk v�tmeID\n"
+
+#: g10/trustdb.c:501
+#, c-format
+msgid "key %08lX: can't put it into the trustdb\n"
+msgstr "v�ti %08lX: trustdb faili lisamine ei �nnestu\n"
+
+#: g10/trustdb.c:507
+#, c-format
+msgid "key %08lX: query record failed\n"
+msgstr "v�ti %08lX: kirje otsing eba�nnestus\n"
+
+#: g10/trustdb.c:516
+#, c-format
+msgid "key %08lX: already in trusted key table\n"
+msgstr "v�ti %08lX: on juba usaldatavate v�tmete tabelis\n"
+
+#: g10/trustdb.c:519
+#, c-format
+msgid "key %08lX: accepted as trusted key.\n"
+msgstr "v�ti %08lX: aktsepteerin usaldusv��rse v�tmena.\n"
+
+#: g10/trustdb.c:546
+#, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "v�ti %08lX: usaldataval v�tmel pole avalikku v�tit - j�tsin vahele\n"
+
+#: g10/trustdb.c:565
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "M�RKUS: salajane v�ti %08lX EI OLE kaitstud.\n"
+
+#: g10/trustdb.c:584
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr "v�ti %08lX: salajane ja avalik v�ti ei sobi\n"
+
+#: g10/trustdb.c:597
+#, c-format
+msgid "enumerate secret keys failed: %s\n"
+msgstr "salajaste v�tmete loendamine eba�nnestus: %s\n"
+
+#: g10/trustdb.c:987
+#, c-format
+msgid "key %08lX.%lu: Good subkey binding\n"
+msgstr "v�ti %08lX.%lu: Hea alamv�tme seos\n"
+
+#: g10/trustdb.c:993 g10/trustdb.c:1028
+#, c-format
+msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
+msgstr "v�ti %08lX.%lu: Vigane alamv�tme seos: %s\n"
+
+#: g10/trustdb.c:1005
+#, c-format
+msgid "key %08lX.%lu: Valid key revocation\n"
+msgstr "v�ti %08lX.%lu: kehtiv v�tme t�histamine\n"
+
+#: g10/trustdb.c:1011
+#, c-format
+msgid "key %08lX.%lu: Invalid key revocation: %s\n"
+msgstr "v�ti %08lX.%lu: Vigane v�tme t�histamine: %s\n"
+
+#: g10/trustdb.c:1022
+#, c-format
+msgid "key %08lX.%lu: Valid subkey revocation\n"
+msgstr "v�ti %08lX.%lu: Kehtiv alamv�tme t�histamine\n"
+
+#: g10/trustdb.c:1133
+msgid "Good self-signature"
+msgstr "Hea iseenda allkiri"
+
+#: g10/trustdb.c:1143
+msgid "Invalid self-signature"
+msgstr "Vigane iseenda allkiri"
+
+#: g10/trustdb.c:1170
+msgid "Valid user ID revocation skipped due to a newer self signature"
+msgstr ""
+"J�tsin kehtiva kasutaja ID t�histuse vahele, kuna leidub uuem iseenda allkiri"
+
+#: g10/trustdb.c:1176
+msgid "Valid user ID revocation"
+msgstr "Kehtiv kasutaja ID t�histamine"
+
+#: g10/trustdb.c:1181
+msgid "Invalid user ID revocation"
+msgstr "Vigane kasutaja ID t�histamine"
+
+#: g10/trustdb.c:1223
+msgid "Valid certificate revocation"
+msgstr "Kehtiv sertifikaadi t�histus"
+
+#: g10/trustdb.c:1224
+msgid "Good certificate"
+msgstr "Hea sertifikaat"
+
+#: g10/trustdb.c:1252
+msgid "Invalid certificate revocation"
+msgstr "Vigane sertifikaadi t�histus"
+
+#: g10/trustdb.c:1253
+msgid "Invalid certificate"
+msgstr "Vigane sertifikaat"
+
+#: g10/trustdb.c:1270 g10/trustdb.c:1274
+#, c-format
+msgid "sig record %lu[%d] points to wrong record.\n"
+msgstr "allkirjakirje %lu[%d] viitab valele kirjele.\n"
+
+#: g10/trustdb.c:1333
+msgid "duplicated certificate - deleted"
+msgstr "duplikaat sertifikaat - kustutasin"
+
+#: g10/trustdb.c:1650
+#, c-format
+msgid "tdbio_search_dir failed: %s\n"
+msgstr "tdbio_search_dir eba�nnestus: %s\n"
+
+#: g10/trustdb.c:1784
+#, c-format
+msgid "lid ?: insert failed: %s\n"
+msgstr "lid ?: lisamine eba�nnestus: %s\n"
+
+#: g10/trustdb.c:1789
+#, c-format
+msgid "lid %lu: insert failed: %s\n"
+msgstr "lid %lu: lisamine eba�nnestus: %s\n"
+
+#: g10/trustdb.c:1795
+#, c-format
+msgid "lid %lu: inserted\n"
+msgstr "lid %lu: lisatud\n"
+
+#: g10/trustdb.c:1800
+#, c-format
+msgid "error reading dir record: %s\n"
+msgstr "viga kataloogikirje lugemisel: %s\n"
+
+#: g10/trustdb.c:1808 g10/trustdb.c:1871
+#, c-format
+msgid "%lu keys processed\n"
+msgstr "%lu v�tit on t��deldud\n"
+
+#: g10/trustdb.c:1810 g10/trustdb.c:1877
+#, c-format
+msgid "\t%lu keys with errors\n"
+msgstr "\t%lu vigadega v�tit\n"
+
+#: g10/trustdb.c:1812
+#, c-format
+msgid "\t%lu keys inserted\n"
+msgstr "\t%lu v�tit lisatud\n"
+
+#: g10/trustdb.c:1815
+#, c-format
+msgid "enumerate keyblocks failed: %s\n"
+msgstr "v�tmeblokkide loendamine eba�nnestus: %s\n"
+
+#: g10/trustdb.c:1863
+#, c-format
+msgid "lid %lu: dir record w/o key - skipped\n"
+msgstr "lid %lu: kataloogikirje ilma v�tmeta - j�tsin vahele\n"
+
+#: g10/trustdb.c:1873
+#, c-format
+msgid "\t%lu due to new pubkeys\n"
+msgstr "\t%lu uut avalikku v�tit\n"
+
+#: g10/trustdb.c:1875
+#, c-format
+msgid "\t%lu keys skipped\n"
+msgstr "\t%lu v�tit j�etud vahele\n"
+
+#: g10/trustdb.c:1879
+#, c-format
+msgid "\t%lu keys updated\n"
+msgstr "\t%lu v�tit uuendatud\n"
+
+#: g10/trustdb.c:2224
+msgid "Ooops, no keys\n"
+msgstr "Ooops, v�tmeid pole\n"
+
+#: g10/trustdb.c:2228
+msgid "Ooops, no user IDs\n"
+msgstr "Ooops, puudub kasutaja ID\n"
+
+#: g10/trustdb.c:2386
+#, c-format
+msgid "check_trust: search dir record failed: %s\n"
+msgstr "check_trust: kataloogikirje otsimine eba�nnestus: %s\n"
+
+#: g10/trustdb.c:2395
+#, c-format
+msgid "key %08lX: insert trust record failed: %s\n"
+msgstr "v�ti %08lX: usalduse kirje lisamine eba�nnestus: %s\n"
+
+#: g10/trustdb.c:2399
+#, c-format
+msgid "key %08lX.%lu: inserted into trustdb\n"
+msgstr "v�ti %08lX.%lu: lisatud trustdb faili\n"
+
+#: g10/trustdb.c:2407
+#, c-format
+msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
+msgstr "v�ti %08lX.%lu: loodud tulevikus (aja h�pe v�i kella probleem)\n"
+
+#: g10/trustdb.c:2422
+#, c-format
+msgid "key %08lX.%lu: expired at %s\n"
+msgstr "v�ti %08lX.%lu: aegus %s\n"
+
+#: g10/trustdb.c:2430
+#, c-format
+msgid "key %08lX.%lu: trust check failed: %s\n"
+msgstr "v�ti %08lX.%lu: usalduse kontroll eba�nnestus: %s\n"
+
+#: g10/trustdb.c:2581
+#, c-format
+msgid "user '%s' not found: %s\n"
+msgstr "kasutajat '%s' ei leitud: %s\n"
+
+#: g10/trustdb.c:2583
+#, c-format
+msgid "problem finding '%s' in trustdb: %s\n"
+msgstr "probleem '%s' trustdbst leidmisel: %s\n"
+
+#: g10/trustdb.c:2586
+#, c-format
+msgid "user '%s' not in trustdb - inserting\n"
+msgstr "kasutaja '%s' puudub trustdb failis - lisan\n"
+
+#: g10/trustdb.c:2589
+#, c-format
+msgid "failed to put '%s' into trustdb: %s\n"
+msgstr "'%s' trustdb faili lisamine eba�nnestus: %s\n"
+
+#: g10/trustdb.c:2775 g10/trustdb.c:2805
+msgid "WARNING: can't yet handle long pref records\n"
+msgstr "HOIATUS: ei k�sitle veel pikki eelistuste kirjeid\n"
+
+#: g10/verify.c:108
+msgid ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+msgstr ""
+"allkirja ei �nnestu kontrollida.\n"
+"Palun pidage meeles, et allkirja fail (.sig v�i .asc)\n"
+"peab olema k�sureal esimene fail.\n"
+
+#: g10/verify.c:173
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr "sisendrida %u on liiga pikk v�i seavahetus puudub\n"
+
+#: g10/ringedit.c:302
+#, c-format
+msgid "%s: can't create keyring: %s\n"
+msgstr "%s: v�tmehoidlat ei �nnestu luua: %s\n"
+
+#: g10/ringedit.c:319 g10/ringedit.c:1376
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: v�tmehoidla on loodud\n"
+
+#: g10/ringedit.c:1557
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "HOIATUS: on olemas 2 faili konfidentsiaalse infoga.\n"
+
+#: g10/ringedit.c:1558
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s ei ole muudetud\n"
+
+#: g10/ringedit.c:1559
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s on uus\n"
+
+#: g10/ringedit.c:1560
+msgid "Please fix this possible security flaw\n"
+msgstr "Palun parandage see v�imalik turvaprobleem\n"
+
+#: g10/skclist.c:110 g10/skclist.c:166
+msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+msgstr ""
+"v�ti ei ole m�rgitud ebaturvaliseks - sellega ei saa v�lts RNGd kasutada!\n"
+
+#: g10/skclist.c:138
+#, fuzzy, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "`%s' j�i vahele: %s\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
+#, c-format
+msgid "skipped `%s': %s\n"
+msgstr "`%s' j�i vahele: %s\n"
+
+#: g10/skclist.c:149
+#, fuzzy
+msgid "skipped: secret key already present\n"
+msgstr "%s: j�tsin vahele: avalik v�ti on juba olemas\n"
+
+#: g10/skclist.c:160
+#, c-format
+msgid ""
+"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"signatures!\n"
+msgstr ""
+"j�tsin `%s' vahele: see on PGP genereeritud ElGamal v�ti,\n"
+"mis ei ole allkirjades kasutamiseks turvaline!\n"
+
+#. do not overwrite
+#: g10/openfile.c:84
+#, c-format
+msgid "File `%s' exists. "
+msgstr "Fail `%s' on olemas. "
+
+#: g10/openfile.c:86
+msgid "Overwrite (y/N)? "
+msgstr "Kirjutan �le (j/E)? "
+
+#: g10/openfile.c:119
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr "%s: tundmatu suffiks\n"
+
+#: g10/openfile.c:141
+msgid "Enter new filename"
+msgstr "Sisestage uus failinimi"
+
+#: g10/openfile.c:184
+msgid "writing to stdout\n"
+msgstr "kirjutan standardv�ljundisse\n"
+
+#: g10/openfile.c:273
+#, c-format
+msgid "assuming signed data in `%s'\n"
+msgstr "eeldan allkirjastatud andmeid failis `%s'\n"
+
+#: g10/openfile.c:323
+#, c-format
+msgid "%s: new options file created\n"
+msgstr "%s: uus omaduste fail on loodud\n"
+
+#: g10/openfile.c:350
+#, c-format
+msgid "%s: can't create directory: %s\n"
+msgstr "%s: kataloogi ei saa luua: %s\n"
+
+#: g10/openfile.c:353
+#, c-format
+msgid "%s: directory created\n"
+msgstr "%s: kataloog on loodud\n"
+
+#: g10/openfile.c:355
+msgid "you have to start GnuPG again, so it can read the new options file\n"
+msgstr "te peate GnuPG uuesti k�ivitama, siis v�etakse uued v�tmed arvesse\n"
+
+#: g10/encr-data.c:66
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s kr�ptitud andmed\n"
+
+#: g10/encr-data.c:68
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "kr�ptitud tundmatu algoritmiga %d\n"
+
+#: g10/encr-data.c:90
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgstr "HOIATUS: teade on kr�ptitud s�mmeetrilise �iffri n�rga v�tmega.\n"
+
+#: g10/encr-data.c:97
+#, fuzzy
+msgid "problem handling encrypted packet\n"
+msgstr "�ra lisa kr�ptimisel v�tme id"
+
+#: g10/seskey.c:52
+msgid "weak key created - retrying\n"
+msgstr "loodi n�rk v�ti - proovin uuesti\n"
+
+#: g10/seskey.c:57
+#, c-format
+msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
+msgstr ""
+"s�mmeetrilises �iffris ei �nnestu v�ltida n�rka v�tit; proovisin %d korda!\n"
+
+#: g10/delkey.c:114
+msgid "can't do that in batchmode without \"--yes\"\n"
+msgstr "pakettmoodis ei saa seda teha ilma v�tmeta \"--yes\"\n"
+
+#: g10/delkey.c:136
+msgid "Delete this key from the keyring? "
+msgstr "Kustutan selle v�tme v�tmehoidlast? "
+
+#: g10/delkey.c:144
+msgid "This is a secret key! - really delete? "
+msgstr "See on salajane v�ti! - kas kustutan t�esti? "
+
+#: g10/delkey.c:181
+msgid "there is a secret key for this public key!\n"
+msgstr "selle avaliku v�tme jaoks on salajane v�ti!\n"
+
+#: g10/delkey.c:183
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr "selle kustutamiseks kasutage v�tit \"--delete-secret-key\".\n"
+
+#: g10/helptext.c:47
+msgid ""
+"It's up to you to assign a value here; this value will never be exported\n"
+"to any 3rd party. We need it to implement the web-of-trust; it has nothing\n"
+"to do with the (implicitly created) web-of-certificates."
+msgstr ""
+"Teie �lesanne on sisestada n��d v��rtus; seda v��rtust ei avalikustata\n"
+"kolmandatele pooltele. Seda v��rtust on vaja et realiseerida usaldusv�rk."
+
+#: g10/helptext.c:53
+msgid "If you want to use this revoked key anyway, answer \"yes\"."
+msgstr "Kui te ikkagi soovite kasutada seda kehtetut v�tit, vastake \"jah\"."
+
+#: g10/helptext.c:57
+msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+msgstr ""
+"Kui te ikkagi soovite kasutada seda mitteusaldatavat v�tit, vastake \"jah\"."
+
+#: g10/helptext.c:61
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
+msgstr "Sisestage kasutaja ID aadressile, kellele te soovite teadet saata."
+
+#: g10/helptext.c:65
+msgid ""
+"Select the algorithm to use.\n"
+"\n"
+"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+"for signatures. This is the suggested algorithm because verification of\n"
+"DSA signatures are much faster than those of ElGamal.\n"
+"\n"
+"ElGamal is an algorithm which can be used for signatures and encryption.\n"
+"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+"only\n"
+"and a sign+encrypt; actually it is the same, but some parameters must be\n"
+"selected in a special way to create a safe key for signatures: this program\n"
+"does this but other OpenPGP implementations are not required to understand\n"
+"the signature+encryption flavor.\n"
+"\n"
+"The first (primary) key must always be a key which is capable of signing;\n"
+"this is the reason why the encryption only ElGamal key is not available in\n"
+"this menu."
+msgstr ""
+"Valige algoritmi, mida kasutada.\n"
+"\n"
+"DSA (ka DSS) on digitaalallkirja algoritm, mida saab kasutada ainult\n"
+"allkirjades. See on soovitatav algoritm, kuna DSA allkirjade kontroll\n"
+"on oluliselt kiirem ElGamal allkirjade kontrollimisest.\n"
+"\n"
+"ElGamal on algoritm, mida saab kasutada nii allkirjastamisel, kui ka\n"
+"kr�ptimisel. OpenPGP eristab selle algoritmi kahte varianti: ainult\n"
+"kr�ptivat ja kr�ptivat ning allkirjastavat. Algoritm on sama, aga\n"
+"turvaliseks allkirjastamiseks on vaja valida sobivad parameetrid. See\n"
+"programm toetab m�lemat varianti, aga teised OpenPGP realisatsioonid\n"
+"ei pruugi kr�ptivat ning allkirjastavat v�imalust tunda.\n"
+"\n"
+"Esimene (primaarne) v�ti peab alati olema selline, mida saab kasutada\n"
+"allkirjastamisel; see on ka p�hjus, miks selles men��s ei lubata valida\n"
+"ainult kr�ptivat ElGamal v�tit."
+
+#: g10/helptext.c:85
+msgid ""
+"Although these keys are defined in RFC2440 they are not suggested\n"
+"because they are not supported by all programs and signatures created\n"
+"with them are quite large and very slow to verify."
+msgstr ""
+"Kuigi need v�tmed on kirjeldatud dokumendis RFC2440, ei ole nende\n"
+"kasutamine soovitatav, kuna mitte k�ik programmid ei toeta neid\n"
+"ja nendega loodud allkirjad on suured ning kontrollimine aeglane."
+
+#: g10/helptext.c:92
+msgid "Enter the size of the key"
+msgstr "Sisestage v�tmepikkus"
+
+#: g10/helptext.c:96 g10/helptext.c:101 g10/helptext.c:113 g10/helptext.c:145
+#: g10/helptext.c:150 g10/helptext.c:155 g10/helptext.c:160
+msgid "Answer \"yes\" or \"no\""
+msgstr "Vastake \"jah\" v�i \"ei\""
+
+#: g10/helptext.c:106
+msgid ""
+"Enter the required value as shown in the prompt.\n"
+"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+"get a good error response - instead the system tries to interpret\n"
+"the given value as an interval."
+msgstr ""
+"Sisestage n�utav v��rtus, nagu viibal n�idati.\n"
+"V�imalik on ka sisestada ISO kuup�ev (AAAA-KK-PP), aga te ei\n"
+"saa korrektset veateadet, kuna s�steem �ritab antud v��rtust\n"
+"t�lgendada vahemikuna."
+
+#: g10/helptext.c:118
+msgid "Enter the name of the key holder"
+msgstr "Sisestage v�tmehoidja nimi"
+
+#: g10/helptext.c:123
+msgid "please enter an optional but highly suggested email address"
+msgstr "palun e-posti aadress, aadress ei ole kohustuslik, aga v�ga soovitav"
+
+#: g10/helptext.c:127
+msgid "Please enter an optional comment"
+msgstr "Te s�ite n��d sisestada kommentaari"
+
+#: g10/helptext.c:132
+msgid ""
+"N to change the name.\n"
+"C to change the comment.\n"
+"E to change the email address.\n"
+"O to continue with key generation.\n"
+"Q to to quit the key generation."
+msgstr ""
+"N et muuta nime.\n"
+"K et muuta kommentaari.\n"
+"E et muuta e-posti aadressi.\n"
+"O et j�tkata v�tme loomist.\n"
+"V et l�petada v�tme loomine."
+
+#: g10/helptext.c:141
+msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+msgstr "Vastake \"jah\" (v�i \"j\"), kui v�ib alustada alamv�tme loomisega."
+
+#: g10/helptext.c:164
+msgid "Answer \"yes\" is you want to sign ALL the user IDs"
+msgstr "Kui te soovite allkirjastada K�IK kasutaja IDd, vastake \"jah\""
+
+#: g10/helptext.c:168
+msgid ""
+"Answer \"yes\" if you really want to delete this user ID.\n"
+"All certificates are then also lost!"
+msgstr ""
+"Kui te t�esti soovite seda kasutaja IDd kustutada, vastake \"jah\".\n"
+"Sertifikaadid kustutatakse samuti!"
+
+#: g10/helptext.c:173
+msgid "Answer \"yes\" if it is okay to delete the subkey"
+msgstr "Kui selle alamv�tme v�ib kustutada, vastake \"jah\""
+
+#: g10/helptext.c:178
+msgid ""
+"This is a valid signature on the key; you normally don't want\n"
+"to delete this signature because it may be important to establish a\n"
+"trust connection to the key or another key certified by this key."
+msgstr ""
+"See on v�tme kehtiv allkiri; tavaliselt seda ei soovita kustutada,\n"
+"kuna see allkiri v�ib olla vajalik, et kirjeldada antud v�tme v�i\n"
+"antud v�tmega sertifitseeritud teise v�tme usaldatavust."
+
+#: g10/helptext.c:183
+msgid ""
+"This signature can't be checked because you don't have the\n"
+"corresponding key. You should postpone its deletion until you\n"
+"know which key was used because this signing key might establish\n"
+"a trust connection through another already certified key."
+msgstr ""
+"Seda allkirja ei saa kontrollida, kuna puudub allkirjale vastav v�ti.\n"
+"Te peaksite peatama kustutamise, kuni on teada, millist v�tit see\n"
+"kasutab, sest see v�ti v�ib moodustada usaldussuhte l�bi m�ne juba\n"
+"sertifitseeritud v�tme."
+
+#: g10/helptext.c:189
+msgid ""
+"The signature is not valid. It does make sense to remove it from\n"
+"your keyring."
+msgstr "Allkiri ei ole kehtiv. Oleks m�istlik see v�tmehoidlast kustutada."
+
+#: g10/helptext.c:193
+msgid ""
+"This is a signature which binds the user ID to the key. It is\n"
+"usually not a good idea to remove such a signature. Actually\n"
+"GnuPG might not be able to use this key anymore. So do this\n"
+"only if this self-signature is for some reason not valid and\n"
+"a second one is available."
+msgstr ""
+"See allkiri seob kasutaja ID v�tmega. Sellist allkirja ei ole\n"
+"�ldiselt soovitatav eemaldada. Peale selle kustutamist ei pruugi\n"
+"GnuPG enam olla v�imeline seda v�tit leidma. Kustutada v�iks\n"
+"vaid siis, kui see allkiri ei ole miskip�rast kehtiv ja on\n"
+"olemas ka teine allkiri, mis kasutajat v�tmega seob."
+
+#: g10/helptext.c:202
+msgid ""
+"Please enter the passhrase; this is a secret sentence \n"
+" Blurb, blurb,.... "
+msgstr ""
+"Palun sisestage parool; see on salajane tekst\n"
+" Bl��, bl��,.... "
+
+#: g10/helptext.c:209
+msgid "Please repeat the last passphrase, so you are sure what you typed in."
+msgstr "Palun korrake parooli, siis saate oma kirjutatus kindel olla."
+
+#: g10/helptext.c:213
+msgid "Give the name of the file to which the signature applies"
+msgstr "Sisestage palun failinimi, mida allkirjastada"
+
+#: g10/helptext.c:218
+msgid "Answer \"yes\" if it is okay to overwrite the file"
+msgstr "Vastake \"jah\", kui faili v�ib �le kirjutada"
+
+#: g10/helptext.c:223
+msgid ""
+"Please enter a new filename. If you just hit RETURN the default\n"
+"file (which is shown in brackets) will be used."
+msgstr ""
+"Palun sisestage uus failinimi. Kui te vajutate lihtsalt reavahetust,\n"
+"kasutatakse vaikimisi faili (nimi on nurksulgudes)."
+
+#: g10/helptext.c:229
+msgid ""
+"You should specify a reason for the certification. Depending on the\n"
+"context you have the ability to choose from this list:\n"
+" \"Key has been compromised\"\n"
+" Use this if you have a reason to believe that unauthorized persons\n"
+" got access to your secret key.\n"
+" \"Key is superseded\"\n"
+" Use this if you have replaced this key with a newer one.\n"
+" \"Key is no longer used\"\n"
+" Use this if you have retired this key.\n"
+" \"User ID is no longer valid\"\n"
+" Use this to state that the user ID should not longer be used;\n"
+" this is normally used to mark an email address invalid.\n"
+msgstr ""
+"Te peate m��rama sertifitseerimise p�hjuse. S�ltuvalt kontekstist on\n"
+"teil v�imalus valida �ks j�rgnevaist:\n"
+" \"V�ti on kompromiteeritud\"\n"
+" Kasutage seda, kui teil on p�hjust uskuda, et autoriseerimata\n"
+" isikud on saanud juurdep��su teie salajasele v�tmele.\n"
+" \"V�ti on asendatud\"\n"
+" Kasutage seda, kui te olete selle v�tme asendanud uuemaga.\n"
+" \"V�ti ei ole enam kasutusel\"\n"
+" Kasutage seda, kui te ei kasuta enam seda v�tit.\n"
+" \"Kasutaja ID ei ole enam kehtiv\"\n"
+" Kasutage seda m�rkimaks, et konkreetser kasutaja ID ei peaks enam\n"
+" kasutama; seda kasutatakse tavaliselt m�rkimaks vigast e-posti "
+"aadressi.\n"
+
+#: g10/helptext.c:245
+msgid ""
+"If you like, you can enter a text describing why you issue this\n"
+"revocation certificate. Please keep this text concise.\n"
+"An empty line ends the text.\n"
+msgstr ""
+"Kui te soovite, v�ite n��d sisestada p�hjenduse, miks te\n"
+"soovite seda t�histamise sertifikaati esitada. Palun kirjutage\n"
+"l�hidalt. T�hi rida l�petab teksti.\n"
+
+#: g10/helptext.c:260
+msgid "No help available"
+msgstr "Abiinfo puudub"
+
+#: g10/helptext.c:268
+#, c-format
+msgid "No help available for `%s'"
+msgstr "`%s' kohta abiinfo puudub"
+
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "selles versioonis ei saa RSA v�tit kasutada\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "See kasutaja ID ei oma v�tit\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Sel v�tmel ei ole kasutaja ID\n"
+
+#~ msgid "invalid"
+#~ msgstr "vigane"
+
+#~ msgid "revoked"
+#~ msgstr "t�histatud"
+
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "lahtikr�ptimiseks puudub salajane v�ti\n"
diff --git a/po/fr.po b/po/fr.po
index 4d5fae11f..6d49bd88d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.1h\n"
-"POT-Creation-Date: 2001-04-06 10:29+0200\n"
+"POT-Creation-Date: 2001-04-17 11:40+0200\n"
"PO-Revision-Date: 2000-06-28 18:41+02:00\n"
"Last-Translator: Ga�l Qu�ri <[email protected]>\n"
"Language-Team: French <[email protected]>\n"
@@ -1712,19 +1712,19 @@ msgstr "trop d'entr�es dans le cache pk - d�sactiv�\n"
msgid "too many entries in unk cache - disabled\n"
msgstr "trop d'entr�es dans le cache unk - d�sactiv�\n"
-#: g10/getkey.c:2169
+#: g10/getkey.c:2203
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr ""
"utilisation de la cl� secondaire %08lX � la place de la cl�\n"
"principale %08lX\n"
-#: g10/getkey.c:2211 g10/trustdb.c:577
+#: g10/getkey.c:2245 g10/trustdb.c:577
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "cl� %08lX: cl� secr�te sans cl� publique - non prise en compte\n"
-#: g10/getkey.c:2499
+#: g10/getkey.c:2532
msgid "[User id not found]"
msgstr "[Nom utilisateur introuvable]"
diff --git a/po/id.po b/po/id.po
index 569da0b75..70b010ee5 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU Privacy Guard 1.0.1\n"
-"POT-Creation-Date: 2001-04-06 10:29+0200\n"
+"POT-Creation-Date: 2001-04-17 11:40+0200\n"
"PO-Revision-Date: 2000-02-06 18:04+07:00\n"
"Last-Translator: Tedi Heriyanto <[email protected]>\n"
"Language-Team: Indonesia <[email protected]>\n"
@@ -1679,17 +1679,17 @@ msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n"
msgid "too many entries in unk cache - disabled\n"
msgstr "terlalu banyak masukan di unk cache - ditiadakan\n"
-#: g10/getkey.c:2169
+#: g10/getkey.c:2203
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "menggunakan kunci sekunder %08lX selain kunci primer %08lX\n"
-#: g10/getkey.c:2211 g10/trustdb.c:577
+#: g10/getkey.c:2245 g10/trustdb.c:577
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
-#: g10/getkey.c:2499
+#: g10/getkey.c:2532
#, fuzzy
msgid "[User id not found]"
msgstr "%s: user tidak ditemukan\n"
diff --git a/po/it.po b/po/it.po
index 43f234c97..72476d746 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.0.0h\n"
-"POT-Creation-Date: 2001-04-06 10:29+0200\n"
+"POT-Creation-Date: 2001-04-17 11:40+0200\n"
"PO-Revision-Date: 1999-12-08 15:51+02:00\n"
"Last-Translator: Marco d'Itri <[email protected]>\n"
"Language-Team: Italian <[email protected]>\n"
@@ -1693,17 +1693,17 @@ msgstr "troppe voci nella pk cache - disabilitata\n"
msgid "too many entries in unk cache - disabled\n"
msgstr "troppe voci nella unk cache - disabilitata\n"
-#: g10/getkey.c:2169
+#: g10/getkey.c:2203
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
-#: g10/getkey.c:2211 g10/trustdb.c:577
+#: g10/getkey.c:2245 g10/trustdb.c:577
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
-#: g10/getkey.c:2499
+#: g10/getkey.c:2532
#, fuzzy
msgid "[User id not found]"
msgstr "%s: utente non trovato\n"
diff --git a/po/ja.po b/po/ja.po
index 5dadd1504..e1280fca2 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.4\n"
-"POT-Creation-Date: 2001-04-06 10:29+0200\n"
+"POT-Creation-Date: 2001-04-17 11:40+0200\n"
"PO-Revision-Date: 2000-10-19 23:08+09:00\n"
"Last-Translator: IIDA Yosiaki <[email protected]>\n"
"Language-Team: Japanese <[email protected]>\n"
@@ -1717,17 +1717,17 @@ msgstr "pk����å���Υ���ȥ꡼��¿�����ޤ� - ���Ѷػ�\n"
msgid "too many entries in unk cache - disabled\n"
msgstr "unk����å���Υ���ȥ꡼��¿�����ޤ� - ���Ѷػ�\n"
-#: g10/getkey.c:2169
+#: g10/getkey.c:2203
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "����%08lX��縰%08lX�����Ѥ��ޤ�\n"
-#: g10/getkey.c:2211 g10/trustdb.c:577
+#: g10/getkey.c:2245 g10/trustdb.c:577
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "��%08lX: �������Τʤ���̩���Ǥ��������å�\n"
-#: g10/getkey.c:2499
+#: g10/getkey.c:2532
msgid "[User id not found]"
msgstr "[�桼����id�����Ĥ���ޤ���]"
diff --git a/po/nl.po b/po/nl.po
index f76d8d3c5..4072a7555 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2001-04-06 10:29+0200\n"
+"POT-Creation-Date: 2001-04-17 11:40+0200\n"
"PO-Revision-Date: 2000-02-20 21:30+01:00\n"
"Last-Translator: Ivo Timmermans <[email protected]>\n"
"Language-Team: Dutch <[email protected]>\n"
@@ -1705,18 +1705,18 @@ msgstr "te veel ingangen in de pk cache - uitgezet\n"
msgid "too many entries in unk cache - disabled\n"
msgstr "te veel ingangen in de unk cache - uitgezet\n"
-#: g10/getkey.c:2169
+#: g10/getkey.c:2203
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "gebruik secundaire sleutel %08lx in plaats van de primaire %08lx\n"
-#: g10/getkey.c:2211 g10/trustdb.c:577
+#: g10/getkey.c:2245 g10/trustdb.c:577
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr ""
"sleutel %08lX: geheime sleutel zonder openbare sleutel - overgeslagen\n"
-#: g10/getkey.c:2499
+#: g10/getkey.c:2532
#, fuzzy
msgid "[User id not found]"
msgstr "%s: gebruiker niet gevonden\n"
diff --git a/po/pl.po b/po/pl.po
index 141360a2a..01c8dd784 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.0.4\n"
-"POT-Creation-Date: 2001-04-06 10:29+0200\n"
+"POT-Creation-Date: 2001-04-17 11:40+0200\n"
"PO-Revision-Date: 2000-10-18 22:54+02:00\n"
"Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
"Language-Team: Polish <[email protected]>\n"
@@ -1713,17 +1713,17 @@ msgstr "zbyt wiele wpis�w w buforze kluczy publicznych - wy��czony\n"
msgid "too many entries in unk cache - disabled\n"
msgstr "zbyt wiele wpis�w w buforze nieznanych kluczy - wy��czony\n"
-#: g10/getkey.c:2169
+#: g10/getkey.c:2203
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "u�ywany jest podklucz %08lX zamiast klucza g��wnego %08lX\n"
-#: g10/getkey.c:2211 g10/trustdb.c:577
+#: g10/getkey.c:2245 g10/trustdb.c:577
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pomini�ty\n"
-#: g10/getkey.c:2499
+#: g10/getkey.c:2532
msgid "[User id not found]"
msgstr "[brak identyfikatora u�ytkownika]"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b26342576..94b94278b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"POT-Creation-Date: 2001-04-06 10:29+0200\n"
+"POT-Creation-Date: 2001-04-17 11:40+0200\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Date: 1998-11-20 23:46:36-0200\n"
"From: Thiago Jung Bauermann <[email protected]>\n"
@@ -1719,17 +1719,17 @@ msgstr "entradas demais no cache pk - desativado\n"
msgid "too many entries in unk cache - disabled\n"
msgstr "entradas demais no cache unk - desativado\n"
-#: g10/getkey.c:2169
+#: g10/getkey.c:2203
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
-#: g10/getkey.c:2211 g10/trustdb.c:577
+#: g10/getkey.c:2245 g10/trustdb.c:577
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
-#: g10/getkey.c:2499
+#: g10/getkey.c:2532
#, fuzzy
msgid "[User id not found]"
msgstr "%s: usu�rio n�o encontrado\n"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 41eddc504..6199bd172 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -1,19 +1,20 @@
-# PT_pt messages for gnupg
-# Pedro Morais <[email protected]>
+# pt_PT messages for gnupg
+# Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+# Pedro Morais <[email protected]>
#
-# Based on PT_br work done by:
-# Thiago Jung Bauermann <[email protected]>, 1999.
-# Rafael Caetano dos Santos <[email protected]>.
+# Based on pt_PT work done by:
+# Thiago Jung Bauermann <[email protected]>
+# Rafael Caetano dos Santos <[email protected]>
msgid ""
msgstr ""
"Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 2001-04-06 10:29+0200\n"
-"PO-Revision-Date: 1999-09-09 20:28+0000\n"
-"Last-Translator: Pedro Morais <[email protected]>\n"
-"Language-Team: pt\n"
-"MIME-Version:\n"
-"Content-Type:\n"
-"Content-Transfer-Encoding:\n"
+"POT-Creation-Date: 2001-04-17 11:40+0200\n"
+"PO-Revision-Date: 2001-04-08 16:28+00:00\n"
+"Last-Translator: Pedro Morais <[email protected]>\n"
+"Language-Team: pt <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-latin-1\n"
+"Content-Transfer-Encoding: none\n"
#: util/secmem.c:79
msgid "Warning: using insecure memory!\n"
@@ -43,7 +44,6 @@ msgstr "n�o"
msgid "nN"
msgstr "nN"
-# INICIO MENU
#: g10/keyedit.c:581 util/miscutil.c:308
msgid "quit"
msgstr "sair"
@@ -250,14 +250,12 @@ msgstr "n�o processado"
#. the key cannot be used for a specific usage
#: util/errors.c:105
-#, fuzzy
msgid "unusable public key"
-msgstr "chave p�blica incorrecta"
+msgstr "chave p�blica n�o utiliz�vel"
#: util/errors.c:106
-#, fuzzy
msgid "unusable secret key"
-msgstr "chave secreta incorrecta"
+msgstr "chave secreta n�o utiliz�vel"
#: util/logger.c:224
#, c-format
@@ -275,51 +273,52 @@ msgid "can't open `%s': %s\n"
msgstr "imposs�vel abrir `%s': %s\n"
#: cipher/random.c:324
-#, fuzzy, c-format
+#, c-format
msgid "can't stat `%s': %s\n"
-msgstr "imposs�vel abrir `%s': %s\n"
+msgstr "imposs�vel 'stat' a `%s': %s\n"
#: cipher/random.c:329
#, c-format
msgid "`%s' is not a regular file - ignored\n"
-msgstr ""
+msgstr "`%s' n�o � um ficheiro normal - ignorado\n"
#: cipher/random.c:334
msgid "note: random_seed file is empty\n"
-msgstr ""
+msgstr "nota: random_seed est� vazia\n"
#: cipher/random.c:340
msgid "warning: invalid size of random_seed file - not used\n"
msgstr ""
+"aviso: o ficheiro random_seed tem um tamanho inv�lido - n�o utilizado\n"
#: cipher/random.c:348
-#, fuzzy, c-format
+#, c-format
msgid "can't read `%s': %s\n"
-msgstr "imposs�vel abrir `%s': %s\n"
+msgstr "imposs�vel ler `%s': %s\n"
#: cipher/random.c:386
msgid "note: random_seed file not updated\n"
-msgstr ""
+msgstr "nota: ficheiro random_seed n�o actualizado\n"
#: cipher/random.c:406
-#, fuzzy, c-format
+#, c-format
msgid "can't create `%s': %s\n"
-msgstr "imposs�vel criar %s: %s\n"
+msgstr "imposs�vel criar `%s': %s\n"
#: cipher/random.c:413
-#, fuzzy, c-format
+#, c-format
msgid "can't write `%s': %s\n"
-msgstr "imposs�vel abrir `%s': %s\n"
+msgstr "imposs�vel escrever `%s': %s\n"
#: cipher/random.c:416
-#, fuzzy, c-format
+#, c-format
msgid "can't close `%s': %s\n"
-msgstr "imposs�vel abrir `%s': %s\n"
+msgstr "imposs�vel fechar `%s': %s\n"
#: cipher/random.c:427
#, c-format
msgid "too many random bits requested; the limit is %d\n"
-msgstr ""
+msgstr "demasiados bits alet�rios pedidos; o limite s�o %d\n"
#: cipher/random.c:659
msgid "WARNING: using insecure random number generator!!\n"
@@ -458,7 +457,6 @@ msgstr "importar/fundir chaves"
msgid "list only the sequence of packets"
msgstr "listar apenas as sequ�ncias de pacotes"
-# ownertrust ???
#: g10/g10.c:251
msgid "export the ownertrust values"
msgstr "exportar os valores de confian�a"
@@ -564,7 +562,7 @@ msgstr "n�o fazer altera��es"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
#: g10/g10.c:292
msgid "use the gpg-agent"
-msgstr ""
+msgstr "utilizar o gpg-agent"
#: g10/g10.c:293
msgid "batch mode: never ask"
@@ -614,7 +612,7 @@ msgstr ""
#: g10/g10.c:310
msgid "|KEYID|ulimately trust this key"
-msgstr ""
+msgstr "|KEYID|confiar totalmente nesta chave"
#: g10/g10.c:311
msgid "|FILE|load extension module FILE"
@@ -672,6 +670,8 @@ msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
+"@\n"
+"(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
#: g10/g10.c:329
msgid ""
@@ -857,9 +857,8 @@ msgid "--delete-key user-id"
msgstr "--delete-key id-utilizador"
#: g10/g10.c:1305
-#, fuzzy
msgid "--delete-secret-and-public-key user-id"
-msgstr "--delete-secret-key id-utilizador"
+msgstr "--delete-secret-and-public-key id-utilizador"
#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
#, c-format
@@ -880,11 +879,10 @@ msgstr "retirada de armadura falhou: %s\n"
msgid "enarmoring failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
-# "hash" poderia ser "espalhamento", mas n�o fica claro
#: g10/g10.c:1502
#, c-format
msgid "invalid hash algorithm `%s'\n"
-msgstr "algoritmo de hash inv�lido `%s'\n"
+msgstr "algoritmo de dispers�o inv�lido `%s'\n"
#: g10/g10.c:1589
msgid "[filename]"
@@ -980,11 +978,11 @@ msgstr "fim de ficheiro prematuro (no \"Trailer\")\n"
#: g10/armor.c:776
msgid "error in trailer line\n"
-msgstr "erro na linha \"trailer\"\n"
+msgstr "erro na �ltima linha\n"
#: g10/armor.c:922
msgid "For info see http://www.gnupg.org"
-msgstr ""
+msgstr "Para mais informa��es veja http://www.gnupg.org"
#: g10/armor.c:1050
msgid "no valid OpenPGP data found.\n"
@@ -1014,33 +1012,31 @@ msgstr "Impress�o digital:"
#: g10/pkclist.c:116
msgid "No reason specified"
-msgstr ""
+msgstr "Nenhum motivo especificado"
#: g10/pkclist.c:118
-#, fuzzy
msgid "Key is superseded"
-msgstr "A chave � protegida.\n"
+msgstr "A chave foi substitu�da"
#: g10/pkclist.c:120
-#, fuzzy
msgid "Key has been compromised"
-msgstr "Esta chave foi desactivada"
+msgstr "A chave foi comprometida"
#: g10/pkclist.c:122
msgid "Key is no longer used"
-msgstr ""
+msgstr "A chave j� n�o � utilizada"
#: g10/pkclist.c:124
msgid "User ID is no longer valid"
-msgstr ""
+msgstr "O identificador do utilizador j� n�o � v�lido"
#: g10/pkclist.c:128
msgid "Reason for revocation: "
-msgstr ""
+msgstr "Motivo da revoca��o: "
#: g10/pkclist.c:145
msgid "Revocation comment: "
-msgstr ""
+msgstr "Coment�rio da revoca��o: "
#. a string with valid answers
#: g10/pkclist.c:303
@@ -1295,20 +1291,19 @@ msgstr "nenhum endere�o v�lido\n"
msgid "writing self signature\n"
msgstr "escrevendo auto-assinatura\n"
-# key binding ???
#: g10/keygen.c:217
msgid "writing key binding signature\n"
msgstr "escrevendo assinatura ligada a uma chave\n"
#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
-#, fuzzy, c-format
+#, c-format
msgid "keysize invalid; using %u bits\n"
-msgstr "O tamanho de chave pedido � %u bits\n"
+msgstr "tamanho de chave inv�lido; a utilizar %u bits\n"
#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
-#, fuzzy, c-format
+#, c-format
msgid "keysize rounded up to %u bits\n"
-msgstr "arredondado para %u bits\n"
+msgstr "tamanho da chave arredondado para %u bits\n"
#: g10/keygen.c:549
msgid "Please select what kind of key you want:\n"
@@ -1327,17 +1322,17 @@ msgstr " (%d) DSA (apenas assinatura)\n"
#: g10/keygen.c:554
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
-msgstr " (%d) ElGamal (apenas encrip��o)\n"
+msgstr " (%d) ElGamal (apenas cifragem)\n"
#: g10/keygen.c:555
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
-msgstr " (%d) ElGamal (assinatura e encripta��o)\n"
+msgstr " (%d) ElGamal (assinatura e cifragem)\n"
#: g10/keygen.c:557
-#, fuzzy, c-format
+#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
-msgstr " (%d) ElGamal (assinatura e encripta��o)\n"
+msgstr " (%d) RSA (assinatura e cifragem)\n"
#: g10/keygen.c:561
msgid "Your selection? "
@@ -1349,7 +1344,7 @@ msgstr "Voc� quer realmente criar uma chave para assinatura e criptografia? "
#: g10/keygen.c:580
msgid "The use of this algorithm is deprecated - create anyway? "
-msgstr ""
+msgstr "A utiliza��o destes algoritmos est� desactualizada - criar na mesma?"
#: g10/keygen.c:594
msgid "Invalid selection.\n"
@@ -1381,9 +1376,8 @@ msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
#: g10/keygen.c:622
-#, fuzzy
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
+msgstr "tamanho muito pequeno; 1024 � o valor m�nimo permitido para RSA.\n"
#. It is ridiculous and an annoyance to use larger key sizes!
#. * GnuPG can handle much larger sizes; but it takes an eternity
@@ -1546,15 +1540,16 @@ msgstr ""
#: g10/keygen.c:883
msgid "Please don't put the email address into the real name or the comment\n"
msgstr ""
+"Por favor n�o coloque o endere�o de email no nome verdadeiro ou no "
+"coment�rio\n"
#: g10/keygen.c:888
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoSs"
#: g10/keygen.c:898
-#, fuzzy
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
-msgstr "Mudar (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
+msgstr "Mudar (N)ome, (C)oment�rio, (E)mail ou (S)air? "
#: g10/keygen.c:899
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
@@ -1562,7 +1557,7 @@ msgstr "Mudar (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
#: g10/keygen.c:918
msgid "Please correct the error first\n"
-msgstr ""
+msgstr "Por favor corrija primeiro o erro\n"
#: g10/keygen.c:956
msgid ""
@@ -1609,14 +1604,14 @@ msgid "Key generation canceled.\n"
msgstr "Gera��o de chave cancelada.\n"
#: g10/keygen.c:1581
-#, fuzzy, c-format
+#, c-format
msgid "writing public key to `%s'\n"
-msgstr "escrevendo certificado p�blico para `%s'\n"
+msgstr "a escrever chave p�blica para `%s'\n"
#: g10/keygen.c:1582
-#, fuzzy, c-format
+#, c-format
msgid "writing secret key to `%s'\n"
-msgstr "escrevendo certificado privado para `%s'\n"
+msgstr "a escrever chave privada para `%s'\n"
#: g10/keygen.c:1679
msgid "public and secret key created and signed.\n"
@@ -1697,9 +1692,9 @@ msgid "key %08lX: not a rfc2440 key - skipped\n"
msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
#: g10/export.c:182
-#, fuzzy, c-format
+#, c-format
msgid "key %08lX: not protected - skipped\n"
-msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
+msgstr "chave %08lX: n�o est� protegida - ignorada\n"
#: g10/export.c:236
msgid "WARNING: nothing exported\n"
@@ -1713,20 +1708,19 @@ msgstr "entradas demais no cache pk - desactivado\n"
msgid "too many entries in unk cache - disabled\n"
msgstr "entradas demais no cache unk - desactivado\n"
-#: g10/getkey.c:2169
+#: g10/getkey.c:2203
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
-#: g10/getkey.c:2211 g10/trustdb.c:577
+#: g10/getkey.c:2245 g10/trustdb.c:577
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
-#: g10/getkey.c:2499
-#, fuzzy
+#: g10/getkey.c:2532
msgid "[User id not found]"
-msgstr "%s: utilizador n�o encontrado\n"
+msgstr "[Utilizador n�o encontrado]"
#: g10/import.c:184
#, c-format
@@ -1749,9 +1743,9 @@ msgid "Total number processed: %lu\n"
msgstr "N�mero total processado: %lu\n"
#: g10/import.c:208
-#, fuzzy, c-format
+#, c-format
msgid " skipped new keys: %lu\n"
-msgstr " novas subchaves: %lu\n"
+msgstr " ignorei novas chaves: %lu\n"
#: g10/import.c:211
#, c-format
@@ -1823,9 +1817,9 @@ msgid "key %08lX: public key not found: %s\n"
msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
#: g10/import.c:440
-#, fuzzy, c-format
+#, c-format
msgid "key %08lX: new key - skipped\n"
-msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
+msgstr "chave %08lX: chave nova - ignorada\n"
#: g10/import.c:448
msgid "no default public keyring\n"
@@ -1904,7 +1898,7 @@ msgstr "chave %08lX: n�o modificada\n"
#: g10/import.c:610
#, c-format
msgid "secret key %08lX not imported (use %s to allow for it)\n"
-msgstr ""
+msgstr "chave secreta %08lX n�o foi importada (utilize %s para o permitir)\n"
#: g10/import.c:640
#, c-format
@@ -2104,9 +2098,8 @@ msgid "This key is not protected.\n"
msgstr "Esta chave n�o � protegida.\n"
#: g10/keyedit.c:432
-#, fuzzy
msgid "Secret parts of primary key are not available.\n"
-msgstr "chave secreta n�o dispon�vel"
+msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
#: g10/keyedit.c:436
msgid "Key is protected.\n"
@@ -2373,7 +2366,7 @@ msgstr "A chave secreta � necess�ria para fazer isto.\n"
#: g10/keyedit.c:733
msgid "Please use the command \"toggle\" first.\n"
-msgstr ""
+msgstr "Por favor utilize o comando \"toggle\" primeiro.\n"
#: g10/keyedit.c:780
msgid "Really sign all user IDs? "
@@ -2446,7 +2439,6 @@ msgstr "actualiza��o da chave secreta falhou: %s\n"
msgid "Key not changed so no update needed.\n"
msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
-# help ou ajuda ???
#: g10/keyedit.c:1002
msgid "Invalid command (try \"help\")\n"
msgstr "Comando inv�lido (tente \"help\")\n"
@@ -2454,31 +2446,30 @@ msgstr "Comando inv�lido (tente \"help\")\n"
#: g10/keyedit.c:1082 g10/keyedit.c:1108
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
-msgstr ""
+msgstr "%s%c %4u%c/%08lX criada: %s expira: %s"
#: g10/keyedit.c:1091
#, c-format
msgid " trust: %c/%c"
-msgstr ""
+msgstr " confian�a: %c/%c"
#: g10/keyedit.c:1095
msgid "This key has been disabled"
msgstr "Esta chave foi desactivada"
#: g10/keyedit.c:1124
-#, fuzzy, c-format
+#, c-format
msgid "rev! subkey has been revoked: %s\n"
-msgstr "chave %08lX: a subchave foi revogada!\n"
+msgstr "rev! subchave foi revogada: %s\n"
#: g10/keyedit.c:1127
-#, fuzzy
msgid "rev- faked revocation found\n"
-msgstr " novas revoga��es de chaves: %lu\n"
+msgstr "rev- revoga��o falsa encontrada\n"
#: g10/keyedit.c:1129
#, c-format
msgid "rev? problem checking revocation: %s\n"
-msgstr ""
+msgstr "rev? problema ao verificar revoga��o: %s\n"
#: g10/keyedit.c:1367
msgid "Delete this good signature? (y/N/q)"
@@ -2590,9 +2581,9 @@ msgstr "nenhuma chave secreta\n"
#. of subkey
#: g10/keylist.c:279 g10/mainproc.c:851
-#, fuzzy, c-format
+#, c-format
msgid " [expires: %s]"
-msgstr "A chave expira em %s\n"
+msgstr "[expira: %s]"
#: g10/mainproc.c:269
#, c-format
@@ -2662,9 +2653,8 @@ msgstr "verifica��o de assinatura suprimida\n"
#. plaintext before signatures but no one-pass packets
#: g10/mainproc.c:1235 g10/mainproc.c:1245
-#, fuzzy
msgid "can't handle these multiple signatures\n"
-msgstr "fazer uma assinatura separada"
+msgstr "n�o consigo tratar estas assinaturas m�ltiplas\n"
#: g10/mainproc.c:1256
#, c-format
@@ -2690,9 +2680,8 @@ msgid "Can't check signature: %s\n"
msgstr "Imposs�vel verificar assinatura: %s\n"
#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
-#, fuzzy
msgid "not a detached signature\n"
-msgstr "fazer uma assinatura separada"
+msgstr "n�o � uma assinatura separada\n"
#: g10/mainproc.c:1454
#, c-format
@@ -2717,11 +2706,10 @@ msgid "Experimental algorithms should not be used!\n"
msgstr "Algoritmos experimentais n�o devem ser usados!\n"
#: g10/misc.c:238
-#, fuzzy
msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
msgstr ""
-"este algoritmo de criptografia n�o � recomendado;\n"
-"por favor use um algoritmo mais standard!\n"
+"este algoritmo de criptografia est� desctualizado; por favor use um "
+"algoritmo mais standard!x\n"
#: g10/parse-packet.c:119
#, c-format
@@ -2735,16 +2723,16 @@ msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
#: g10/passphrase.c:223
msgid "gpg-agent is not available in this session\n"
-msgstr ""
+msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
#: g10/passphrase.c:229
msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr ""
+msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
#: g10/hkp.c:147 g10/passphrase.c:248
-#, fuzzy, c-format
+#, c-format
msgid "can't connect to `%s': %s\n"
-msgstr "imposs�vel abrir `%s': %s\n"
+msgstr "imposs�vel ligar a `%s': %s\n"
#: g10/passphrase.c:313 g10/passphrase.c:576
#, c-format
@@ -2752,42 +2740,42 @@ msgid " (main key ID %08lX)"
msgstr " (ID principal da chave %08lX)"
#: g10/passphrase.c:323
-#, fuzzy, c-format
+#, c-format
msgid ""
"You need a passphrase to unlock the secret key for user:\n"
"\"%.*s\"\n"
"%u-bit %s key, ID %08lX, created %s%s\n"
msgstr ""
+"Precisa de uma frase secreta para desbloquear a chave secreta do "
+"utilizador:\n"
"\n"
-"Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
-"utilizador: \""
+"\"%.*s\"\n"
+"chave %u bits %s, ID %08lx, criada %s%s\n"
#: g10/passphrase.c:344
-#, fuzzy
msgid "Enter passphrase\n"
-msgstr "Digite a frase secreta: "
+msgstr "Insira a frase secreta\n"
#: g10/passphrase.c:346
-#, fuzzy
msgid "Repeat passphrase\n"
-msgstr "Repita a frase secreta: "
+msgstr "Repita a frase secreta\n"
#: g10/passphrase.c:384
msgid "passphrase too long\n"
-msgstr ""
+msgstr "frase secreta demasiado longa\n"
#: g10/passphrase.c:396
msgid "invalid response from agent\n"
-msgstr ""
+msgstr "resposta do agente inv�lida\n"
#: g10/passphrase.c:405
msgid "cancelled by user\n"
-msgstr ""
+msgstr "cancelado pelo utilizador\n"
#: g10/passphrase.c:408 g10/passphrase.c:477
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr ""
+msgstr "problema com o agente: o agente returnou 0x%lx\n"
#: g10/passphrase.c:562
msgid ""
@@ -2833,9 +2821,8 @@ msgid "reading stdin ...\n"
msgstr "lendo do \"stdin\" ...\n"
#: g10/plaintext.c:391
-#, fuzzy
msgid "no signed data\n"
-msgstr "imposs�vel abrir dados assinados `%s'\n"
+msgstr "n�o h� dados assinados\n"
#: g10/plaintext.c:399
#, c-format
@@ -2856,9 +2843,9 @@ msgid "old encoding of the DEK is not supported\n"
msgstr "codifica��o antiga do DEK n�o suportada\n"
#: g10/pubkey-enc.c:153
-#, fuzzy, c-format
+#, c-format
msgid "cipher algorithm %d is unknown or disabled\n"
-msgstr "algoritmo de protec��o %d n�o � suportado\n"
+msgstr "algoritmo de cifra %d � desconhecido ou foi desactivado\n"
#: g10/pubkey-enc.c:192
#, c-format
@@ -2866,48 +2853,47 @@ msgid "NOTE: cipher algorithm %d not found in preferences\n"
msgstr "NOTA: algoritmo de cifragem %d n�o encontrado nas prefer�ncias\n"
#: g10/pubkey-enc.c:198
-#, fuzzy, c-format
+#, c-format
msgid "NOTE: secret key %08lX expired at %s\n"
-msgstr "NOTA: chave de assinatura expirou %s\n"
+msgstr "NOTA: chave secreta %08lX expirou em %s\n"
#: g10/hkp.c:59
#, c-format
msgid "requesting key %08lX from %s ...\n"
-msgstr ""
+msgstr "a pedir chave %08lX de %s ...\n"
#: g10/hkp.c:72
-#, fuzzy, c-format
+#, c-format
msgid "can't get key from keyserver: %s\n"
-msgstr "importar chaves de um servidor"
+msgstr "n�o consigo obterr chave do servidor: %s\n"
#: g10/hkp.c:91 g10/hkp.c:125
msgid "no keyserver known (use option --keyserver)\n"
-msgstr ""
+msgstr "nenhum servidor de chaves conhecido (utilize a op��o --keyserver)\n"
#: g10/hkp.c:99
-#, fuzzy, c-format
+#, c-format
msgid "%s: not a valid key ID\n"
-msgstr "%s n�o � um conjunto de caracteres v�lido\n"
+msgstr "%s: n�o � um identificador de chave v�lido\n"
#: g10/hkp.c:171
-#, fuzzy, c-format
+#, c-format
msgid "error sending to `%s': %s\n"
-msgstr "erro na leitura de `%s': %s\n"
+msgstr "erro ao enviar para `%s': %s\n"
#: g10/hkp.c:183
#, c-format
msgid "success sending to `%s' (status=%u)\n"
-msgstr ""
+msgstr "sucesso ao enviar para `%s' (estado=%u)\n"
#: g10/hkp.c:186
#, c-format
msgid "failed sending to `%s': status=%u\n"
-msgstr ""
+msgstr "erro ao enviar para `%s': estado=%u\n"
#: g10/seckey-cert.c:53
-#, fuzzy
msgid "secret key parts are not available\n"
-msgstr "chave secreta n�o dispon�vel"
+msgstr "partes da chave secreta n�o dispon�veis\n"
#: g10/seckey-cert.c:59
#, c-format
@@ -2944,18 +2930,18 @@ msgid "public key is %lu seconds newer than the signature\n"
msgstr "a chave p�blica � %lu segundos mais nova que a assinatura\n"
#: g10/sig-check.c:328
-#, fuzzy, c-format
+#, c-format
msgid "NOTE: signature key %08lX expired %s\n"
-msgstr "NOTA: chave de assinatura expirou %s\n"
+msgstr "NOTA: chave de assinatura %08lx expirou %s\n"
#: g10/sig-check.c:398
msgid "assuming bad signature due to an unknown critical bit\n"
msgstr "assumindo assinatura incorrecta devido a um bit cr�tico desconhecido\n"
#: g10/sign.c:152
-#, fuzzy, c-format
+#, c-format
msgid "checking created signature failed: %s\n"
-msgstr "Imposs�vel verificar assinatura: %s\n"
+msgstr "verifica��o da assinatura criada falhou: %s\n"
#: g10/sign.c:161
#, c-format
@@ -3043,7 +3029,7 @@ msgstr "%s: base de dados de confian�a inv�lida\n"
#: g10/tdbio.c:550
#, c-format
msgid "%s: failed to create hashtable: %s\n"
-msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
+msgstr "%s: falha ao criar tabela de dispers�o: %s\n"
#: g10/tdbio.c:558
#, c-format
@@ -3158,9 +3144,9 @@ msgid "get_dir_record: search_record failed: %s\n"
msgstr "get_dir_record: search_record falhou: %s\n"
#: g10/trustdb.c:474
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a valid long keyID\n"
-msgstr "%s n�o � um conjunto de caracteres v�lido\n"
+msgstr "'%s' n�o � um identificador de chave longo v�lido\n"
#: g10/trustdb.c:501
#, c-format
@@ -3183,9 +3169,11 @@ msgid "key %08lX: accepted as trusted key.\n"
msgstr "chave %08lX: aceite como chave confi�vel.\n"
#: g10/trustdb.c:546
-#, fuzzy, c-format
+#, c-format
msgid "key %08lX: no public key for trusted key - skipped\n"
-msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
+msgstr ""
+"chave %08lX: nenhuma chave p�blica para chave de confian�a - ignorada\n"
+"\n"
#: g10/trustdb.c:565
#, c-format
@@ -3451,9 +3439,9 @@ msgstr ""
"a chave n�o est� marcada insegura - imposs�vel us�-la com o RNG falso!\n"
#: g10/skclist.c:138
-#, fuzzy, c-format
+#, c-format
msgid "skipped `%s': duplicated\n"
-msgstr "ignorado `%s': %s\n"
+msgstr "ignorado `%s': duplicada\n"
#: g10/skclist.c:145 g10/skclist.c:153
#, c-format
@@ -3461,9 +3449,8 @@ msgid "skipped `%s': %s\n"
msgstr "ignorado `%s': %s\n"
#: g10/skclist.c:149
-#, fuzzy
msgid "skipped: secret key already present\n"
-msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
+msgstr "ignorado: a chave secreta j� est� presente\n"
#: g10/skclist.c:160
#, c-format
@@ -3539,9 +3526,8 @@ msgstr ""
"sim�trica.\n"
#: g10/encr-data.c:97
-#, fuzzy
msgid "problem handling encrypted packet\n"
-msgstr "eliminar campo keyid dos pacotes encriptados"
+msgstr "problema ao tratar pacote encriptado\n"
#: g10/seskey.c:52
msgid "weak key created - retrying\n"
@@ -3692,7 +3678,7 @@ msgid ""
msgstr ""
"N para mudar o nome.\n"
"C para mudar o coment�rio.\n"
-"E para mudar o endere�o de correio eletr�nico.\n"
+"E para mudar o endere�o de email\n"
"O para continuar a gera��o da chave.\n"
"S para interromper a gera��o da chave."
@@ -3761,7 +3747,7 @@ msgstr ""
msgid ""
"Please enter the passhrase; this is a secret sentence \n"
" Blurb, blurb,.... "
-msgstr "Por favor digite a FRASE secreta"
+msgstr "Por favor digite a frase secreta"
#: g10/helptext.c:209
msgid "Please repeat the last passphrase, so you are sure what you typed in."
@@ -3799,6 +3785,19 @@ msgid ""
" Use this to state that the user ID should not longer be used;\n"
" this is normally used to mark an email address invalid.\n"
msgstr ""
+"Deve especificar uma raz�o para a emiss�o do certificado. Dependendo no\n"
+"contexto, pode escolher as seguintes op��es desta lista:\n"
+" \"A chave foi comprometida\"\n"
+" Utilize esta op��o se tem raz�es para acreditar que indiv�duos n�o\n"
+" autorizados obtiveram acesso � sua chave secreta.\n"
+" \"A chave foi substituida\"\n"
+" Utilize esta op��o se substituiu esta chave com uma mais recente.\n"
+" \"A chave j� n�o � utilizada\"\n"
+" Utilize esta op��o se j� n�o utiliza a chave.\n"
+" \"O identificador do utilizador j� n�o � v�lido\"\n"
+" Utilize esta op��o para comunicar que o identificador do utilizador\n"
+" n�o deve ser mais utilizado; normalmente utilizada para indicar\n"
+" que um endere�o de email � inv�lido.\n"
#: g10/helptext.c:245
msgid ""
@@ -3806,6 +3805,9 @@ msgid ""
"revocation certificate. Please keep this text concise.\n"
"An empty line ends the text.\n"
msgstr ""
+"Se desejar, pode inserir uma texto descrevendo a raz�o pela qual criou\n"
+"este certificado de revoga��o. Por favor mantenha este texto conciso.\n"
+"Uma linha vazia termina o texto.\n"
#: g10/helptext.c:260
msgid "No help available"
@@ -3815,51 +3817,3 @@ msgstr "Nenhuma ajuda dispon�vel"
#, c-format
msgid "No help available for `%s'"
msgstr "Nenhuma ajuda dispon�vel para `%s'"
-
-#, fuzzy
-#~ msgid "invalid"
-#~ msgstr "armadura inv�lida"
-
-#, fuzzy
-#~ msgid "revoked"
-#~ msgstr "revkey"
-
-#~ msgid "RSA key cannot be used in this version\n"
-#~ msgstr "chave RSA n�o pode ser usada nesta vers�o\n"
-
-#~ msgid "No key for user ID\n"
-#~ msgstr "Nenhuma chave para identificador de utilizador\n"
-
-#~ msgid "No user ID for key\n"
-#~ msgstr "Nenhum identificador de utilizador para chave\n"
-
-#~ msgid "no secret key for decryption available\n"
-#~ msgstr "nenhuma chave secreta para desencripta��o dispon�vel\n"
-
-#~ msgid ""
-#~ "RSA keys are deprecated; please consider creating a new key and use this key "
-#~ "in the future\n"
-#~ msgstr ""
-#~ "Chaves RSA n�o s�o recomend�veis; por favor considere criar uma nova chave e "
-#~ "us�-la no futuro\n"
-
-#~ msgid "set debugging flags"
-#~ msgstr "definir par�metros de depura��o"
-
-#~ msgid "enable full debugging"
-#~ msgstr "habilitar depura��o completa"
-
-#~ msgid "do not write comment packets"
-#~ msgstr "n�o escrever pacotes de coment�rio"
-
-#~ msgid "(default is 1)"
-#~ msgstr "(por omiss�o 1)"
-
-#~ msgid "(default is 3)"
-#~ msgstr "(por omiss�o 3)"
-
-#~ msgid " (%d) ElGamal in a v3 packet\n"
-#~ msgstr " (%d) ElGamal num pacote v3\n"
-
-#~ msgid "Key generation can only be used in interactive mode\n"
-#~ msgstr "A gera��o de chaves s� pode ser feita em modo interactivo\n"
diff --git a/po/ru.po b/po/ru.po
index 4dddec7bb..6bee9b83a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@
# QingLong <qinglong@Bolizm> (couldn't send an email to let you know)
msgid ""
msgstr ""
-"POT-Creation-Date: 2001-04-06 10:29+0200\n"
+"POT-Creation-Date: 2001-04-17 11:40+0200\n"
"Content-Type: text/plain; charset=\n"
"Date: 1998-01-26 22:08:36+0100\n"
"From: Gregory Steuck <[email protected]>\n"
@@ -1781,17 +1781,17 @@ msgstr ""
msgid "too many entries in unk cache - disabled\n"
msgstr ""
-#: g10/getkey.c:2169
+#: g10/getkey.c:2203
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "������������ �������������� ���� %09lX ������ ��������� %08lX%\n"
-#: g10/getkey.c:2211 g10/trustdb.c:577
+#: g10/getkey.c:2245 g10/trustdb.c:577
#, fuzzy, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "��������� ���� %08lX: �� ����� ���������������� ��������� �����.\n"
-#: g10/getkey.c:2499
+#: g10/getkey.c:2532
#, fuzzy
msgid "[User id not found]"
msgstr "%s: ������������ �� ������\n"
diff --git a/po/sv.po b/po/sv.po
index e9a320b09..d3e58a026 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -13,7 +13,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.1e\n"
-"POT-Creation-Date: 2001-04-06 10:29+0200\n"
+"POT-Creation-Date: 2001-04-17 11:40+0200\n"
"PO-Revision-Date: 2000-04-23 16:43+02:00\n"
"Last-Translator: Daniel Resare <[email protected]>\n"
"Language-Team: Swedish <[email protected]>\n"
@@ -1723,17 +1723,17 @@ msgstr "f�r m�nga poster i pk-cachen - inaktiverad\n"
msgid "too many entries in unk cache - disabled\n"
msgstr "f�r m�nga poster i unk-cachen - inaktiverad\n"
-#: g10/getkey.c:2169
+#: g10/getkey.c:2203
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "anv�nder sekund�ra nyckeln %08lX ist�llet f�r prim�rnyckeln %08lX\n"
-#: g10/getkey.c:2211 g10/trustdb.c:577
+#: g10/getkey.c:2245 g10/trustdb.c:577
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "nyckel %08lX: hemlig nyckel utan publik nyckel - hoppade �ver\n"
-#: g10/getkey.c:2499
+#: g10/getkey.c:2532
#, fuzzy
msgid "[User id not found]"
msgstr "%s: hittade inte anv�ndaren\n"
diff --git a/po/tr.po b/po/tr.po
index 02b4d7738..6619de098 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg-1.0.4\n"
-"POT-Creation-Date: 2001-04-06 10:29+0200\n"
+"POT-Creation-Date: 2001-04-17 11:40+0200\n"
"PO-Revision-Date: 2000-11-01 05:20+300\n"
"Last-Translator: Nilg�n Belma Bug�ner <[email protected]>\n"
"Language-Team: Turkish <[email protected]>\n"
@@ -1688,17 +1688,17 @@ msgstr "pk belle�inde �ok fazla girdi - iptal edildi\n"
msgid "too many entries in unk cache - disabled\n"
msgstr "unk belle�inde �ok fazla girdi - iptal edildi\n"
-#: g10/getkey.c:2169
+#: g10/getkey.c:2203
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "yard�mc� anahtar %08lX, as�l anahtar %08lX yerine kullan�l�yor\n"
-#: g10/getkey.c:2211 g10/trustdb.c:577
+#: g10/getkey.c:2245 g10/trustdb.c:577
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "%08lX anahtar�: genel anahtars�z gizli anahtar - atland�\n"
-#: g10/getkey.c:2499
+#: g10/getkey.c:2532
msgid "[User id not found]"
msgstr "[�zg�n dizi bulunamad�]"
diff --git a/util/ChangeLog b/util/ChangeLog
index f964bdf33..589eb26c8 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,13 @@
+2001-04-14 Werner Koch <[email protected]>
+
+ * strgutil.c (utf8_to_native): Fixed a segv. Thanks to Keith Clayton.
+
+2001-04-13 Werner Koch <[email protected]>
+
+ * iobuf.c (iobuf_fopen): Removed because it is not used and
+ furthermore mode is ignored for an fname of "-". Suggested by
+ Florian Weimer.
+
2001-04-02 Werner Koch <[email protected]>
* iobuf.c (translate_file_handle): New. Use this function
diff --git a/util/iobuf.c b/util/iobuf.c
index 7c0f2d2cc..5013e6039 100644
--- a/util/iobuf.c
+++ b/util/iobuf.c
@@ -1218,39 +1218,6 @@ iobuf_openrw( const char *fname )
}
-
-/****************
- * You can overwrite the normal iobuf behaviour by using this function.
- * If used the iobuf is a simple wrapper around stdio.
- * NULL if an error occures and sets errno
- */
-IOBUF
-iobuf_fopen( const char *fname, const char *mode )
-{
- IOBUF a;
- FILE *fp;
- int print_only = 0;
-
- if( !fname || (*fname=='-' && !fname[1]) ) {
- fp = stdin;
- #ifdef HAVE_DOSISH_SYSTEM /* We can't use USE_SETMODE here */
- setmode ( fileno(fp) , O_BINARY );
- #endif
- fname = "[stdin]";
- print_only = 1;
- }
- else if( !(fp = fopen(fname, mode) ) )
- return NULL;
- a = iobuf_alloc(1, 8192 );
- a->directfp = fp;
- a->real_fname = m_strdup( fname );
-
- if( DBG_IOBUF )
- log_debug("iobuf_fopen -> %p\n", a->directfp );
-
- return a;
-}
-
int
iobuf_ioctl ( IOBUF a, int cmd, int intval, void *ptrval )
{
diff --git a/util/strgutil.c b/util/strgutil.c
index ba92481d5..f65a16167 100644
--- a/util/strgutil.c
+++ b/util/strgutil.c
@@ -453,11 +453,13 @@ utf8_to_native( const char *string, size_t length )
case '\v': n++; if( p ) *p++ = 'v'; break;
case '\b': n++; if( p ) *p++ = 'b'; break;
case 0 : n++; if( p ) *p++ = '0'; break;
- default: n += 3;
- sprintf( p, "x%02x", *s );
- if ( p )
- p += 3;
- break;
+ default:
+ n += 3;
+ if ( p ) {
+ sprintf( p, "x%02x", *s );
+ p += 3;
+ }
+ break;
}
}
else {