Estonian translation, .texi man pages.

AUTHORS

@@ -48,6 +48,8 @@ Tedi Heriyanto	<tedi-h@usa.net> Translations [id]
 
 Thiago Jung Bauermann <jungmann@cwb.matrix.com.br> Translations [pt_BR]
 
+Toomas Soome <tsoome@ut.ee> Translations [et]
+
 Urko Lusa <ulusa@euskalnet.net> Translations [es_ES]
 
 Walter Koch <koch@u32.de>  Translations [de]

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.
 

ChangeLog

@@ -1,3 +1,12 @@
+2001-04-17  Werner Koch  <wk@gnupg.org>
+
+	* 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  <wk@gnupg.org>
 
 	* configure.in (ALL_LINGUAS): Add Turkish translation.  Thanks

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
 

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 <allanc@sco.com> for 0.9.8
 

THANKS

@@ -68,6 +68,7 @@ Huy Le			   huyle@ugcs.caltech.edu
 Ian McKellar		   imckellar@harvestroad.com.au
 Ivo Timmermans		   itimmermans@bigfoot.com
 Jan Krueger		   max@physics.otago.ac.nz
+Jan Niehusmann             jan@gondor.com  
 Janusz A. Urbanowicz	   alex@bofh.torun.pl
 James Troup		   james@nocrew.org
 Jean-loup Gailly	   gzip@prep.ai.mit.edu
@@ -90,10 +91,12 @@ Karl Fogel		   kfogel@guanabana.onshore.com
 Karsten Thygesen	   karthy@kom.auc.dk
 Katsuhiro Kondou	   kondou@nec.co.jp
 Kazu Yamamoto		   kazu@iijlab.net
+Keith Clayton              keith@claytons.org
 Kevin Ryde                 user42@zip.com.au
 Klaus Singvogel            ks@caldera.de
 Lars Kellogg-Stedman	   lars@bu.edu
 L. Sassaman		   rabbi@quickie.net
+M Taylor                   mctaylor@privacy.nb.ca                 
 Marco d'Itri               md@linux.it
 Mark Adler		   madler@alumni.caltech.edu
 Mark Elbrecht		   snowball3@bigfoot.com

VERSION

@@ -1 +1 @@
-1.0.4g
+1.0.4h

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

cipher/ChangeLog

@@ -1,3 +1,14 @@
+2001-04-17  Werner Koch  <wk@gnupg.org>
+
+	* rndunix.c: Add a signal.h header to avoid warnings on SOlaris 7
+	and 8.
+
+2001-04-16  Werner Koch  <wk@gnupg.org>
+
+	* dynload.c [__MINGW32__]: Applied patch from Timo Schulz to make
+	it work under W32.  This patches is based on the one from
+	Disastry@saiknes.lv
+
 2001-04-06  Werner Koch  <wk@gnupg.org>
 
 	* rijndael.c, des.c, blowfish.c, twofish.c, cast5.c (burn_stack):

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 Disastry@saiknes.lv patch.
+#define HAVE_DL_DLOPEN
+#define USE_DYNAMIC_LINKING
 
-#define dlopen(PATHNAME,MODE) ((void *)LoadLibrary(PATHNAME))
+static int last_error = 0;
-#define dlclose(HANDLE) FreeLibrary(HANDLE)
+    
-char *dlerror(void)
+void*
+dlopen(const char *pathname, int mode)
 {
-    static char dlerrstr[10];
+	void *h = LoadLibrary( pathname );
-    int err=GetLastError();
+	if (!h) {
-    if (!err)
+	log_error( "LoadLibrary failed ec=%d\n", (int)GetLastError() );
-      return NULL;
+	last_error = 1;
-    sprintf(dlerrstr, "%u", err);
+	return NULL;
-    return dlerrstr;
+	}
+	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

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>

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_MSG_CHECKING([whether memory guard is requested])
-AC_ARG_ENABLE(m-debug,
+AC_ARG_ENABLE(m-guard,
-[  --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,
     [  --enable-m-guard        enable memory guard facility],
     use_m_guard=$enableval, use_m_guard=no)
-    AC_MSG_RESULT($use_m_guard)
+AC_MSG_RESULT($use_m_guard)
-fi
 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=""
 

doc/ChangeLog

@@ -1,3 +1,17 @@
+2001-04-17  Werner Koch  <wk@gnupg.org>
+
+	* 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  <wk@gnupg.org>
+
+	* gpg.sgml: Small typo fixes by Florian Weimer.
+
 2001-03-27  Werner Koch  <wk@gnupg.org>
 
 	* gpg.sgml: Add --no-sig-cache and --no-sig-create-check.

doc/HACKING

@@ -10,12 +10,13 @@ CVS Access
 ==========
 Anonymous read-only CVS access is available:
 
-  cvs -z6 -d :pserver:anonymous@cvs.guug.de:/home/koch/cvs login
+  cvs -z3 -d :pserver:anoncvs@cvs.gnupg.org:/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:anonymous@cvs.guug.de:/home/koch/cvs checkout gnupg
+  cvs -z3 -d :pserver:anoncvs@cvs.gnupg.org:/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/getkey.c    Key selection code
-g10/pkclist.c
+g10/pkclist.c   Build a list of public keys
-g10/skclist.c
+g10/skclist.c   Build a list of secret keys
-g10/ringedit.c
+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
+               Management of the trustdb.gpg
 
-g10/compress.c
+g10/compress.c Filter to handle compression
-g10/filter.h
+g10/filter.h   Declarations for all filter functions
-g10/delkey.c
+g10/delkey.c   Delete a key
-g10/kbnode.c
+g10/kbnode.c   Helper for the KBNODE linked list
-g10/main.h
+g10/main.h     Prototypes and some constants
-g10/mainproc.c
+g10/mainproc.c Message processing
-g10/armor.c
+g10/armor.c    Ascii armor filter 
-g10/mdfilter.c
+g10/mdfilter.c Filter to calculate hashs
-g10/textfilter.c
+g10/textfilter.c Filter to handle CR/LF and trailing white space
-g10/cipher.c
+g10/cipher.c   En-/Decryption filter
-g10/misc.c
+g10/misc.c     Utlity functions
-g10/options.h
+g10/options.h  Structure with all the command line options
-g10/openfile.c
+               and related constants
-g10/tdbio.c
+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/packet.h   Defintion of OpenPGP structures.
-g10/passphrase.c
+g10/passphrase.c  Passphrase handling code
-g10/pubkey-enc.c
+g10/pubkey-enc.c  
 g10/seckey-cert.c
 g10/seskey.c
 g10/import.c

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

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.
+Do not cache the verification status of key signatures.
-Caching gives a much better performance in key listings, however if
+Caching gives a much better performance in key listings.  However, if
-you suspect that your public keyring is not saved against write
+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>

g10/ChangeLog

@@ -1,3 +1,17 @@
+2001-04-14  Werner Koch  <wk@gnupg.org>
+
+	* getkey.c (fixup_uidnode): Removed check for !sig which is
+	pointless here.  Thanks to Jan Niehusmann.
+
+2001-04-10  Werner Koch  <wk@gnupg.org>
+
+	* 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  <wk@gnupg.org>
 
 	* armor.c (unarmor_pump_new,unarmor_pump_release): New.

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 ) {

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 

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;
 	}

include/ChangeLog

@@ -1,3 +1,7 @@
+2001-04-13  Werner Koch  <wk@gnupg.org>
+
+	* iobuf.h: Removed iobuf_fopen.
+
 2001-03-01  Werner Koch  <wk@gnupg.org>
 
 	* errors.h (G10ERR_UNU_SECKEY,G10ERR_UNU_PUBKEY): New

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 );

mpi/ChangeLog

@@ -1,3 +1,7 @@
+2001-04-17  Werner Koch  <wk@gnupg.org>
+
+	Updated copyright notices.
+
 2001-03-24  Werner Koch  <wk@gnupg.org>
 
 	* mpi-mul.c (mpi_mul): Make sure that secret temporary results are

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.
  *

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, 1997, 1998, 1999,
- *	Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ *               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.

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.

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, 1997, 1998, 1999
- *	Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ *               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.

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, 1997, 1998, 1999,
- *	Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ *               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.

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, 1997, 1998, 1999,
- *	Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ *               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.

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
  *

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, 1997, 1998, 1999,
- *	Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+ *               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.

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

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

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.

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.
  *

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.
  *

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.

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.
  *

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.
  *

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.

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.

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.
  *

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.
  *

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.

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.

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.
  *

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.
  *

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.

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.

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.
  *

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.
  *

po/ChangeLog

@@ -1,3 +1,13 @@
+2001-04-17  Werner Koch  <wk@gnupg.org>
+
+	* et.po: New.
+
+	* de.po: Updated.
+
+2001-04-16  Werner Koch  <wk@gnupg.org>
+
+	* pt_PT.po: Updated.
+
 2001-04-06  Werner Koch  <wk@gnupg.org>
 
 	* tr.po: New. 

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 <birger.langkjer@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\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"

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"
+"POT-Creation-Date: 2001-04-17 11:40+0200\n"
-"PO-Revision-Date: 2001-02-20 21:20+0200\n"
+"PO-Revision-Date: 2001-04-16 14:20+0200\n"
 "Last-Translator: Walter Koch <koch@hsp.de>\n"
 "Language-Team: German <de@li.org>\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
 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-
 
 #. 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

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 <edmundo@rano.org>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -1683,17 +1683,17 @@ msgstr "tro da registroj en pk-staplo - mal
 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]"
 

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"

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 <gqueri@mail.dotcom.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -1712,19 +1712,19 @@ msgstr "trop d'entr
 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]"
 

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 <tedi-h@usa.net>\n"
 "Language-Team: Indonesia <id@li.org>\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"

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 <md@linux.it>\n"
 "Language-Team: Italian <it@li.org>\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"

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 <y-iida@secom.co.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -1717,17 +1717,17 @@ msgstr "pk
 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が見つかりません]"
 

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 <itimmermans@bigfoot.com>\n"
 "Language-Team: Dutch <nl@li.org>\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"

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 <alex@bofh.net.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -1713,17 +1713,17 @@ msgstr "zbyt wiele wpis
 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]"
 

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 <jungmann@usa.net>\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"

po/pt_PT.po

@@ -1,19 +1,20 @@
-# PT_pt messages for gnupg
+# pt_PT messages for gnupg
-# Pedro Morais <morais@poli.org>
+# Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+# Pedro Morais <morais@kde.org>
 #
-# Based on PT_br work done by:
+# Based on pt_PT work done by:
-# Thiago Jung Bauermann <jungmann@cwb.matrix.com.br>, 1999.
+# Thiago Jung Bauermann <jungmann@cwb.matrix.com.br>
-# Rafael Caetano dos Santos <rcaetano@linux.ime.usp.br>.
+# Rafael Caetano dos Santos <rcaetano@linux.ime.usp.br>
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\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-09-09 20:28+0000\n"
+"PO-Revision-Date: 2001-04-08 16:28+00:00\n"
-"Last-Translator: Pedro Morais <morais@poli.org>\n"
+"Last-Translator: Pedro Morais <morais@kde.org>\n"
-"Language-Team: pt\n"
+"Language-Team: pt <morais@kde.org>\n"
-"MIME-Version:\n"
+"MIME-Version: 1.0\n"
-"Content-Type:\n"
+"Content-Type: text/plain; charset=iso-latin-1\n"
-"Content-Transfer-Encoding:\n"
+"Content-Transfer-Encoding: none\n"
 
 #: util/secmem.c:79
 msgid "Warning: using insecure memory!\n"
@@ -43,7 +44,6 @@ msgstr "n
 msgid "nN"
 msgstr "nN"
 
-# INICIO MENU
 #: g10/keyedit.c:581 util/miscutil.c:308
 msgid "quit"
 msgstr "sair"
@@ -250,14 +250,12 @@ msgstr "n
 
 #. 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
 #. { 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
 
 #: 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
 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
 
 #: 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
 
 #: 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
+#: g10/getkey.c:2532
-#, fuzzy
 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
 #: 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
 
 #: 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
 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
 #: 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
 
 #. 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"
+"este algoritmo de criptografia está desctualizado; por favor use um "
-"por favor use um algoritmo mais standard!\n"
+"algoritmo mais standard!x\n"
 
 #: g10/parse-packet.c:119
 #, c-format
@@ -2735,16 +2723,16 @@ msgstr "subpacote do tipo %d tem bit cr
 
 #: 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"
+"\"%.*s\"\n"
-"utilizador: \""
+"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
 #: 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
 #, 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"

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 <steuck@iname.com>\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"

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 <daniel@resare.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -1723,17 +1723,17 @@ msgstr "f
 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"

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 <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -1688,17 +1688,17 @@ msgstr "pk belle
 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ý]"
 

util/ChangeLog

@@ -1,3 +1,13 @@
+2001-04-14  Werner Koch  <wk@gnupg.org>
+
+	* strgutil.c (utf8_to_native): Fixed a segv.  Thanks to Keith Clayton.
+
+2001-04-13  Werner Koch  <wk@gnupg.org>
+
+	* 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  <wk@gnupg.org>
 
 	* iobuf.c (translate_file_handle): New. Use this function

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 )
 {

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;
+			  default:
-				   sprintf( p, "x%02x", *s );
+                            n += 3;
-                                   if ( p )
+                            if ( p ) {
-                                       p += 3;
+                                sprintf( p, "x%02x", *s );
-				   break;
+                                p += 3;
+                            }
+                            break;
 			}
 		    }
 		    else {