just released another snapshot

ChangeLog

@@ -1,3 +1,7 @@
+2001-05-28  Werner Koch  <wk@gnupg.org>
+
+	* configure.in (BUILD_INCLUDED_LIBINTL): Set to no for W32.
+
 2001-04-29  Werner Koch  <wk@gnupg.org>
 
 	Released version 1.0.5.

NEWS

@@ -1,6 +1,15 @@
+Noteworthy changes in version ...
+------------------------------------------------
 
     * Security fix for a format string bug in the tty code.
 
+    * Fixed format string bugs in all po files.  Removed Russian
+      translation due to too many bugs.
+
+    * Fixed expire time calculation and keyserver access.
+
+    * The usual set of minor bug fixes and enhancements.
+
 Noteworthy changes in version 1.0.5 (2001-04-29)
 ------------------------------------------------
 

THANKS

@@ -34,6 +34,7 @@ David Ellement		   ellement@sdd.hp.com
 David Hallinan		   hallinan@rtd.com
 David Hollenberg           dhollen@ISI.EDU
 David Mathog               MATHOG@seqaxp.bio.caltech.edu
+David R. Bergstein         dbergstein@home.com
 Detlef Lannert		   lannert@lannert.rz.uni-duesseldorf.de
 Dimitri 		   dmitri@advantrix.com
 Dirk Lattermann 	   dlatt@t-online.de
@@ -97,6 +98,7 @@ Kazu Yamamoto		   kazu@iijlab.net
 Keith Clayton              keith@claytons.org
 Kevin Ryde                 user42@zip.com.au
 Klaus Singvogel            ks@caldera.de
+Kurt Garloff               garloff@suse.de
 Lars Kellogg-Stedman	   lars@bu.edu
 L. Sassaman		   rabbi@quickie.net
 M Taylor                   mctaylor@privacy.nb.ca                 
@@ -110,6 +112,7 @@ Martin Hamilton
 Martin Schulte		   schulte@thp.uni-koeln.de
 Matt Kraai                 kraai@alumni.carnegiemellon.edu
 Matthew Skala		   mskala@ansuz.sooke.bc.ca
+Matthew Wilcox             matthew@wil.cx
 Matthias Urlichs	   smurf@noris.de
 Max Valianskiy		   maxcom@maxcom.ml.org
 Michael Fischer v. Mollard mfvm@gmx.de

configure.in

@@ -31,7 +31,7 @@ AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE(gnupg,`cat $srcdir/VERSION`)
 
 
-ALL_LINGUAS="da de eo es_ES et 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 sv tr"
 static_modules="sha1 md5 rmd160"
 static_random_module=""
 
@@ -303,8 +303,10 @@ AM_GNU_GETTEXT
 else
 USE_NLS=no
 USE_INCLUDED_LIBINTL=no
+BUILD_INCLUDED_LIBINTL=no
 AC_SUBST(USE_NLS)
 AC_SUBST(USE_INCLUDED_LIBINTL)
+AC_SUBST(BUILD_INCLUDED_LIBINTL)
 fi
 
 dnl

doc/DETAILS

@@ -11,6 +11,7 @@ ssb::1536:20:5CE086B5B5A18FF4:1998-07-07:0:::
 	    sec = secret key
 	    ssb = secret subkey (secondary key)
 	    uid = user id (only field 10 is used).
+            sig = signature
 	    fpr = fingerprint: (fingerprint is in field 10)
 	    pkd = public key data (special field format, see below)
 
@@ -47,7 +48,9 @@ ssb::1536:20:5CE086B5B5A18FF4:1998-07-07:0:::
 	    information may follow in some future versions.
 10. Field:  User-ID.  The value is quoted like a C string to avoid
 	    control characters (the colon is quoted "\x3a").
-11. Field:  Signature class 
+11. Field:  Signature class.  This is a 2 digit hexnumber followed by
+            either the letter 'x' for an exportable signature or the
+            letter 'l' for a local-only signature.
 12. Field:  Key capabilities:
                 e = encrypt
                 s = sign
@@ -56,9 +59,12 @@ ssb::1536:20:5CE086B5B5A18FF4:1998-07-07:0:::
             addition to these letters, uppercase version of the letter to
             denote the _usable_ capabilities of the entire key.  
 
-All dates are displayed in the format yyyy-mm-dd unless you use the option
+All dates are displayed in the format yyyy-mm-dd unless you use the
---fixed-list-mode in which case they are dispplay as seconds since epoch.
+option --fixed-list-mode in which case they are displayed as seconds
-More fields may be added later.
+since Epoch.  More fields may be added later, so parsers should be
+prepared for this. When parsing a number the parser should stop at the
+first non-number character so that additional information can later be
+added.
 
 If field 1 has the tag "pkd", a listing looks like this:
 pkd:0:1024:B665B1435F4C2 .... FF26ABB:

doc/README.W32

@@ -1,18 +1,10 @@
 This is a binary version of GnuPG for MS-Windows 95, 98, WNT and W2000.
 
-
+A FAQ comes with this package and a probably more recent one can be
-PLEASE READ THE FOLLOWING PARAGRAPH CAREFULLY:
+found online at http://www.gnupg.org/faq.html.  See
-
+http://www.gnupg.org/docs-mls.html for a list of mailing lists. In
-If you have a bug report, please post it to the mailing list
+particular the list gnupg-users@gnupg.org might be useful to answer
-<gnupg-devel@gnupg.org>.  Please don't send me private mail
+questions - but please read the FAQ first.
-regarding this version of GnuPG; I am already spending too much
-time on answering the same and same questions over and over.
-I can improve GnuPG much faster if I don't have to answer
-questions in private mail.  You can post to the mailing list
-without prior subscribing (but please request to CC you if you want
-to get an answer).
-
-
 
 Installation instructions:
 --------------------------
@@ -34,7 +26,7 @@ Internationalization support:
 -----------------------------
   1. Decide where to store the translation files for your language.
      Here we assume the directory "c:/gnu/locale/fr"
-  2. Set the directory with the translations into the Registry under the key:
+  2. Set the directory with the translations into the Registry under the key: 
 	\\HKEY_CURRENT_USER\Control Panel\Mingw32\NLS\MODir
      (Example entry: "c:/gnu/locale/fr")
   3. Select which language to use and copy the currect translation file
@@ -53,7 +45,13 @@ How to build it from the source:
 This version has been build with the Mingw32/CPD kit using the latest
 stable version of GnuPG.
 
-First get the source:  It is available at
+First get the source: It has to be available at the same location you
+found this binary package - if not you should have received a written
+offer to get the source delivered to you See the file COPYING (section
+3) for details.
+
+If you got this package from its canonical place (ftp.gnupg.org), the
+source is available at:
 
   ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.0.n.tar.gz
 
@@ -64,7 +62,7 @@ or for snapshots (with a letter appended to the version number)
 this is the same source as for the Unix version.  If your binary
 version of GnuPG is called something like gnupg-w32-1.0.4-1.zip, you
 should find a patch file named gnupg-w32-1.0.4-1.0.4-1.diff.gz at the
-same location, which has to ne applied to the stock gpg source file.
+same location, which has to be applied to the stock gpg source file.
 Instructions are at the top of this file.
 
 To build it, you need the MingW32/CPD kit, which is available at

g10/ChangeLog

@@ -1,3 +1,20 @@
+2001-05-27  Werner Koch  <wk@gnupg.org>
+
+	* keyid.c (get_lsign_letter): New.
+	* keylist.c (list_keyblock_colon): Use it here.
+	* mainproc.c (list_node): and here.
+
+	* getkey.c, packet.h, free-packet.c: Removed that useless key
+	created field; I dunno why I introducded this at all - the
+	creation time is always bound to the key packet and subject to
+	fingerprint calculation etc.
+
+	* getkey.c (fixup_uidnode): Add keycreated arg and use this
+	instead of the signature timestamp to calculate the
+	help_key_expire.  Bug reported by David R. Bergstein.
+	(merge_selfsigs_main): Correct key expiration time calculation.
+	(merge_selfsigs_subkey): Ditto.
+
 2001-05-25  Werner Koch  <wk@gnupg.org>
 
 	* revoke.c (gen_revoke): Add a cast to a tty_printf arg.
@@ -341,7 +358,7 @@
 
 2001-02-08  Werner Koch  <wk@gnupg.org>
 
-	* getkey.c (key_byname): I can happe that we have both, sk and pk
+	* getkey.c (key_byname): It can happen that we have both, sk and pk
 	NULL, fix for that.
 
 	* parse-packet.c (parse_one_sig_subpkt): Add support for

g10/free-packet.c

@@ -151,7 +151,6 @@ copy_public_parts_to_secret_key( PKT_public_key *pk, PKT_secret_key *sk )
     sk->expiredate  = pk->expiredate;     
     sk->pubkey_algo = pk->pubkey_algo;    
     sk->pubkey_usage= pk->pubkey_usage;
-    sk->created     = pk->created;        
     sk->req_usage   = pk->req_usage;
     sk->req_algo    = pk->req_algo;
     sk->has_expired = pk->has_expired;    

g10/getkey.c

@@ -1400,7 +1400,7 @@ merge_keys_and_selfsig( KBNODE keyblock )
 
 
 static void
-fixup_uidnode ( KBNODE uidnode, KBNODE signode )
+fixup_uidnode ( KBNODE uidnode, KBNODE signode, u32 keycreated )
 {
     PKT_user_id   *uid = uidnode->pkt->pkt.user_id;
     PKT_signature *sig = signode->pkt->pkt.signature;
@@ -1429,8 +1429,8 @@ fixup_uidnode ( KBNODE uidnode, KBNODE signode )
     /* ditto or the key expiration */
     uid->help_key_expire = 0;
     p = parse_sig_subpkt ( sig->hashed_data, SIGSUBPKT_KEY_EXPIRE, NULL);
-    if ( p ) {
+    if ( p ) { 
-        uid->help_key_expire = sig->timestamp + buffer_to_u32(p);
+        uid->help_key_expire = keycreated + buffer_to_u32(p);
     }
 
     /* Set the primary user ID flag - we will later wipe out some
@@ -1456,6 +1456,7 @@ merge_selfsigs_main( KBNODE keyblock, int *r_revoked )
     KBNODE signode, uidnode, uidnode2;
     u32 curtime = make_timestamp ();
     unsigned int key_usage = 0;
+    u32 keytimestamp = 0;
     u32 key_expire = 0;
     int key_expire_seen = 0;
 
@@ -1463,7 +1464,8 @@ merge_selfsigs_main( KBNODE keyblock, int *r_revoked )
     if ( keyblock->pkt->pkttype != PKT_PUBLIC_KEY )
         BUG ();
     pk = keyblock->pkt->pkt.public_key;
-    pk->created = 0;
+    keytimestamp = pk->timestamp;
+
     keyid_from_pk( pk, kid );
     pk->main_keyid[0] = kid[0];
     pk->main_keyid[1] = kid[1];
@@ -1536,13 +1538,11 @@ merge_selfsigs_main( KBNODE keyblock, int *r_revoked )
             p = parse_sig_subpkt ( sig->hashed_data,
                                    SIGSUBPKT_KEY_EXPIRE, NULL);
             if ( p ) {
-                key_expire = sig->timestamp + buffer_to_u32(p);
+                key_expire = keytimestamp + buffer_to_u32(p);
                 key_expire_seen = 1;
             }
         }
-        /* and set the created field */
+        /* mark that key as valid: one direct key signature should 
-        pk->created = sigdate;
-        /* and mark that key as valid: one direct key signature should 
          * render a key as valid */
         pk->is_valid = 1;
     }
@@ -1556,7 +1556,7 @@ merge_selfsigs_main( KBNODE keyblock, int *r_revoked )
 	if ( k->pkt->pkttype == PKT_USER_ID
              || k->pkt->pkttype == PKT_PHOTO_ID ) {
             if ( uidnode && signode ) 
-                fixup_uidnode ( uidnode, signode );
+                fixup_uidnode ( uidnode, signode, keytimestamp );
             uidnode = k;
             signode = NULL;
             if ( sigdate > uiddate )
@@ -1593,24 +1593,12 @@ merge_selfsigs_main( KBNODE keyblock, int *r_revoked )
         }
     }
     if ( uidnode && signode ) {
-        fixup_uidnode ( uidnode, signode );
+        fixup_uidnode ( uidnode, signode, keytimestamp );
         pk->is_valid = 1;
     }
     if ( sigdate > uiddate )
         uiddate = sigdate;
-    /* if we do not have a direct key signature, take the key creation date
+
-     * from the latest user ID.  Hmmm, another possibilty would be to take 
-     * it from the latest primary user ID - but we don't implement it for
-     * now */
-    if ( !pk->created )
-        pk->created = uiddate;
-    if ( !pk->created ) {
-        /* oops, still no creation date: use the timestamp */
-        if (DBG_CACHE)
-            log_debug( "merge_selfsigs_main: "
-                       "using timestamp as creation date\n");    
-        pk->created = pk->timestamp;
-    }
 
     /* Now that we had a look at all user IDs we can now get some information
      * from those user IDs.
@@ -1712,6 +1700,7 @@ merge_selfsigs_subkey( KBNODE keyblock, KBNODE subnode )
     KBNODE signode;
     u32 curtime = make_timestamp ();
     unsigned int key_usage = 0;
+    u32 keytimestamp = 0;
     u32 key_expire = 0;
     const byte *p;
     size_t n;
@@ -1723,6 +1712,8 @@ merge_selfsigs_subkey( KBNODE keyblock, KBNODE subnode )
         return; /* (actually this should never happen) */
     keyid_from_pk( mainpk, mainkid );
     subpk = subnode->pkt->pkt.public_key;
+    keytimestamp = subpk->timestamp;
+
     subpk->is_valid = 0;
     subpk->main_keyid[0] = mainpk->main_keyid[0];
     subpk->main_keyid[1] = mainpk->main_keyid[1];
@@ -1760,12 +1751,10 @@ merge_selfsigs_subkey( KBNODE keyblock, KBNODE subnode )
     }
 
     if ( !signode ) {
-        subpk->created = subpk->timestamp;
         return;  /* no valid key binding */
     }
 
     subpk->is_valid = 1;
-    subpk->created = sigdate; 
     sig = signode->pkt->pkt.signature;
         
     p = parse_sig_subpkt ( sig->hashed_data, SIGSUBPKT_KEY_FLAGS, &n );
@@ -1789,7 +1778,7 @@ merge_selfsigs_subkey( KBNODE keyblock, KBNODE subnode )
     p = parse_sig_subpkt ( sig->hashed_data, SIGSUBPKT_KEY_EXPIRE, NULL);
 
     if ( p ) 
-        key_expire = sig->timestamp + buffer_to_u32(p);
+        key_expire = keytimestamp + buffer_to_u32(p);
     else
         key_expire = 0;
     subpk->has_expired = key_expire >= curtime? 0 : key_expire;
@@ -2150,8 +2139,8 @@ finish_lookup( GETKEY_CTX ctx,  KBNODE foundk )
 
             if (DBG_CACHE)
                 log_debug( "\tsubkey looks fine\n");
-            if ( pk->created > latest_date ) {
+            if ( pk->timestamp > latest_date ) {
-                latest_date = pk->created;
+                latest_date = pk->timestamp;
                 latest_key  = k;
             }
         }
@@ -2186,7 +2175,7 @@ finish_lookup( GETKEY_CTX ctx,  KBNODE foundk )
             if (DBG_CACHE)
                 log_debug( "\tprimary key may be used\n");
             latest_key = keyblock;
-            latest_date = pk->created;
+            latest_date = pk->timestamp;
         }
     }
     

g10/keydb.h

@@ -174,6 +174,7 @@ char*get_user_id( u32 *keyid, size_t *rn );
 
 /*-- keyid.c --*/
 int pubkey_letter( int algo );
+int get_lsign_letter ( PKT_signature *sig );
 u32 keyid_from_sk( PKT_secret_key *sk, u32 *keyid );
 u32 keyid_from_pk( PKT_public_key *pk, u32 *keyid );
 u32 keyid_from_sig( PKT_signature *sig, u32 *keyid );

g10/keyid.c

@@ -48,6 +48,17 @@ pubkey_letter( int algo )
     }
 }
 
+int
+get_lsign_letter ( PKT_signature *sig )
+{
+    const char *p;
+    
+    if (!sig)
+        return '?';
+    p = parse_sig_subpkt2( sig, SIGSUBPKT_EXPORTABLE, NULL );
+    return (p && !*p)? 'l':'x';
+}
+
 
 static MD_HANDLE
 do_fingerprint_md( PKT_public_key *pk )

g10/keylist.c

@@ -603,7 +603,8 @@ list_keyblock_colon( KBNODE keyblock, int secret )
 	    else if( sig->sig_class == 0x18 )
 	       sigstr = "sig";
 	    else {
-                printf("sig::::::::::%02x:\n",sig->sig_class );
+                printf ("sig::::::::::%02x%c:\n",
+                        sig->sig_class, get_lsign_letter (sig) );
 		continue;
 	    }
 	    if( opt.check_sigs ) {
@@ -638,7 +639,7 @@ list_keyblock_colon( KBNODE keyblock, int secret )
                 print_string( stdout, p, n, ':' );
 		m_free(p);
 	    }
-            printf(":%02x:\n", sig->sig_class );
+            printf(":%02x%c:\n", sig->sig_class, get_lsign_letter (sig) );
 	    /* fixme: check or list other sigs here */
 	}
     }

g10/mainproc.c

@@ -988,7 +988,7 @@ list_node( CTX c, KBNODE node )
 	    m_free(p);
 	}
 	if( opt.with_colons )
-	    printf(":%02x:", sig->sig_class );
+	    printf(":%02x%c:", sig->sig_class, get_lsign_letter (sig) );
 	putchar('\n');
     }
     else

g10/packet.h

@@ -130,7 +130,6 @@ typedef struct {
     byte    version;
     byte    pubkey_algo;    /* algorithm used for public key scheme */
     byte    pubkey_usage;   /* for now only used to pass it to getkey() */
-    u32     created;        /* according to the self-signature */
     byte    req_usage;      /* hack to pass a request to getkey() */
     byte    req_algo;       /* Ditto */
     u32     has_expired;    /* set to the expiration date if expired */ 
@@ -150,7 +149,6 @@ typedef struct {
     byte    version;
     byte    pubkey_algo;    /* algorithm used for public key scheme */
     byte    pubkey_usage;
-    u32     created;        /* according to the self-signature */
     byte    req_usage;
     byte    req_algo;
     u32     has_expired;    /* set to the expiration date if expired */ 

mpi/ChangeLog

@@ -1,3 +1,8 @@
+2001-05-27  Werner Koch  <wk@gnupg.org>
+
+	* hppa/, hppa1.1/, pa7100/ : Use .label command instead of labels
+	because there syntax changed.  By Matthew Wilcox.
+
 2001-05-06  Werner Koch  <wk@gnupg.org>
 
 	* longlong.h: Fixes for ARM by Phil Blundell.

mpi/hppa/mpih-add1.S

@@ -45,7 +45,7 @@
 
 	.code
 	.export 	mpihelp_add_n
-mpihelp_add_n
+	.label		mpihelp_add_n
 	.proc
 	.callinfo	frame=0,no_calls
 	.entry
@@ -56,13 +56,15 @@ mpihelp_add_n
 	addib,= 	-1,%r23,L$end	; check for (SIZE == 1)
 	 add		%r20,%r19,%r28	; add first limbs ignoring cy
 
-L$loop	ldws,ma 	4(0,%r25),%r20
+	.label L$loop
+	ldws,ma 	4(0,%r25),%r20
 	ldws,ma 	4(0,%r24),%r19
 	stws,ma 	%r28,4(0,%r26)
 	addib,<>	-1,%r23,L$loop
 	 addc		%r20,%r19,%r28
 
-L$end	stws		%r28,0(0,%r26)
+	.label L$end
+	stws		%r28,0(0,%r26)
 	bv		0(%r2)
 	 addc		%r0,%r0,%r28
 

mpi/hppa/mpih-lshift.S

@@ -32,7 +32,7 @@
 
 	.code
 	.export 	mpihelp_lshift
-mpihelp_lshift
+	.label		mpihelp_lshift
 	.proc
 	.callinfo	frame=64,no_calls
 	.entry
@@ -48,7 +48,8 @@ mpihelp_lshift
 	addib,= 	-1,%r24,L$0002
 	vshd		%r22,%r29,%r20
 
-L$loop	ldws,mb 	-4(0,%r25),%r22
+	.label	L$loop
+	ldws,mb 	-4(0,%r25),%r22
 	stws,mb 	%r20,-4(0,%r26)
 	addib,= 	-1,%r24,L$0003
 	vshd		%r29,%r22,%r20
@@ -57,12 +58,15 @@ L$loop	ldws,mb 	-4(0,%r25),%r22
 	addib,<>	-1,%r24,L$loop
 	vshd		%r22,%r29,%r20
 
-L$0002	stws,mb 	%r20,-4(0,%r26)
+	.label	L$0002
+	stws,mb 	%r20,-4(0,%r26)
 	vshd		%r29,%r0,%r20
 	bv		0(%r2)
 	stw		%r20,-4(0,%r26)
-L$0003	stws,mb 	%r20,-4(0,%r26)
+	.label	L$0003
-L$0004	vshd		%r22,%r0,%r20
+	stws,mb 	%r20,-4(0,%r26)
+	.label	L$0004
+	vshd		%r22,%r0,%r20
 	bv		0(%r2)
 	stw		%r20,-4(0,%r26)
 

mpi/hppa/mpih-rshift.S

@@ -33,7 +33,7 @@
 
 	.code
 	.export 	mpihelp_rshift
-mpihelp_rshift
+	.label		mpihelp_rshift
 	.proc
 	.callinfo	frame=64,no_calls
 	.entry
@@ -46,7 +46,8 @@ mpihelp_rshift
 	addib,= 	-1,%r24,L$r002
 	vshd		%r29,%r22,%r20
 
-L$roop	ldws,ma 	4(0,%r25),%r22
+	.label	L$roop
+	ldws,ma 	4(0,%r25),%r22
 	stws,ma 	%r20,4(0,%r26)
 	addib,= 	-1,%r24,L$r003
 	vshd		%r22,%r29,%r20
@@ -55,12 +56,15 @@ L$roop	ldws,ma 	4(0,%r25),%r22
 	addib,<>	-1,%r24,L$roop
 	vshd		%r29,%r22,%r20
 
-L$r002	stws,ma 	%r20,4(0,%r26)
+	.label	L$r002
+	stws,ma 	%r20,4(0,%r26)
 	vshd		%r0,%r29,%r20
 	bv		0(%r2)
 	stw		%r20,0(0,%r26)
-L$r003	stws,ma 	%r20,4(0,%r26)
+	.label	L$r003
-L$r004	vshd		%r0,%r22,%r20
+	stws,ma 	%r20,4(0,%r26)
+	.label	L$r004
+	vshd		%r0,%r22,%r20
 	bv		0(%r2)
 	stw		%r20,0(0,%r26)
 

mpi/hppa/mpih-sub1.S

@@ -49,7 +49,7 @@
 
 	.code
 	.export 	mpihelp_sub_n
-mpihelp_sub_n
+	.label		mpihelp_sub_n
 	.proc
 	.callinfo	frame=0,no_calls
 	.entry
@@ -60,13 +60,15 @@ mpihelp_sub_n
 	addib,= 	-1,%r23,L$end	; check for (SIZE == 1)
 	 sub		%r20,%r19,%r28	; subtract first limbs ignoring cy
 
-L$loop	ldws,ma 	4(0,%r25),%r20
+	.label	L$loop
+	ldws,ma 	4(0,%r25),%r20
 	ldws,ma 	4(0,%r24),%r19
 	stws,ma 	%r28,4(0,%r26)
 	addib,<>	-1,%r23,L$loop
 	 subb		%r20,%r19,%r28
 
-L$end	stws		%r28,0(0,%r26)
+	.label	L$end
+	stws		%r28,0(0,%r26)
 	addc		%r0,%r0,%r28
 	bv		0(%r2)
 	 subi		1,%r28,%r28

mpi/hppa/udiv-qrnnd.S

@@ -43,7 +43,7 @@
 
 	.code
 	.export 	__udiv_qrnnd
-__udiv_qrnnd
+	.label		__udiv_qrnnd
 	.proc
 	.callinfo	frame=0,no_calls
 	.entry
@@ -121,7 +121,7 @@ __udiv_qrnnd
 	bv		0(%r2)
 	 addc		%r28,%r28,%r28
 
-L$largedivisor
+	.label	L$largedivisor
 	extru		%r24,31,1,%r19		; r19 = n0 & 1
 	bb,<		%r23,31,L$odd
 	 extru		%r23,30,31,%r22 	; r22 = d >> 1
@@ -200,7 +200,8 @@ L$largedivisor
 	bv		0(%r2)
 	 addc		%r24,%r24,%r28
 
-L$odd	addib,sv,n	1,%r22,L$FF..		; r22 = (d / 2 + 1)
+	.label	L$odd
+	addib,sv,n	1,%r22,L$FF..		; r22 = (d / 2 + 1)
 	shd		%r25,%r24,1,%r24	; r24 = new n0
 	extru		%r25,30,31,%r25 	; r25 = new n1
 	sub		%r0,%r22,%r21
@@ -285,7 +286,8 @@ L$odd	addib,sv,n	1,%r22,L$FF..		; r22 = (d / 2 + 1)
 
 ; This is just a special case of the code above.
 ; We come here when d == 0xFFFFFFFF
-L$FF..	add,uv		%r25,%r24,%r24
+	.label	L$FF..
+	add,uv		%r25,%r24,%r24
 	sub,<<		%r24,%r23,%r0
 	ldo		1(%r24),%r24
 	stws		%r24,0(0,%r26)

mpi/hppa1.1/mpih-mul1.S

@@ -59,7 +59,7 @@
 
 	.code
 	.export 	mpihelp_mul_1
-mpihelp_mul_1
+	.label		mpihelp_mul_1
 	.proc
 	.callinfo	frame=64,no_calls
 	.entry
@@ -82,7 +82,8 @@ mpihelp_mul_1
 	 ldw		-12(%r30),%r1
 
 ; Main loop
-L$loop	fldws,ma	4(%r25),%fr5
+	.label	L$loop
+	fldws,ma	4(%r25),%fr5
 	stws,ma 	%r19,4(%r26)
 	addc		%r28,%r1,%r19
 	xmpyu		%fr4,%fr5,%fr6
@@ -91,7 +92,8 @@ L$loop	fldws,ma	4(%r25),%fr5
 	addib,<>	-1,%r24,L$loop
 	 ldw		-12(%r30),%r1
 
-L$end	stws,ma 	%r19,4(%r26)
+	.label	L$end
+	stws,ma 	%r19,4(%r26)
 	addc		%r28,%r1,%r19
 	ldw		-16(%r30),%r28
 	stws,ma 	%r19,4(%r26)
@@ -99,7 +101,7 @@ L$end	stws,ma 	%r19,4(%r26)
 	bv		0(%r2)
 	 ldo		-64(%r30),%r30
 
-L$just_one_limb
+	.label	L$just_one_limb
 	xmpyu		%fr4,%fr5,%fr6
 	fstds		%fr6,-16(%r30)
 	ldw		-16(%r30),%r28

mpi/hppa1.1/mpih-mul2.S

@@ -49,7 +49,7 @@
 
 	.code
 	.export 	mpihelp_addmul_1
-mpihelp_addmul_1
+	.label		mpihelp_addmul_1
 	.proc
 	.callinfo	frame=64,no_calls
 	.entry
@@ -72,7 +72,8 @@ mpihelp_addmul_1
 	 ldw		-12(%r30),%r1
 
 ; Main loop
-L$loop	ldws		0(%r26),%r29
+	.label	L$loop
+	ldws		0(%r26),%r29
 	fldws,ma	4(%r25),%fr5
 	add		%r29,%r19,%r19
 	stws,ma 	%r19,4(%r26)
@@ -84,7 +85,8 @@ L$loop	ldws		0(%r26),%r29
 	addib,<>	-1,%r24,L$loop
 	 ldw		-12(%r30),%r1
 
-L$end	ldw		0(%r26),%r29
+	.label	L$end
+	ldw		0(%r26),%r29
 	add		%r29,%r19,%r19
 	stws,ma 	%r19,4(%r26)
 	addc		%r28,%r1,%r19
@@ -97,7 +99,7 @@ L$end	ldw		0(%r26),%r29
 	bv		0(%r2)
 	 ldo		-64(%r30),%r30
 
-L$just_one_limb
+	.label L$just_one_limb
 	xmpyu		%fr4,%fr5,%fr6
 	ldw		0(%r26),%r29
 	fstds		%fr6,-16(%r30)

mpi/hppa1.1/mpih-mul3.S

@@ -56,7 +56,7 @@
 
 	.code
 	.export 	mpihelp_submul_1
-mpihelp_submul_1
+	.label		mpihelp_submul_1
 	.proc
 	.callinfo	frame=64,no_calls
 	.entry
@@ -79,7 +79,8 @@ mpihelp_submul_1
 	 ldw		-12(%r30),%r1
 
 ; Main loop
-L$loop	ldws		0(%r26),%r29
+	.label	L$loop
+	ldws		0(%r26),%r29
 	fldws,ma	4(%r25),%fr5
 	sub		%r29,%r19,%r22
 	add		%r22,%r19,%r0
@@ -92,7 +93,8 @@ L$loop	ldws		0(%r26),%r29
 	addib,<>	-1,%r24,L$loop
 	 ldw		-12(%r30),%r1
 
-L$end	ldw		0(%r26),%r29
+	.label	L$end
+	ldw		0(%r26),%r29
 	sub		%r29,%r19,%r22
 	add		%r22,%r19,%r0
 	stws,ma 	%r22,4(%r26)
@@ -107,7 +109,7 @@ L$end	ldw		0(%r26),%r29
 	bv		0(%r2)
 	 ldo		-64(%r30),%r30
 
-L$just_one_limb
+	.label	L$just_one_limb
 	xmpyu		%fr4,%fr5,%fr6
 	ldw		0(%r26),%r29
 	fstds		%fr6,-16(%r30)

mpi/hppa1.1/udiv-qrnnd.S

@@ -39,10 +39,11 @@
  */
 
 	.code
-L$0000	.word		0x43f00000
+	.label L$0000
+	.word		0x43f00000
 	.word		0x0
 	.export 	__udiv_qrnnd
-__udiv_qrnnd
+	.label		__udiv_qrnnd
 	.proc
 	.callinfo	frame=64,no_calls
 	.entry
@@ -58,7 +59,7 @@ __udiv_qrnnd
 	fcnvxf,dbl,dbl	%fr5,%fr5
 	fldds		0(0,%r19),%fr4
 	fadd,dbl	%fr4,%fr5,%fr5
-L$1
+	.label	L$1
 	fcpy,sgl	%fr0,%fr6L
 	fldws		-12(0,%r30),%fr6R
 	fcnvxf,dbl,dbl	%fr6,%fr4
@@ -79,7 +80,8 @@ L$1
 
 	add		%r22,%r23,%r22
 	ldo		-1(%r28),%r28
-L$2	bv		0(%r2)
+	.label	L$2
+	bv		0(%r2)
 	stws		%r22,0(0,%r26)
 
 	.exit

mpi/longlong.h

@@ -2,7 +2,7 @@
    Note: I added some stuff for use with gnupg
 
 Copyright (C) 1991, 1992, 1993, 1994, 1996, 1998,
-              2000 Free Software Foundation, Inc.
+              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/pa7100/mpih-lshift.S

@@ -1,5 +1,5 @@
 /* hppa   lshift
- *	  optimized for the PA7100, where is runs at 3.25 cycles/limb
+ *	  optimized for the PA7100, where it runs at 3.25 cycles/limb
  * 
  *      Copyright (C) 1992, 1994, 1998, 
  *                    2001 Free Software Foundation, Inc.
@@ -33,7 +33,7 @@
 
 	.code
 	.export 	mpihelp_lshift
-mpihelp_lshift
+	.label		mpihelp_lshift
 	.proc
 	.callinfo	frame=64,no_calls
 	.entry
@@ -49,7 +49,8 @@ mpihelp_lshift
 	addib,<=	-5,%r24,L$rest
 	vshd		%r22,%r29,%r20
 
-L$loop	ldws,mb 	-4(0,%r25),%r22
+	.label	L$loop
+	ldws,mb 	-4(0,%r25),%r22
 	stws,mb 	%r20,-4(0,%r26)
 	vshd		%r29,%r22,%r20
 	ldws,mb 	-4(0,%r25),%r29
@@ -63,9 +64,11 @@ L$loop	ldws,mb 	-4(0,%r25),%r22
 	addib,> 	-4,%r24,L$loop
 	vshd		%r22,%r29,%r20
 
-L$rest	addib,= 	4,%r24,L$end1
+	.label	L$rest
+	addib,= 	4,%r24,L$end1
 	nop
-L$eloop ldws,mb 	-4(0,%r25),%r22
+	.label	L$eloop
+	ldws,mb 	-4(0,%r25),%r22
 	stws,mb 	%r20,-4(0,%r26)
 	addib,<=	-1,%r24,L$end2
 	vshd		%r29,%r22,%r20
@@ -74,12 +77,15 @@ L$eloop ldws,mb 	-4(0,%r25),%r22
 	addib,> 	-1,%r24,L$eloop
 	vshd		%r22,%r29,%r20
 
-L$end1	stws,mb 	%r20,-4(0,%r26)
+	.label	L$end1
+	stws,mb 	%r20,-4(0,%r26)
 	vshd		%r29,%r0,%r20
 	bv		0(%r2)
 	stw		%r20,-4(0,%r26)
-L$end2	stws,mb 	%r20,-4(0,%r26)
+	.label	L$end2
-L$0004	vshd		%r22,%r0,%r20
+	stws,mb 	%r20,-4(0,%r26)
+	.label	L$0004
+	vshd		%r22,%r0,%r20
 	bv		0(%r2)
 	stw		%r20,-4(0,%r26)
 

mpi/pa7100/mpih-rshift.S

@@ -1,5 +1,5 @@
 /* hppa   rshift
- *	  optimized for the PA7100, where is runs at 3.25 cycles/limb
+ *	  optimized for the PA7100, where it runs at 3.25 cycles/limb
  *
  *      Copyright (C) 1992, 1994, 1998,
  *                    2001 Free Software Foundation, Inc.
@@ -33,7 +33,7 @@
 
 	.code
 	.export 	mpihelp_rshift
-mpihelp_rshift
+	.label		mpihelp_rshift
 	.proc
 	.callinfo	frame=64,no_calls
 	.entry
@@ -46,7 +46,8 @@ mpihelp_rshift
 	addib,<=	-5,%r24,L$rrest
 	vshd		%r29,%r22,%r20
 
-L$roop	ldws,ma 	4(0,%r25),%r22
+	.label	L$roop
+	ldws,ma 	4(0,%r25),%r22
 	stws,ma 	%r20,4(0,%r26)
 	vshd		%r22,%r29,%r20
 	ldws,ma 	4(0,%r25),%r29
@@ -60,9 +61,11 @@ L$roop	ldws,ma 	4(0,%r25),%r22
 	addib,> 	-4,%r24,L$roop
 	vshd		%r29,%r22,%r20
 
-L$rrest addib,= 	4,%r24,L$rend1
+	.label	L$rrest
+	addib,= 	4,%r24,L$rend1
 	nop
-L$eroop ldws,ma 	4(0,%r25),%r22
+	.label	L$eroop
+	ldws,ma 	4(0,%r25),%r22
 	stws,ma 	%r20,4(0,%r26)
 	addib,<=	-1,%r24,L$rend2
 	vshd		%r22,%r29,%r20
@@ -71,12 +74,15 @@ L$eroop ldws,ma 	4(0,%r25),%r22
 	addib,> 	-1,%r24,L$eroop
 	vshd		%r29,%r22,%r20
 
-L$rend1  stws,ma	 %r20,4(0,%r26)
+	.label	L$rend1
+	stws,ma		%r20,4(0,%r26)
 	vshd		%r0,%r29,%r20
 	bv		0(%r2)
 	stw		%r20,0(0,%r26)
-L$rend2  stws,ma	 %r20,4(0,%r26)
+	.label	L$rend2
-L$r004	vshd		%r0,%r22,%r20
+	stws,ma		%r20,4(0,%r26)
+	.label	L$r004
+	vshd		%r0,%r22,%r20
 	bv		0(%r2)
 	stw		%r20,0(0,%r26)
 

po/ChangeLog

@@ -1,3 +1,24 @@
+2001-05-28  Werner Koch  <wk@gnupg.org>
+
+	* ru.po: Removed - too many format string bugs. 
+
+2001-05-27  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.38.
+	* cat-id-tbl.c: Remove file.
+	* stamp-cat-id: Remove file.
+
+2001-05-27  Werner Koch  <wk@gnupg.org>
+
+	* tr.po: New copy from the TP Robot. 
+	* da.po, de.po, eo.po, es_ES.po, et.po, id.po, ja.po, nl.po,
+        pt_BR.po, sv.po: Fixes to format string errors by Kurt Garloff.
+	It is not cleare whether they are all correct but at least they
+	won't give segv and minimize the risk of format string exploits.
+	* ru.po: Fixed the header entry.
+
+	Fixed some fuzzy entries in all files.
+	
 2001-05-06  Werner Koch  <wk@gnupg.org>
 
 	* id.po: Updated

po/Makefile.in.in

@@ -1,5 +1,5 @@
 # Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
 # This file file be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU Public License
@@ -9,6 +9,10 @@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
 SHELL = /bin/sh
 @SET_MAKE@
 
@@ -18,22 +22,20 @@ VPATH = @srcdir@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
+datadir = @datadir@
 localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
+gettextsrcdir = $(datadir)/gettext/po
-gettextsrcdir = $(prefix)/share/gettext/po
-subdir = po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
 
 CC = @CC@
-GENCAT = @GENCAT@
+GMSGFMT = @GMSGFMT@
-GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
 MSGFMT = @MSGFMT@
-XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
+XGETTEXT = @XGETTEXT@
-MSGMERGE = PATH=../src:$$PATH msgmerge
+MSGMERGE = msgmerge
 
 DEFS = @DEFS@
 CFLAGS = @CFLAGS@
@@ -43,20 +45,17 @@ INCLUDES = -I.. -I$(top_srcdir)/intl
 
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
 
-SOURCES = cat-id-tbl.c
 POFILES = @POFILES@
 GMOFILES = @GMOFILES@
 DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
-stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
+$(POFILES) $(GMOFILES)
 
 POTFILES = \
 
 CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-INSTOBJEXT = @INSTOBJEXT@
 
 .SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
+.SUFFIXES: .c .o .po .pox .gmo .mo
 
 .c.o:
 	$(COMPILE) $<
@@ -70,19 +69,19 @@ INSTOBJEXT = @INSTOBJEXT@
 
 .po.gmo:
 	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
-	  && rm -f $$file && $(GMSGFMT) -o $$file $<
+	  && rm -f $$file && $(GMSGFMT) --statistics -o $$file $<
-
-.po.cat:
-	sed -f ../intl/po2msg.sed < $< > $*.msg \
-	  && rm -f $@ && $(GENCAT) $@ $*.msg
 
 
 all: all-@USE_NLS@
 
-all-yes: cat-id-tbl.c $(CATALOGS)
+all-yes: $(CATALOGS)
 all-no:
 
-$(srcdir)/$(PACKAGE).pot: $(POTFILES)
+# Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot',
+# otherwise packages like GCC can not be built if only parts of the source
+# have been downloaded.
+
+$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in
 	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
 	  --add-comments --keyword=_ --keyword=N_ \
 	  --files-from=$(srcdir)/POTFILES.in \
@@ -90,78 +89,35 @@ $(srcdir)/$(PACKAGE).pot: $(POTFILES)
 	   || ( rm -f $(srcdir)/$(PACKAGE).pot \
 		&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
 
-$(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
-$(srcdir)/stamp-cat-id: $(PACKAGE).pot
-	rm -f cat-id-tbl.tmp
-	sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \
-		| sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp
-	if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
-	  rm cat-id-tbl.tmp; \
-	else \
-	  echo cat-id-tbl.c changed; \
-	  rm -f $(srcdir)/cat-id-tbl.c; \
-	  mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \
-	fi
-	cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
-
 
 install: install-exec install-data
 install-exec:
 install-data: install-data-@USE_NLS@
-install-data-no: all
-install-data-yes: all
-	if test -r "$(MKINSTALLDIRS)"; then \
-	  $(MKINSTALLDIRS) $(datadir); \
-	else \
-	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
-	fi
-	@catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  case "$$cat" in \
-	    *.gmo) destdir=$(gnulocaledir);; \
-	    *)     destdir=$(localedir);; \
-	  esac; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  dir=$$destdir/$$lang/LC_MESSAGES; \
-	  if test -r "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $$dir; \
-	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
-	  fi; \
-	  if test -r $$cat; then \
-	    $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
-	    echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
-	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
-	    echo "installing $(srcdir)/$$cat as" \
-		 "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
-	  fi; \
-	  if test -r $$cat.m; then \
-	    $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
-	    echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
-	  else \
-	    if test -r $(srcdir)/$$cat.m ; then \
-	      $(INSTALL_DATA) $(srcdir)/$$cat.m \
-		$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
-	      echo "installing $(srcdir)/$$cat as" \
-		   "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
-	    else \
-	      true; \
-	    fi; \
-	  fi; \
-	done
 	if test "$(PACKAGE)" = "gettext"; then \
-	  if test -r "$(MKINSTALLDIRS)"; then \
+	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
-	    $(MKINSTALLDIRS) $(gettextsrcdir); \
-	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
-	  fi; \
 	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-			  $(gettextsrcdir)/Makefile.in.in; \
+			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
 	else \
 	  : ; \
 	fi
+install-data-no: all
+install-data-yes: all
+	$(mkinstalldirs) $(DESTDIR)$(datadir)
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+	  if test -r $$cat; then \
+	    $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
+	    echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \
+	  else \
+	    $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
+	    echo "installing $(srcdir)/$$cat as" \
+		 "$(DESTDIR)$$dir/$(PACKAGE).mo"; \
+	  fi; \
+	done
 
 # Define this as empty until I found a useful application.
 installcheck:
@@ -170,76 +126,68 @@ uninstall:
 	catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
-	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
 	done
-	rm -f $(gettextsrcdir)/po-Makefile.in.in
+	if test "$(PACKAGE)" = "gettext"; then \
+	  rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
+	else \
+	  : ; \
+	fi
 
 check: all
 
-cat-id-tbl.o: ../intl/libgettext.h
-
 dvi info tags TAGS ID:
 
 mostlyclean:
-	rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
+	rm -f core core.* *.pox $(PACKAGE).po *.new.po
 	rm -fr *.o
 
 clean: mostlyclean
 
 distclean: clean
-	rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
+	rm -f Makefile Makefile.in POTFILES *.mo
 
 maintainer-clean: distclean
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 	rm -f $(GMOFILES)
 
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: update-po $(DISTFILES)
+dist distdir:
+	$(MAKE) update-po
+	@$(MAKE) dist2
+# This is a separate target because 'update-po' must be executed before.
+dist2: $(DISTFILES)
 	dists="$(DISTFILES)"; \
 	for file in $$dists; do \
-	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
+	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
-	    || cp -p $(srcdir)/$$file $(distdir); \
+	  cp -p $$dir/$$file $(distdir); \
 	done
 
 update-po: Makefile
 	$(MAKE) $(PACKAGE).pot
-	PATH=`pwd`/../src:$$PATH; \
+	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \
 	cd $(srcdir); \
-	catalogs='$(CATALOGS)'; \
+	catalogs='$(GMOFILES)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-	  mv $$lang.po $$lang.old.po; \
 	  echo "$$lang:"; \
-	  if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \
+	  if $(MSGMERGE) $$lang.po $(PACKAGE).pot -o $$lang.new.po; then \
-	    rm -f $$lang.old.po; \
+	    mv -f $$lang.new.po $$lang.po; \
 	  else \
 	    echo "msgmerge for $$cat failed!"; \
-	    rm -f $$lang.po; \
+	    rm -f $$lang.new.po; \
-	    mv $$lang.old.po $$lang.po; \
 	  fi; \
 	done
+	$(MAKE) update-gmo
 
-POTFILES: POTFILES.in
+update-gmo: Makefile $(GMOFILES)
-	( if test 'x$(srcdir)' != 'x.'; then \
+	@:
-	    posrcprefix='$(top_srcdir)/'; \
-	  else \
-	    posrcprefix="../"; \
-	  fi; \
-	  rm -f $@-t $@ \
-	    && (sed -e '/^#/d' -e '/^[ 	]*$$/d' \
-		    -e "s@.*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in \
-		| sed -e '$$s/\\$$//') > $@-t \
-	    && chmod a-w $@-t \
-	    && mv $@-t $@ )
 
-Makefile: Makefile.in.in ../config.status POTFILES
+Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in
-	cd .. \
+	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
 	       $(SHELL) ./config.status
 

po/da.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2001-04-29 16:39+0200\n"
+"POT-Creation-Date: 2001-05-28 09:05+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"
@@ -15,15 +15,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:79
+#: util/secmem.c:84
 msgid "Warning: using insecure memory!\n"
 msgstr "Advarsel: benytter ubeskyttet hukommelse!\n"
 
-#: util/secmem.c:299
+#: util/secmem.c:304
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operation er ikke mulig uden beskyttet hukommelse indlæst\n"
 
-#: util/secmem.c:300
+#: util/secmem.c:305
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan have brugt et forkert program til denne opgave)\n"
 
@@ -601,7 +601,7 @@ msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinfo til denne FD"
 
 #: g10/g10.c:310
-msgid "|KEYID|ulimately trust this key"
+msgid "|KEYID|ultimately trust this key"
 msgstr ""
 
 #: g10/g10.c:311
@@ -842,7 +842,7 @@ msgstr "--delete-key bruger-id"
 #: g10/g10.c:1305
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
-msgstr "--delete-secret-key bruger-id"
+msgstr "--delete-secret-and-public-key bruger-id"
 
 #: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
 #, c-format
@@ -1623,21 +1623,21 @@ msgstr ""
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2536
+#: g10/getkey.c:249 g10/getkey.c:2525
 #, fuzzy
 msgid "[User id not found]"
-msgstr "%s: bruger ikke fundet\n"
+msgstr "[bruger ikke fundet]"
 
 #: g10/getkey.c:453
 msgid "too many entries in unk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:2207
+#: g10/getkey.c:2196
 #, 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:2249 g10/trustdb.c:577
+#: g10/getkey.c:2238 g10/trustdb.c:577
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
@@ -2212,7 +2212,7 @@ msgstr "vis pr
 #: g10/keyedit.c:607
 #, fuzzy
 msgid "showpref"
-msgstr "præf"
+msgstr "vispræf"
 
 #: g10/keyedit.c:608
 msgid "passwd"
@@ -2376,12 +2376,12 @@ msgstr ""
 #: g10/keyedit.c:1173
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
-msgstr "nøgle %08lX: undernøgle er blevet annulleret!\n"
+msgstr "rev! undernøgle er blevet annulleret! %s\n"
 
 #: g10/keyedit.c:1176
 #, fuzzy
 msgid "rev- faked revocation found\n"
-msgstr "  nye nøgletilbagekald: %lu\n"
+msgstr "rev- forkert nøgletilbagekald\n"
 
 #: g10/keyedit.c:1178
 #, c-format
@@ -2649,7 +2649,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "kan ikke åbne '%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:576
+#: g10/passphrase.c:313 g10/passphrase.c:580
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (hovednøgle-ID %08lX)"
@@ -2684,32 +2684,32 @@ msgstr ""
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:408 g10/passphrase.c:477
+#: g10/passphrase.c:408 g10/passphrase.c:481
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:562
+#: g10/passphrase.c:566
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
 "user: \""
 msgstr ""
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:575
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr ""
 
-#: g10/passphrase.c:609
+#: g10/passphrase.c:613
 msgid "can't query password in batchmode\n"
 msgstr ""
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:617
 msgid "Enter passphrase: "
 msgstr "Indtast kodesætning: "
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:621
 msgid "Repeat passphrase: "
 msgstr "Gentag kodesætning: "
 
@@ -2754,7 +2754,7 @@ msgstr ""
 #: g10/pubkey-enc.c:153
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
-msgstr "valgte cifferalgoritme er ugyldig\n"
+msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
 #: g10/pubkey-enc.c:192
 #, c-format
@@ -2774,7 +2774,7 @@ msgstr ""
 #: g10/hkp.c:83
 #, fuzzy, c-format
 msgid "can't get key from keyserver: %s\n"
-msgstr "importér nøgler fra en nøgleserver"
+msgstr "importér nøgler fra en nøgleserver: %s\n"
 
 #: g10/hkp.c:102 g10/hkp.c:136
 msgid "no keyserver known (use option --keyserver)\n"
@@ -3348,7 +3348,7 @@ msgstr ""
 #: g10/skclist.c:149
 #, fuzzy
 msgid "skipped: secret key already present\n"
-msgstr "%s: udelod: offentlig nøgle er allerede tilstede\n"
+msgstr "udelod: hemmelig nøgle er allerede tilstede\n"
 
 #: g10/skclist.c:160
 #, c-format

po/de.po

@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.4\n"
-"POT-Creation-Date: 2001-04-29 16:39+0200\n"
+"POT-Creation-Date: 2001-05-28 09:05+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"
@@ -12,17 +12,17 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:79
+#: util/secmem.c:84
 msgid "Warning: using insecure memory!\n"
 msgstr "Warnung: Sensible Daten könnten auf Platte ausgelagert werden.\n"
 
 # "  Um dies zu vermeiden, kann das Programm suid(root) installiert werden.\n"
 # "  Bitte wenden Sie sich hierzu an den Systemadministrator.\n"
-#: util/secmem.c:299
+#: util/secmem.c:304
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "Vorgang ist ohne sicheren Hauptspeicher nicht möglich\n"
 
-#: util/secmem.c:300
+#: util/secmem.c:305
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 "(möglicherweise haben Sie das falsche Programm für diese Aufgabe benutzt)\n"
@@ -603,7 +603,8 @@ msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
 #: g10/g10.c:310
-msgid "|KEYID|ulimately trust this key"
+#, fuzzy
+msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|diesem Schlüssel uneingeschränkt vertrauen"
 
 #: g10/g10.c:311
@@ -1710,7 +1711,7 @@ msgstr "zu viele Eintr
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2536
+#: g10/getkey.c:249 g10/getkey.c:2525
 msgid "[User id not found]"
 msgstr "[User-ID nicht gefunden]"
 
@@ -1718,13 +1719,13 @@ msgstr "[User-ID nicht gefunden]"
 msgid "too many entries in unk cache - disabled\n"
 msgstr "zu viele Einträge im unk-Lager - abgeschaltet\n"
 
-#: g10/getkey.c:2207
+#: g10/getkey.c:2196
 #, 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:2249 g10/trustdb.c:577
+#: g10/getkey.c:2238 g10/trustdb.c:577
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
@@ -1863,8 +1864,8 @@ msgstr "Schl
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr ""
-"Schlüssel %08lX: der lokale originale Schlüsselblocks wurde nicht gefunden: "
+"Schlüssel %08lX: der lokale originale Schlüsselblocks wurde nicht gefunden: %"
-"%s\n"
+"s\n"
 
 #: g10/import.c:495 g10/import.c:698
 #, c-format
@@ -2316,7 +2317,7 @@ msgstr "Liste der Voreinstellungen"
 #: g10/keyedit.c:607
 #, fuzzy
 msgid "showpref"
-msgstr "pref"
+msgstr "showpref"
 
 #: g10/keyedit.c:608
 msgid "passwd"
@@ -2633,7 +2634,7 @@ msgstr "Entschl
 
 #: g10/mainproc.c:430
 msgid "decryption okay\n"
-msgstr "Enschlüsselung fehlgeschlagen: %s\n"
+msgstr "Enschlüsselung erfolgreich\n"
 
 #: g10/mainproc.c:435
 msgid "WARNING: encrypted message has been manipulated!\n"
@@ -2757,7 +2758,7 @@ msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
 msgid "can't connect to `%s': %s\n"
 msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:576
+#: g10/passphrase.c:313 g10/passphrase.c:580
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (Hauptschlüssel-ID %08lX)"
@@ -2793,12 +2794,12 @@ msgstr "Falsche Antwort des Agenten\n"
 msgid "cancelled by user\n"
 msgstr "Abbruch durch Benutzer\n"
 
-#: g10/passphrase.c:408 g10/passphrase.c:477
+#: g10/passphrase.c:408 g10/passphrase.c:481
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "Schwierigkeiten mit dem Agenten: Agent antwortet 0x%lx\n"
 
-#: g10/passphrase.c:562
+#: g10/passphrase.c:566
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2808,20 +2809,20 @@ msgstr ""
 "Sie benötigen ein Mantra, um den geheimen Schlüssel zu entsperren.\n"
 "Benutzer: \""
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:575
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-Bit %s Schlüssel, ID %08lX, erzeugt %s"
 
-#: g10/passphrase.c:609
+#: g10/passphrase.c:613
 msgid "can't query password in batchmode\n"
 msgstr "Mantra kann im Batchmodus nicht abgefragt werden\n"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:617
 msgid "Enter passphrase: "
 msgstr "Geben Sie das Mantra ein: "
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:621
 msgid "Repeat passphrase: "
 msgstr "Geben Sie das Mantra nochmal ein: "
 
@@ -2935,8 +2936,8 @@ msgstr ""
 #: g10/sig-check.c:199
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr ""
-"Vermutlich ist das Siegel (MDC) BESCHÄDIGT (wegen unbekanntem \"critical "
+"Vermutlich ist das Siegel (MDC) BESCHÄDIGT (wegen unbekanntem \"critical bit"
-"bit\")\n"
+"\")\n"
 
 #: g10/sig-check.c:297
 msgid ""
@@ -3124,8 +3125,8 @@ msgstr "%s: konnte Satz nicht anh
 #: g10/tdbio.c:1748
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
-"Die \"Trust\"-Datenbank ist beschädigt; verwenden Sie \"gpg "
+"Die \"Trust\"-Datenbank ist beschädigt; verwenden Sie \"gpg --fix-trustdb"
-"--fix-trustdb\".\n"
+"\".\n"
 
 #: g10/trustdb.c:169
 #, c-format

po/eo.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.4\n"
-"POT-Creation-Date: 2001-04-29 16:39+0200\n"
+"POT-Creation-Date: 2001-05-28 09:05+0200\n"
 "PO-Revision-Date: 2001-04-23 20:55+01:00\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -13,15 +13,15 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-3\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:79
+#: util/secmem.c:84
 msgid "Warning: using insecure memory!\n"
 msgstr "Averto: uzas malsekuran memoron!\n"
 
-#: util/secmem.c:299
+#: util/secmem.c:304
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operacio ne eblas sen sekura memoro kun komenca valoro\n"
 
-#: util/secmem.c:300
+#: util/secmem.c:305
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(eble vi uzis la maløustan programon por æi tiu tasko)\n"
 
@@ -599,7 +599,8 @@ msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
 #: g10/g10.c:310
-msgid "|KEYID|ulimately trust this key"
+#, fuzzy
+msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|fidi æi tiun þlosilon absolute"
 
 #: g10/g10.c:311
@@ -840,7 +841,7 @@ msgstr "--delete-key uzantidentigilo"
 #: g10/g10.c:1305
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
-msgstr "--delete-secret-key uzantidentigilo"
+msgstr "--delete-secret-and-public-key uzantidentigilo"
 
 #: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
 #, c-format
@@ -1681,7 +1682,7 @@ msgstr "tro da registroj en pk-staplo - mal
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2536
+#: g10/getkey.c:249 g10/getkey.c:2525
 msgid "[User id not found]"
 msgstr "[Uzantidentigilo ne trovita]"
 
@@ -1689,12 +1690,12 @@ msgstr "[Uzantidentigilo ne trovita]"
 msgid "too many entries in unk cache - disabled\n"
 msgstr "tro da registroj en unk-staplo - malþaltas\n"
 
-#: g10/getkey.c:2207
+#: g10/getkey.c:2196
 #, 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:2249 g10/trustdb.c:577
+#: g10/getkey.c:2238 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"
@@ -2277,7 +2278,7 @@ msgstr "listigi preferojn"
 #: g10/keyedit.c:607
 #, fuzzy
 msgid "showpref"
-msgstr "pref"
+msgstr "showpref"
 
 #: g10/keyedit.c:608
 msgid "passwd"
@@ -2716,7 +2717,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "ne povas konektiøi al '%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:576
+#: g10/passphrase.c:313 g10/passphrase.c:580
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (æefþlosilo %08lX)"
@@ -2728,9 +2729,9 @@ msgid ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, created %s%s\n"
 msgstr ""
-"\n"
 "Vi bezonas pasfrazon por malþlosi la sekretan þlosilon\n"
-"por la uzanto: \""
+"por la uzanto: \"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
 
 #: g10/passphrase.c:344
 #, fuzzy
@@ -2754,12 +2755,12 @@ msgstr ""
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:408 g10/passphrase.c:477
+#: g10/passphrase.c:408 g10/passphrase.c:481
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:562
+#: g10/passphrase.c:566
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2769,20 +2770,20 @@ msgstr ""
 "Vi bezonas pasfrazon por malþlosi la sekretan þlosilon\n"
 "por la uzanto: \""
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:575
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bita %s-þlosilo, %08lX, kreita je %s"
 
-#: g10/passphrase.c:609
+#: g10/passphrase.c:613
 msgid "can't query password in batchmode\n"
 msgstr "ne povas kontroli pasvorton en neinteraga reøimo\n"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:617
 msgid "Enter passphrase: "
 msgstr "Donu pasfrazon: "
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:621
 msgid "Repeat passphrase: "
 msgstr "Ripetu pasfrazon: "
 
@@ -2805,7 +2806,7 @@ msgstr "legas la normalan enigon ...\n"
 #: g10/plaintext.c:391
 #, fuzzy
 msgid "no signed data\n"
-msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
+msgstr "ne subskribitan dosieron\n"
 
 #: g10/plaintext.c:399
 #, c-format
@@ -2916,7 +2917,7 @@ msgstr "la publika
 #: g10/sig-check.c:328
 #, fuzzy, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
-msgstr "NOTO: subskribo-þlosilo eksvalidiøis je %s\n"
+msgstr "NOTO: subskribo-þlosilo %08lX eksvalidiøis je %s\n"
 
 #: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
@@ -3420,7 +3421,7 @@ msgstr ""
 #: g10/skclist.c:138
 #, fuzzy, c-format
 msgid "skipped `%s': duplicated\n"
-msgstr "ignoris '%s': %s\n"
+msgstr "ignoris '%s': ripetita\n"
 
 #: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
@@ -3430,7 +3431,7 @@ msgstr "ignoris '%s': %s\n"
 #: g10/skclist.c:149
 #, fuzzy
 msgid "skipped: secret key already present\n"
-msgstr "%s: ignorita: publika þlosilo jam æeestas\n"
+msgstr "ignorita: sekreta þlosilo jam æeestas\n"
 
 #: g10/skclist.c:160
 #, c-format

po/es_ES.po

@@ -7,30 +7,30 @@
 # GPG version: 1.0.0
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2001-04-29 16:39+0200\n"
+"POT-Creation-Date: 2001-05-28 09:05+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"
 "From: Urko Lusa <ulusa@euskalnet.net>\n"
 "Updated: 1998-01-12\n"
 "By: Luca Olivetti <luca@luca.ddns.org>\n"
-"Xgettext-Options: --default-domain=gnupg --directory=.. --add-comments "
+"Xgettext-Options: --default-domain=gnupg --directory=.. --add-comments --"
-"--keyword=_ --keyword=N_ --files-from=./POTFILES.in\n"
+"keyword=_ --keyword=N_ --files-from=./POTFILES.in\n"
 "Files: util/secmem.c util/argparse.c cipher/random.c cipher/rand-dummy.c "
 "cipher/rand-unix.c cipher/rand-w32.c g10/g10.c g10/pkclist.c g10/keygen.c "
-"g10/decrypt.c g10/encode.c g10/import.c g10/keyedit.c g10/keylist.c "
+"g10/decrypt.c g10/encode.c g10/import.c g10/keyedit.c g10/keylist.c g10/"
-"g10/mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c "
+"mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c g10/"
-"g10/sig-check.c g10/sign.c g10/trustdb.c g10/verify.c\n"
+"sig-check.c g10/sign.c g10/trustdb.c g10/verify.c\n"
 
-#: util/secmem.c:79
+#: util/secmem.c:84
 msgid "Warning: using insecure memory!\n"
 msgstr "ATENCIÓN: ¡se está usando memoria insegura!\n"
 
-#: util/secmem.c:299
+#: util/secmem.c:304
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operación imposible sin memoria segura inicializada\n"
 
-#: util/secmem.c:300
+#: util/secmem.c:305
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 
@@ -253,7 +253,7 @@ msgstr "No cifrado"
 #: util/errors.c:103
 #, fuzzy
 msgid "not processed"
-msgstr "se han procesado %lu claves\n"
+msgstr "no procesado"
 
 #. the key cannot be used for a specific usage
 #: util/errors.c:105
@@ -612,7 +612,8 @@ msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe información de estado en descriptor DF"
 
 #: g10/g10.c:310
-msgid "|KEYID|ulimately trust this key"
+#, fuzzy
+msgid "|KEYID|ultimately trust this key"
 msgstr "|ID-CLAVE|confía plenamente en esta clave"
 
 #: g10/g10.c:311
@@ -857,7 +858,7 @@ msgstr "--delete-key id-usuario"
 #: g10/g10.c:1305
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
-msgstr "--delete-secret-key id-usuario"
+msgstr "--delete-secret-key-and-public id-usuario"
 
 #: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
 #, c-format
@@ -1708,21 +1709,21 @@ msgstr "demasiados registros en la cache pk - anulada\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2536
+#: g10/getkey.c:249 g10/getkey.c:2525
 #, fuzzy
 msgid "[User id not found]"
-msgstr "%s: usuario no encontrado\n"
+msgstr "[usuario no encontrado]"
 
 #: g10/getkey.c:453
 msgid "too many entries in unk cache - disabled\n"
 msgstr "demasiados registros en la cache unk - anulada\n"
 
-#: g10/getkey.c:2207
+#: g10/getkey.c:2196
 #, 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:2249 g10/trustdb.c:577
+#: g10/getkey.c:2238 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"
@@ -2471,12 +2472,12 @@ msgstr "Esta clave est
 #: g10/keyedit.c:1173
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
-msgstr "clave %08lX: ¡esta subclave ha sido revocada!\n"
+msgstr "rev! ¡esta subclave ha sido revocada! %s\n"
 
 #: g10/keyedit.c:1176
 #, fuzzy
 msgid "rev- faked revocation found\n"
-msgstr "        nuevas revocaciones: %lu\n"
+msgstr "rev-  incorrectas revocaciones\n"
 
 #: g10/keyedit.c:1178
 #, c-format
@@ -2700,7 +2701,7 @@ msgstr "hace una firma separada"
 #: g10/mainproc.c:1454
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
-msgstr "Clase de firma desconocida"
+msgstr "Clase 0x%02x de firma desconocida"
 
 #: g10/mainproc.c:1511
 msgid "old style (PGP 2.x) signature\n"
@@ -2749,7 +2750,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:576
+#: g10/passphrase.c:313 g10/passphrase.c:580
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr "(ID clave primaria %08lX)"
@@ -2763,7 +2764,8 @@ msgid ""
 msgstr ""
 "\n"
 "Necesita una contraseña para desbloquear la clave secreta\n"
-"del usuario: \""
+"del usuario: \"%2$s\"\n"
+"clave %4$s de %3$u bit, ID %5$08lX, creada el %6$s%7$s\n"
 
 #: g10/passphrase.c:344
 #, fuzzy
@@ -2788,12 +2790,12 @@ msgstr ""
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:408 g10/passphrase.c:477
+#: g10/passphrase.c:408 g10/passphrase.c:481
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:562
+#: g10/passphrase.c:566
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2803,20 +2805,20 @@ msgstr ""
 "Necesita una contraseña para desbloquear la clave secreta\n"
 "del usuario: \""
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:575
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s"
 
-#: g10/passphrase.c:609
+#: g10/passphrase.c:613
 msgid "can't query password in batchmode\n"
 msgstr "imposible pedir contraseña en modo de proceso por lotes\n"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:617
 msgid "Enter passphrase: "
 msgstr "Introduzca contraseña: "
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:621
 msgid "Repeat passphrase: "
 msgstr "Repita contraseña: "
 
@@ -2827,7 +2829,7 @@ msgstr "datos no grabados; use la opci
 #: g10/plaintext.c:332
 #, fuzzy
 msgid "Detached signature.\n"
-msgstr "%d firmas borradas.\n"
+msgstr "Firma borrada.\n"
 
 #: g10/plaintext.c:336
 msgid "Please enter name of data file: "
@@ -2840,7 +2842,7 @@ msgstr "leyendo stdin...\n"
 #: g10/plaintext.c:391
 #, fuzzy
 msgid "no signed data\n"
-msgstr "imposible abrir datos firmados `%s'\n"
+msgstr "no datos firmados\n"
 
 #: g10/plaintext.c:399
 #, c-format
@@ -2873,7 +2875,7 @@ msgstr "NOTA: algoritmo de cifrado %d no encontrado en las preferencias\n"
 #: g10/pubkey-enc.c:198
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
-msgstr "NOTA: clave de la firma caducada el %s\n"
+msgstr "NOTA: clave secreta %08lX caducada el %s\n"
 
 #: g10/hkp.c:59
 #, c-format
@@ -2912,7 +2914,7 @@ msgstr ""
 #: g10/seckey-cert.c:53
 #, fuzzy
 msgid "secret key parts are not available\n"
-msgstr "Clave secreta no disponible"
+msgstr "Clave secreta no disponible\n"
 
 #: g10/seckey-cert.c:59
 #, c-format
@@ -2951,7 +2953,7 @@ msgstr "la clave p
 #: g10/sig-check.c:328
 #, fuzzy, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
-msgstr "NOTA: clave de la firma caducada el %s\n"
+msgstr "NOTA: clave de la firma %08lX caducada el %s\n"
 
 #: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
@@ -2960,7 +2962,7 @@ msgstr "asumiendo firma incorrecta debido a un bit cr
 #: g10/sign.c:152
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
-msgstr "lid %lu: lectura registro firma fallida: %s\n"
+msgstr "lectura registro firma fallida: %s\n"
 
 #: g10/sign.c:161
 #, c-format
@@ -3330,10 +3332,11 @@ msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: registro de directiorio sin clave - ignorado\n"
 
 #: g10/trustdb.c:1873
-#, fuzzy, c-format
+#, c-format
 msgid "\t%lu due to new pubkeys\n"
-msgstr "clave %08lX: %d nuevas subclaves\n"
+msgstr ""
 
+# msgstr "clave %08lX: %d nuevas subclaves\n"
 #: g10/trustdb.c:1875
 #, c-format
 msgid "\t%lu keys skipped\n"
@@ -3455,7 +3458,7 @@ msgstr "clave no marcada como insegura - no puede usarse con el pseudo RNG\n"
 #: g10/skclist.c:138
 #, fuzzy, c-format
 msgid "skipped `%s': duplicated\n"
-msgstr "`%s' ignorado: %s\n"
+msgstr "`%s' ignorado: duplicado\n"
 
 #: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
@@ -3465,7 +3468,7 @@ msgstr "`%s' ignorado: %s\n"
 #: g10/skclist.c:149
 #, fuzzy
 msgid "skipped: secret key already present\n"
-msgstr "%s: ignorado: clave pública ya presente\n"
+msgstr "ignorado: clave secreta ya presente\n"
 
 #: g10/skclist.c:160
 #, c-format
@@ -3836,8 +3839,8 @@ msgstr "Ayuda no disponible para `%s'"
 #~ msgstr "clave secreta para descifrado no disponible\n"
 
 #~ msgid ""
-#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "RSA keys are deprecated; please consider creating a new key and use this "
-#~ "in the future\n"
+#~ "key in the future\n"
 #~ msgstr ""
 #~ "Las claves RSA están en desuso, considere la creación de una nueva clave "
 #~ "para futuros usos\n"

po/et.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.4\n"
-"POT-Creation-Date: 2001-04-29 16:39+0200\n"
+"POT-Creation-Date: 2001-05-28 09:05+0200\n"
 "PO-Revision-Date: 2001-01-04 12:01+02:00\n"
 "Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -13,15 +13,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: util/secmem.c:79
+#: util/secmem.c:84
 msgid "Warning: using insecure memory!\n"
 msgstr "Hoiatus: kasutan ebaturvalist mälu!\n"
 
-#: util/secmem.c:299
+#: util/secmem.c:304
 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
+#: util/secmem.c:305
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(te kasutasite vahest selle töö jaoks valet programmi)\n"
 
@@ -599,7 +599,8 @@ msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
 #: g10/g10.c:310
-msgid "|KEYID|ulimately trust this key"
+#, fuzzy
+msgid "|KEYID|ultimately trust this key"
 msgstr "|VÕTMEID|usalda seda võtit täielikult"
 
 #: g10/g10.c:311
@@ -840,7 +841,7 @@ msgstr "--delete-key kasutaja-id"
 #: g10/g10.c:1305
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
-msgstr "--delete-secret-key kasutaja-id"
+msgstr "--delete-secret-and-public-key kasutaja-id"
 
 #: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
 #, c-format
@@ -1676,7 +1677,7 @@ msgstr "avalike v
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2536
+#: g10/getkey.c:249 g10/getkey.c:2525
 msgid "[User id not found]"
 msgstr "[Kasutaja id ei leitud]"
 
@@ -1684,12 +1685,12 @@ msgstr "[Kasutaja id ei leitud]"
 msgid "too many entries in unk cache - disabled\n"
 msgstr "unk puhvris on liiga palju elemente - blokeerin\n"
 
-#: g10/getkey.c:2207
+#: g10/getkey.c:2196
 #, 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:2249 g10/trustdb.c:577
+#: g10/getkey.c:2238 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"
@@ -2272,7 +2273,7 @@ msgstr "n
 #: g10/keyedit.c:607
 #, fuzzy
 msgid "showpref"
-msgstr "pref"
+msgstr "showpref"
 
 #: g10/keyedit.c:608
 msgid "passwd"
@@ -2712,7 +2713,7 @@ msgstr ""
 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
+#: g10/passphrase.c:313 g10/passphrase.c:580
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (peamise võtme ID %08lX)"
@@ -2726,7 +2727,8 @@ msgid ""
 msgstr ""
 "\n"
 "Te vajate kasutaja salajase võtme lahtilukustamiseks\n"
-"parooli: \""
+"parooli: \"%*.s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
 
 #: g10/passphrase.c:344
 #, fuzzy
@@ -2750,12 +2752,12 @@ msgstr ""
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:408 g10/passphrase.c:477
+#: g10/passphrase.c:408 g10/passphrase.c:481
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:562
+#: g10/passphrase.c:566
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2765,20 +2767,20 @@ msgstr ""
 "Te vajate kasutaja salajase võtme lahtilukustamiseks\n"
 "parooli: \""
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:575
 #, 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
+#: g10/passphrase.c:613
 msgid "can't query password in batchmode\n"
 msgstr "pakettmoodis ei saa parooli küsida\n"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:617
 msgid "Enter passphrase: "
 msgstr "Sisestage parool: "
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:621
 msgid "Repeat passphrase: "
 msgstr "Korrake parooli: "
 
@@ -2799,9 +2801,8 @@ 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"
+msgstr ""
 
 #: g10/plaintext.c:399
 #, c-format
@@ -2910,7 +2911,7 @@ msgstr "avalik v
 #: 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"
+msgstr "MÄRKUS: allkirja võti %08lX aegus %s\n"
 
 #: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
@@ -3413,7 +3414,7 @@ msgstr ""
 #: g10/skclist.c:138
 #, fuzzy, c-format
 msgid "skipped `%s': duplicated\n"
-msgstr "`%s' jäi vahele: %s\n"
+msgstr "jäi vahele %s: dubleeritud\n"
 
 #: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
@@ -3423,7 +3424,7 @@ msgstr "`%s' j
 #: g10/skclist.c:149
 #, fuzzy
 msgid "skipped: secret key already present\n"
-msgstr "%s: jätsin vahele: avalik võti on juba olemas\n"
+msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
 #: g10/skclist.c:160
 #, c-format

po/fr.po

@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.4t\n"
-"POT-Creation-Date: 2001-04-29 16:39+0200\n"
+"POT-Creation-Date: 2001-05-28 09:05+0200\n"
 "PO-Revision-Date: 2001-04-24 17:46+02:00\n"
 "Last-Translator: Gaël Quéri <gqueri@mail.dotcom.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -18,17 +18,17 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: util/secmem.c:79
+#: util/secmem.c:84
 msgid "Warning: using insecure memory!\n"
 msgstr "Avertissement: l'utilisation de la mémoire n'est pas sûre !\n"
 
-#: util/secmem.c:299
+#: util/secmem.c:304
 msgid "operation is not possible without initialized secure memory\n"
 msgstr ""
 "l'opération n'est pas possible tant que la mémoire sûre n'est pas\n"
 "initialisée\n"
 
-#: util/secmem.c:300
+#: util/secmem.c:305
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(vous avez peut-être utilisé un programme non adapté à cette fin)\n"
 
@@ -609,7 +609,8 @@ msgid "|FD|write status info to this FD"
 msgstr "|FD|écrire l'état sur ce descripteur"
 
 #: g10/g10.c:310
-msgid "|KEYID|ulimately trust this key"
+#, fuzzy
+msgid "|KEYID|ultimately trust this key"
 msgstr "|IDCLÉ|donner une confiance ultime à cette clé"
 
 #: g10/g10.c:311
@@ -1709,7 +1710,7 @@ msgstr "trop d'entr
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2536
+#: g10/getkey.c:249 g10/getkey.c:2525
 msgid "[User id not found]"
 msgstr "[Nom utilisateur introuvable]"
 
@@ -1717,14 +1718,14 @@ msgstr "[Nom utilisateur introuvable]"
 msgid "too many entries in unk cache - disabled\n"
 msgstr "trop d'entrées dans le cache unk - désactivé\n"
 
-#: g10/getkey.c:2207
+#: g10/getkey.c:2196
 #, 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:2249 g10/trustdb.c:577
+#: g10/getkey.c:2238 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"
@@ -2306,9 +2307,8 @@ msgid "list preferences"
 msgstr "lister les préférences"
 
 #: g10/keyedit.c:607
-#, fuzzy
 msgid "showpref"
-msgstr "préf"
+msgstr ""
 
 #: g10/keyedit.c:608
 msgid "passwd"
@@ -2747,7 +2747,7 @@ msgstr "la variable d'environnement GPG_AGENT_INFO est mal d
 msgid "can't connect to `%s': %s\n"
 msgstr "impossible de se connecter à `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:576
+#: g10/passphrase.c:313 g10/passphrase.c:580
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID clé principale %08lX)"
@@ -2784,12 +2784,12 @@ msgstr "r
 msgid "cancelled by user\n"
 msgstr "annulé par l'utilisateur\n"
 
-#: g10/passphrase.c:408 g10/passphrase.c:477
+#: g10/passphrase.c:408 g10/passphrase.c:481
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problème avec l'agent : l'agent renvoie 0x%lx\n"
 
-#: g10/passphrase.c:562
+#: g10/passphrase.c:566
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2799,20 +2799,20 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour déverrouiller la clé secrète pour\n"
 "l'utilisateur: \""
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:575
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "clé de %u bits %s, ID %08lX, créée le %s"
 
-#: g10/passphrase.c:609
+#: g10/passphrase.c:613
 msgid "can't query password in batchmode\n"
 msgstr "impossible de demander un mot de passe en mode automatique\n"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:617
 msgid "Enter passphrase: "
 msgstr "Entrez le mot de passe: "
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:621
 msgid "Repeat passphrase: "
 msgstr "Répétez le mot de passe: "
 
@@ -3121,8 +3121,8 @@ msgstr "la base de confiance est corrompue; ex
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
-"enregistrement de confiance %lu, type de requête %d: la lecture a échoué: "
+"enregistrement de confiance %lu, type de requête %d: la lecture a échoué: %"
-"%s\n"
+"s\n"
 
 #: g10/trustdb.c:184
 #, c-format

po/id.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU Privacy Guard 1.0.4\n"
-"POT-Creation-Date: 2001-04-29 16:39+0200\n"
+"POT-Creation-Date: 2001-05-28 09:05+0200\n"
 "PO-Revision-Date: 2001-04-30 15:19GMT+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi-h@usa.net>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -14,15 +14,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.8\n"
 
-#: util/secmem.c:79
+#: util/secmem.c:84
 msgid "Warning: using insecure memory!\n"
 msgstr "Peringatan: menggunakan memori yang tidak aman!\n"
 
-#: util/secmem.c:299
+#: util/secmem.c:304
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operasi tidak mungkin tanpa menginisialisasi memori yang aman\n"
 
-#: util/secmem.c:300
+#: util/secmem.c:305
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 
@@ -598,7 +598,8 @@ msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
 #: g10/g10.c:310
-msgid "|KEYID|ulimately trust this key"
+#, fuzzy
+msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|sangat percaya kunci ini"
 
 #: g10/g10.c:311
@@ -878,7 +879,8 @@ msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
 #: g10/g10.c:1805
-msgid "the first character of a notation name must be a letter or an underscore\n"
+msgid ""
+"the first character of a notation name must be a letter or an underscore\n"
 msgstr "karakter pertama nama notasi harus huruf atau garis bawah\n"
 
 #: g10/g10.c:1811
@@ -970,7 +972,8 @@ msgid "invalid armor: line longer than %d characters\n"
 msgstr "armor tidak valid: baris melebihi %d karakter\n"
 
 #: g10/armor.c:1059
-msgid "quoted printable character in armor - probably a buggy MTA has been used\n"
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "karakter dapat dicetak dalam armor - mungkin kesalahan pada MTA telah "
 "dipakai\n"
@@ -1177,10 +1180,12 @@ msgstr "Catatan: Kunci ini telah berakhir!\n"
 
 #: g10/pkclist.c:687
 msgid "WARNING: This key is not certified with a trusted signature!\n"
-msgstr "PERINGATAN: Kunci ini tidak disertifikasi dengan sig yang terpercaya!\n"
+msgstr ""
+"PERINGATAN: Kunci ini tidak disertifikasi dengan sig yang terpercaya!\n"
 
 #: g10/pkclist.c:689
-msgid "         There is no indication that the signature belongs to the owner.\n"
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
 msgstr "  Tidak ada indikasi signature milik pemilik.\n"
 
 #: g10/pkclist.c:706
@@ -1192,8 +1197,10 @@ msgid "         The signature is probably a FORGERY.\n"
 msgstr "        Signature mungkin palsu.\n"
 
 #: g10/pkclist.c:714
-msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgid ""
-msgstr "PERINGATAN: Kunci tdk disertifikasi dg signature terpercaya yg cukup!\n"
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgstr ""
+"PERINGATAN: Kunci tdk disertifikasi dg signature terpercaya yg cukup!\n"
 
 #: g10/pkclist.c:717
 msgid "         It is not certain that the signature belongs to the owner.\n"
@@ -1344,7 +1351,8 @@ msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
 
 #: g10/keygen.c:622
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "keysize terlalu kecil; 1024 adalah nilai terendah yang diijinkan untuk RSA.\n"
+msgstr ""
+"keysize terlalu kecil; 1024 adalah nilai terendah yang diijinkan untuk RSA.\n"
 
 #. It is ridiculous and an annoyance to use larger key sizes!
 #. * GnuPG can handle much larger sizes; but it takes an eternity
@@ -1595,13 +1603,17 @@ msgstr "Pembuatan kunci gagal: %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"
+msgid ""
-msgstr "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
+"key has been created %lu second in future (time warp or clock problem)\n"
+msgstr ""
+"kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
 #: g10/keygen.c: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"
+msgid ""
-msgstr "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
+"key has been created %lu seconds in future (time warp or clock problem)\n"
+msgstr ""
+"kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
 #: g10/keygen.c:1783
 msgid "Really create? "
@@ -1663,7 +1675,7 @@ msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2536
+#: g10/getkey.c:249 g10/getkey.c:2525
 msgid "[User id not found]"
 msgstr "[User id tidak ditemukan]"
 
@@ -1671,12 +1683,12 @@ msgstr "[User id tidak ditemukan]"
 msgid "too many entries in unk cache - disabled\n"
 msgstr "terlalu banyak masukan di unk cache - ditiadakan\n"
 
-#: g10/getkey.c:2207
+#: g10/getkey.c:2196
 #, 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:2249 g10/trustdb.c:577
+#: g10/getkey.c:2238 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"
@@ -2668,7 +2680,8 @@ msgstr "Algoritma eksperimental sebaiknya tidak dipakai!\n"
 
 #: g10/misc.c:238
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
-msgstr "algoritma cipher ini didepresiasi; silakan gunakan yang lebih standar!\n"
+msgstr ""
+"algoritma cipher ini didepresiasi; silakan gunakan yang lebih standar!\n"
 
 #: g10/parse-packet.c:119
 #, c-format
@@ -2693,7 +2706,7 @@ msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 msgid "can't connect to `%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:576
+#: g10/passphrase.c:313 g10/passphrase.c:580
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID kunci utama %08lX)"
@@ -2729,12 +2742,12 @@ msgstr "respon tidak valid dari agen\n"
 msgid "cancelled by user\n"
 msgstr "dibatalkan oleh user\n"
 
-#: g10/passphrase.c:408 g10/passphrase.c:477
+#: g10/passphrase.c:408 g10/passphrase.c:481
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
-#: g10/passphrase.c:562
+#: g10/passphrase.c:566
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2744,20 +2757,20 @@ msgstr ""
 "Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
 "pemakai: \""
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:575
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
 
-#: g10/passphrase.c:609
+#: g10/passphrase.c:613
 msgid "can't query password in batchmode\n"
 msgstr "tidak dapat meminta password dalam mode batch\n"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:617
 msgid "Enter passphrase: "
 msgstr "Masukkan passphrase: "
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:621
 msgid "Repeat passphrase: "
 msgstr "Ulangi passphrase: "
 
@@ -2870,8 +2883,10 @@ msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "mengasumsikan MDC buruk karena ada bit kritis tidak dikenal\n"
 
 #: g10/sig-check.c:297
-msgid "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
+msgid ""
-msgstr "ini adalah kunci ElGamal ciptaan PGP yang tidak aman untuk signature!\n"
+"this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
+msgstr ""
+"ini adalah kunci ElGamal ciptaan PGP yang tidak aman untuk signature!\n"
 
 #: g10/sig-check.c:305
 #, c-format
@@ -3175,7 +3190,8 @@ msgstr "Self-signature tidak valid"
 
 #: g10/trustdb.c:1170
 msgid "Valid user ID revocation skipped due to a newer self signature"
-msgstr "Pembatalan ID user valid dilewati karena ada self signature yang lebih baru"
+msgstr ""
+"Pembatalan ID user valid dilewati karena ada self signature yang lebih baru"
 
 #: g10/trustdb.c:1176
 msgid "Valid user ID revocation"
@@ -3454,7 +3470,8 @@ msgstr "%s: direktori tercipta\n"
 
 #: g10/openfile.c:355
 msgid "you have to start GnuPG again, so it can read the new options file\n"
-msgstr "anda harus memulai GnuPG lagi, sehingga ia dapat membaca file option baru\n"
+msgstr ""
+"anda harus memulai GnuPG lagi, sehingga ia dapat membaca file option baru\n"
 
 #: g10/encr-data.c:66
 #, c-format
@@ -3467,8 +3484,10 @@ msgid "encrypted with unknown algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
 #: g10/encr-data.c:90
-msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgid ""
-msgstr "PERINGATAN: pesan dienkripsi dengan kunci lemah dalam cipher simetrik.\n"
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgstr ""
+"PERINGATAN: pesan dienkripsi dengan kunci lemah dalam cipher simetrik.\n"
 
 #: g10/encr-data.c:97
 msgid "problem handling encrypted packet\n"
@@ -3481,7 +3500,8 @@ msgstr "kunci lemah tercipta - mengulang\n"
 #: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
-msgstr "tidak dapat menghindari kunci lemah untuk cipher simetrik; mencoba %d kali!\n"
+msgstr ""
+"tidak dapat menghindari kunci lemah untuk cipher simetrik; mencoba %d kali!\n"
 
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
@@ -3524,7 +3544,8 @@ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Jika anda ingin menggunakan kunci tidak terpercaya ini, jawab \"ya\"."
 
 #: g10/helptext.c:61
-msgid "Enter the user ID of the addressee to whom you want to send the message."
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Masukkan ID user penerima pesan."
 
 #: g10/helptext.c:65
@@ -3667,7 +3688,8 @@ msgstr ""
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
-msgstr "Signature tidak valid. Masuk akal untuk menghapusnya dari keyring anda."
+msgstr ""
+"Signature tidak valid. Masuk akal untuk menghapusnya dari keyring anda."
 
 #: g10/helptext.c:193
 msgid ""
@@ -3693,7 +3715,8 @@ msgstr ""
 
 #: g10/helptext.c:209
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr "Silakan ulangi passphrase terakhir, sehingga anda yakin yang anda ketikkan."
+msgstr ""
+"Silakan ulangi passphrase terakhir, sehingga anda yakin yang anda ketikkan."
 
 #: g10/helptext.c:213
 msgid "Give the name of the file to which the signature applies"
@@ -3729,7 +3752,8 @@ msgstr ""
 "Anda harus menspesifikasikan alasan pembatalan. Semua ini tergantung\n"
 "konteks, anda dapat memilih dari daftar berikut:\n"
 " \"Key has been compromised\"\n"
-"      Gunakan ini jika anda punya alasan untuk percaya bahwa orang yang tidak berhak\n"
+"      Gunakan ini jika anda punya alasan untuk percaya bahwa orang yang "
+"tidak berhak\n"
 "      memiliki akses ke kunci pribadi anda.\n"
 "  \"Key is superseded\"\n"
 "      Gunakan ini bila anda mengganti kunci anda dengan yang baru.\n"
@@ -3737,7 +3761,8 @@ msgstr ""
 "      Gunakan ini bila anda telah mempensiunkan kunci ini.\n"
 "  \"User ID is no longer valid\"\n"
 "      Gunakan ini untuk menyatakan user ID tidak boleh digunakan lagi;\n"
-"      normalnya digunakan untuk menandai bahwa alamat email tidak valid lagi.\n"
+"      normalnya digunakan untuk menandai bahwa alamat email tidak valid "
+"lagi.\n"
 
 #: g10/helptext.c:245
 msgid ""
@@ -3757,4 +3782,3 @@ msgstr "Tidak tersedia bantuan"
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Tidak tersedia bantuan untuk `%s'"
-

po/it.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.5\n"
-"POT-Creation-Date: 2001-04-29 16:39+0200\n"
+"POT-Creation-Date: 2001-05-28 09:05+0200\n"
 "PO-Revision-Date: 2001-04-23 21:15+02:00\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -13,15 +13,15 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:79
+#: util/secmem.c:84
 msgid "Warning: using insecure memory!\n"
 msgstr "Attenzione: si sta usando memoria insicura!\n"
 
-#: util/secmem.c:299
+#: util/secmem.c:304
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "l'operazione non è possibile senza memoria sicura inizializzata\n"
 
-#: util/secmem.c:300
+#: util/secmem.c:305
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 
@@ -601,7 +601,8 @@ msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato su questo FD"
 
 #: g10/g10.c:310
-msgid "|KEYID|ulimately trust this key"
+#, fuzzy
+msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|assegna fiducia definitiva a questa chiave"
 
 #: g10/g10.c:311
@@ -1687,7 +1688,7 @@ msgstr "troppe voci nella pk cache - disabilitata\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2536
+#: g10/getkey.c:249 g10/getkey.c:2525
 msgid "[User id not found]"
 msgstr "[User ID non trovato]"
 
@@ -1695,12 +1696,12 @@ msgstr "[User ID non trovato]"
 msgid "too many entries in unk cache - disabled\n"
 msgstr "troppe voci nella unk cache - disabilitata\n"
 
-#: g10/getkey.c:2207
+#: g10/getkey.c:2196
 #, 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:2249 g10/trustdb.c:577
+#: g10/getkey.c:2238 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"
@@ -2285,7 +2286,7 @@ msgstr "elenca le impostazioni"
 #: g10/keyedit.c:607
 #, fuzzy
 msgid "showpref"
-msgstr "pref"
+msgstr "showpref"
 
 #: g10/keyedit.c:608
 msgid "passwd"
@@ -2723,7 +2724,7 @@ msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 msgid "can't connect to `%s': %s\n"
 msgstr "impossibile connettersi a `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:576
+#: g10/passphrase.c:313 g10/passphrase.c:580
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (key ID principale %08lX)"
@@ -2759,12 +2760,12 @@ msgstr "risposta non valida dall'agent\n"
 msgid "cancelled by user\n"
 msgstr "interrotto dall'utente\n"
 
-#: g10/passphrase.c:408 g10/passphrase.c:477
+#: g10/passphrase.c:408 g10/passphrase.c:481
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
 
-#: g10/passphrase.c:562
+#: g10/passphrase.c:566
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2774,20 +2775,20 @@ msgstr ""
 "Ti serve una passphrase per sbloccare la chiave segreta\n"
 "dell'utente: \""
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:575
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
 
-#: g10/passphrase.c:609
+#: g10/passphrase.c:613
 msgid "can't query password in batchmode\n"
 msgstr "impossibile chiedere la password in modo batch\n"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:617
 msgid "Enter passphrase: "
 msgstr "Inserisci la passphrase: "
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:621
 msgid "Repeat passphrase: "
 msgstr "Ripeti la passphrase: "
 

po/ja.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.4\n"
-"POT-Creation-Date: 2001-04-29 16:39+0200\n"
+"POT-Creation-Date: 2001-05-28 09:05+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"
@@ -15,15 +15,15 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:79
+#: util/secmem.c:84
 msgid "Warning: using insecure memory!\n"
 msgstr "警告: やばいメモリーを使用しています!\n"
 
-#: util/secmem.c:299
+#: util/secmem.c:304
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "初期化済みの安全なメモリーがない場合には実行できません\n"
 
-#: util/secmem.c:300
+#: util/secmem.c:305
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(この目的には誤ったプログラムを用いたのでしょう)\n"
 
@@ -621,7 +621,8 @@ msgstr ""
 "書き出す"
 
 #: g10/g10.c:310
-msgid "|KEYID|ulimately trust this key"
+#, fuzzy
+msgid "|KEYID|ultimately trust this key"
 msgstr "|鍵ID|この「鍵」を究極的に信用する"
 
 #: g10/g10.c:311
@@ -881,7 +882,7 @@ msgstr "--delete-key
 #: g10/g10.c:1305
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
-msgstr "--delete-secret-key ユーザーid"
+msgstr "--delete-secret-and-public-key ユーザーid"
 
 #: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
 #, c-format
@@ -1715,7 +1716,7 @@ msgstr "pk
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2536
+#: g10/getkey.c:249 g10/getkey.c:2525
 msgid "[User id not found]"
 msgstr "[ユーザーidが見つかりません]"
 
@@ -1723,12 +1724,12 @@ msgstr "[
 msgid "too many entries in unk cache - disabled\n"
 msgstr "unkキャッシュのエントリーが多すぎます - 使用禁止\n"
 
-#: g10/getkey.c:2207
+#: g10/getkey.c:2196
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "副鍵%08lXを主鍵%08lXに代用します\n"
 
-#: g10/getkey.c:2249 g10/trustdb.c:577
+#: g10/getkey.c:2238 g10/trustdb.c:577
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "鍵%08lX: 公開鍵のない秘密鍵です。スキップ\n"
@@ -2309,7 +2310,7 @@ msgstr "ͥ
 #: g10/keyedit.c:607
 #, fuzzy
 msgid "showpref"
-msgstr "pref"
+msgstr "showpref"
 
 #: g10/keyedit.c:608
 msgid "passwd"
@@ -2750,7 +2751,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "`%s'へ接続できません: %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:576
+#: g10/passphrase.c:313 g10/passphrase.c:580
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (主鍵ID %08lX)"
@@ -2764,7 +2765,8 @@ msgid ""
 msgstr ""
 "\n"
 "次のユーザーの秘密鍵のロックを解除するには\n"
-"パスフレーズがいります: \""
+"パスフレーズがいります: \"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
 
 #: g10/passphrase.c:344
 #, fuzzy
@@ -2788,12 +2790,12 @@ msgstr ""
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:408 g10/passphrase.c:477
+#: g10/passphrase.c:408 g10/passphrase.c:481
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:562
+#: g10/passphrase.c:566
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2803,20 +2805,20 @@ msgstr ""
 "次のユーザーの秘密鍵のロックを解除するには\n"
 "パスフレーズがいります: \""
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:575
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%uビット%s鍵, ID %08lX作成日付は%s"
 
-#: g10/passphrase.c:609
+#: g10/passphrase.c:613
 msgid "can't query password in batchmode\n"
 msgstr "バッチモードではパスワードの問合せができません\n"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:617
 msgid "Enter passphrase: "
 msgstr "パスフレーズを入力: "
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:621
 msgid "Repeat passphrase: "
 msgstr "パスフレーズを再入力: "
 
@@ -2841,7 +2843,7 @@ msgstr "ɸ
 #: g10/plaintext.c:391
 #, fuzzy
 msgid "no signed data\n"
-msgstr "署名されたデータ`%s'が開けません\n"
+msgstr "署名されたデータ が開けません\n"
 
 #: g10/plaintext.c:399
 #, c-format
@@ -2951,7 +2953,7 @@ msgstr "
 #: g10/sig-check.c:328
 #, fuzzy, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
-msgstr "注意: 署名の鍵は期限切れです%s\n"
+msgstr "注意: %08lX 署名の鍵は期限切れです%s\n"
 
 #: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
@@ -3455,7 +3457,7 @@ msgstr ""
 #: g10/skclist.c:138
 #, fuzzy, c-format
 msgid "skipped `%s': duplicated\n"
-msgstr "`%s'をスキップ: %s\n"
+msgstr "`%s'をスキップ: duplicated\n"
 
 #: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
@@ -3465,7 +3467,7 @@ msgstr "`%s'
 #: g10/skclist.c:149
 #, fuzzy
 msgid "skipped: secret key already present\n"
-msgstr "%s: スキップ: 公開鍵は既にあります\n"
+msgstr "スキップ: 公開鍵は既にあります\n"
 
 #: g10/skclist.c:160
 #, c-format

po/nl.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2001-04-29 16:39+0200\n"
+"POT-Creation-Date: 2001-05-28 09:05+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"
@@ -13,15 +13,15 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:79
+#: util/secmem.c:84
 msgid "Warning: using insecure memory!\n"
 msgstr "Let op: er wordt onveilig geheugen gebruikt!\n"
 
-#: util/secmem.c:299
+#: util/secmem.c:304
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "bewerking is niet mogelijk zonder initialisatie van veilig geheugen\n"
 
-#: util/secmem.c:300
+#: util/secmem.c:305
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(misschien heb je hiervoor het verkeerde programma gebruikt)\n"
 
@@ -601,7 +601,7 @@ msgid "|FD|write status info to this FD"
 msgstr "|BB|schrijf status naar deze bestandsbeschrijver"
 
 #: g10/g10.c:310
-msgid "|KEYID|ulimately trust this key"
+msgid "|KEYID|ultimately trust this key"
 msgstr ""
 
 #: g10/g10.c:311
@@ -842,7 +842,7 @@ msgstr "--delete-key gebruikersidentificatie"
 #: g10/g10.c:1305
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
-msgstr "--delete-secret-key gebruikersidentificatie"
+msgstr "--delete-secret-and-public-key gebruikersidentificatie"
 
 #: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
 #, c-format
@@ -1703,21 +1703,21 @@ msgstr "te veel ingangen in de pk cache - uitgezet\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2536
+#: g10/getkey.c:249 g10/getkey.c:2525
 #, fuzzy
 msgid "[User id not found]"
-msgstr "%s: gebruiker niet gevonden\n"
+msgstr "[gebruiker niet gevonden]"
 
 #: g10/getkey.c:453
 msgid "too many entries in unk cache - disabled\n"
 msgstr "te veel ingangen in de unk cache - uitgezet\n"
 
-#: g10/getkey.c:2207
+#: g10/getkey.c:2196
 #, 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:2249 g10/trustdb.c:577
+#: g10/getkey.c:2238 g10/trustdb.c:577
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
@@ -2311,7 +2311,7 @@ msgstr "toon voorkeuren"
 #: g10/keyedit.c:607
 #, fuzzy
 msgid "showpref"
-msgstr "pref"
+msgstr "showpref"
 
 #: g10/keyedit.c:608
 msgid "passwd"
@@ -2475,12 +2475,12 @@ msgstr "Deze sleutel is niet beschikbaar"
 #: g10/keyedit.c:1173
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
-msgstr "sleutel %08lx: subsleutel is teruggeroepen!\n"
+msgstr "rev! subsleutel is teruggeroepen: %s\n"
 
 #: g10/keyedit.c:1176
 #, fuzzy
 msgid "rev- faked revocation found\n"
-msgstr "nieuwe sleutelterugtrekkingen: %lu\n"
+msgstr "rev- vervalste sleutelterugtrekking gevonden\n"
 
 #: g10/keyedit.c:1178
 #, c-format
@@ -2752,7 +2752,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "kan geen verbinding maken met `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:576
+#: g10/passphrase.c:313 g10/passphrase.c:580
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (hoofdsleutelnummer %08lX)"
@@ -2766,7 +2766,8 @@ msgid ""
 msgstr ""
 "\n"
 "U heeft een sleuteltekst nodig om de beveiliging voor de geheime\n"
-"sleutel voor gebruiker op te heffen: \""
+"sleutel op te heffen voor gebruiker \"%.*s\"\n"
+"%u-bit %s sleutel, ID %08lX, gemaakt op %s%s\n"
 
 #: g10/passphrase.c:344
 #, fuzzy
@@ -2790,12 +2791,12 @@ msgstr ""
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:408 g10/passphrase.c:477
+#: g10/passphrase.c:408 g10/passphrase.c:481
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:562
+#: g10/passphrase.c:566
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2805,20 +2806,20 @@ msgstr ""
 "U heeft een sleuteltekst nodig om de beveiliging voor de geheime\n"
 "sleutel voor gebruiker op te heffen: \""
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:575
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bit %s sleutel, nummer %08lX, gemaakt op %s"
 
-#: g10/passphrase.c:609
+#: g10/passphrase.c:613
 msgid "can't query password in batchmode\n"
 msgstr "kan niet om wachtwoord vragen in lopende band-modus\n"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:617
 msgid "Enter passphrase: "
 msgstr "Geef de sleuteltekst: "
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:621
 msgid "Repeat passphrase: "
 msgstr "Herhaal de sleuteltekst: "
 
@@ -2842,7 +2843,7 @@ msgstr "lezen uit standaard invoer ...\n"
 #: g10/plaintext.c:391
 #, fuzzy
 msgid "no signed data\n"
-msgstr "kan ondertekende gegevens `%s' niet openen\n"
+msgstr "geen ondertekende gegevens\n"
 
 #: g10/plaintext.c:399
 #, c-format
@@ -2875,7 +2876,7 @@ msgstr "LET OP: versleutelalgoritme %d niet gevonden in de voorkeuren\n"
 #: g10/pubkey-enc.c:198
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
-msgstr "LET OP: sleutel voor ondertekening is vervallen op %s\n"
+msgstr "LET OP: geheime sleutel %08lX is vervallen op %s\n"
 
 #: g10/hkp.c:59
 #, c-format
@@ -2955,7 +2956,7 @@ msgstr "openbare sleutel is %lu seconden nieuwer dan de ondertekening\n"
 #: g10/sig-check.c:328
 #, fuzzy, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
-msgstr "LET OP: sleutel voor ondertekening is vervallen op %s\n"
+msgstr "LET OP: sleutel voor ondertekening %08lX is vervallen op %s\n"
 
 #: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
@@ -3460,13 +3461,13 @@ msgstr "Dicht dit mogelijke beveiligingsgat\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 ""
-"sleutel is niet als onveilig gemarkeerd - kan hem niet gebruiken met "
+"sleutel is niet als onveilig gemarkeerd - kan hem niet gebruiken met nep-"
-"nep-RNG!\n"
+"RNG!\n"
 
 #: g10/skclist.c:138
 #, fuzzy, c-format
 msgid "skipped `%s': duplicated\n"
-msgstr "`%s' overgeslagen: %s\n"
+msgstr "`%s' overgeslagen: dubbel\n"
 
 #: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
@@ -3476,7 +3477,7 @@ msgstr "`%s' overgeslagen: %s\n"
 #: g10/skclist.c:149
 #, fuzzy
 msgid "skipped: secret key already present\n"
-msgstr "%s: overgeslagen: openbare sleutel is al aanwezig\n"
+msgstr "overgeslagen: geheime sleutel is al aanwezig\n"
 
 #: g10/skclist.c:160
 #, c-format
@@ -3860,8 +3861,8 @@ msgstr "Geen hulp beschikbaar voor `%s'"
 #~ msgstr "geheime sleutel voor ontsleuteling is niet beschikbaar\n"
 
 #~ msgid ""
-#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "RSA keys are deprecated; please consider creating a new key and use this "
-#~ "in the future\n"
+#~ "key in the future\n"
 #~ msgstr ""
 #~ "RSA sleutels zijn verouderd; overweeg a.u.b. het aanmaken van een\n"
 #~ "nieuwe sleutel om in de toekomst te gebruiken\n"

po/pl.po

@@ -7,31 +7,31 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.4\n"
-"POT-Creation-Date: 2001-04-29 16:39+0200\n"
+"POT-Creation-Date: 2001-05-28 09:05+0200\n"
 "PO-Revision-Date: 2001-04-21 01:03+02:00\n"
 "Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Xgettext-Options: --default-domain=gnupg --directory=.. --add-comments "
+"Xgettext-Options: --default-domain=gnupg --directory=.. --add-comments --"
-"--keyword=_ --keyword=N_ --files-from=./POTFILES.in\n"
+"keyword=_ --keyword=N_ --files-from=./POTFILES.in\n"
 "Files: util/secmem.c util/argparse.c cipher/random.c cipher/rand-dummy.c "
 "cipher/rand-unix.c cipher/rand-w32.c g10/g10.c g10/pkclist.c g10/keygen.c "
-"g10/decrypt.c g10/encode.c g10/import.c g10/keyedit.c g10/keylist.c "
+"g10/decrypt.c g10/encode.c g10/import.c g10/keyedit.c g10/keylist.c g10/"
-"g10/mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c "
+"mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c g10/"
-"g10/sig-check.c g10/sign.c g10/trustdb.c g10/verify.c g10/status.c "
+"sig-check.c g10/sign.c g10/trustdb.c g10/verify.c g10/status.c g10/pubkey-"
-"g10/pubkey-enc.c\n"
+"enc.c\n"
 
-#: util/secmem.c:79
+#: util/secmem.c:84
 msgid "Warning: using insecure memory!\n"
 msgstr "Ostrze¿enie: u¿ywana pamiêæ nie jest pamiêci± bezpieczn±!\n"
 
-#: util/secmem.c:299
+#: util/secmem.c:304
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operacja niemo¿liwa do wykonania bez dostêpnej pamiêci bezpiecznej\n"
 
-#: util/secmem.c:300
+#: util/secmem.c:305
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(prawdopodobnie u¿ywany program jest niew³a¶ciwy dlatego zadania)\n"
 
@@ -611,7 +611,8 @@ msgid "|FD|write status info to this FD"
 msgstr "|FD|zapisaæ opis stanu do FD"
 
 #: g10/g10.c:310
-msgid "|KEYID|ulimately trust this key"
+#, fuzzy
+msgid "|KEYID|ultimately trust this key"
 msgstr "|KLUCZ|ca³kowite zaufanie dla tego klucza"
 
 #: g10/g10.c:311
@@ -1708,7 +1709,7 @@ msgstr "zbyt wiele wpis
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2536
+#: g10/getkey.c:249 g10/getkey.c:2525
 msgid "[User id not found]"
 msgstr "[brak identyfikatora u¿ytkownika]"
 
@@ -1716,12 +1717,12 @@ msgstr "[brak identyfikatora u
 msgid "too many entries in unk cache - disabled\n"
 msgstr "zbyt wiele wpisów w buforze nieznanych kluczy - wy³±czony\n"
 
-#: g10/getkey.c:2207
+#: g10/getkey.c:2196
 #, 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:2249 g10/trustdb.c:577
+#: g10/getkey.c:2238 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"
@@ -2307,9 +2308,8 @@ msgid "list preferences"
 msgstr "lista opcji"
 
 #: g10/keyedit.c:607
-#, fuzzy
 msgid "showpref"
-msgstr "opcje"
+msgstr ""
 
 #: g10/keyedit.c:608
 msgid "passwd"
@@ -2751,7 +2751,7 @@ msgstr "z
 msgid "can't connect to `%s': %s\n"
 msgstr "nie mo¿na po³±czyæ siê z %s: %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:576
+#: g10/passphrase.c:313 g10/passphrase.c:580
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (g³ówny ID klucza %08lX)"
@@ -2787,12 +2787,12 @@ msgstr "b
 msgid "cancelled by user\n"
 msgstr "anulowane przez u¿ytkownika\n"
 
-#: g10/passphrase.c:408 g10/passphrase.c:477
+#: g10/passphrase.c:408 g10/passphrase.c:481
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problem agenta: zwróci³ 0x%lx\n"
 
-#: g10/passphrase.c:562
+#: g10/passphrase.c:566
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2802,20 +2802,20 @@ msgstr ""
 "Musisz podaæ wyra¿enie przej¶ciowe (has³o) aby uaktywniæ klucz tajny\n"
 "dla u¿ytkownika: \""
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:575
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "d³ugo¶æ %u bitów, typ %s, klucz %08lX, stworzony %s"
 
-#: g10/passphrase.c:609
+#: g10/passphrase.c:613
 msgid "can't query password in batchmode\n"
 msgstr "pytanie o has³o nie dzia³a w trybie wsadowym\n"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:617
 msgid "Enter passphrase: "
 msgstr "Wyra¿enie przej¶ciowe: "
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:621
 msgid "Repeat passphrase: "
 msgstr "Powtórzone wyra¿enie przej¶ciowe: "
 
@@ -3594,8 +3594,8 @@ msgstr ""
 #: g10/helptext.c:53
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
 msgstr ""
-"Je¶li mimo wszystko chcesz u¿yæ tego uniewa¿nionego klucza, odpowiedz "
+"Je¶li mimo wszystko chcesz u¿yæ tego uniewa¿nionego klucza, odpowiedz \"tak"
-"\"tak\"."
+"\"."
 
 #: g10/helptext.c:57
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
@@ -3711,8 +3711,8 @@ msgstr "Je
 #: g10/helptext.c:164
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr ""
-"Aby podpisaæ WSZYSTKIE identyfikatory u¿ytkownika nale¿y odpowiedzieæ "
+"Aby podpisaæ WSZYSTKIE identyfikatory u¿ytkownika nale¿y odpowiedzieæ \"tak"
-"\"tak\"."
+"\"."
 
 #: g10/helptext.c:168
 msgid ""
@@ -3878,14 +3878,15 @@ msgstr "Brak pomocy o '%s'"
 
 #~ msgid "   (%d) ElGamal in a v3 packet\n"
 #~ msgstr ""
-#~ "   (%d) Klucz dla algorytmu ElGamala w pakiecie w trzeciej wersji formatu\n"
+#~ "   (%d) Klucz dla algorytmu ElGamala w pakiecie w trzeciej wersji "
+#~ "formatu\n"
 
 #~ msgid "Key generation can only be used in interactive mode\n"
 #~ msgstr "Generacjê klucza mo¿na wykonywaæ tylko w trybie interaktywnym\n"
 
 #~ msgid ""
-#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "RSA keys are deprecated; please consider creating a new key and use this "
-#~ "in the future\n"
+#~ "key in the future\n"
 #~ msgstr ""
 #~ "Odradza siê stosowanie kluczy RSA; proszê rozwa¿yæ przej¶cie na inne "
 #~ "algorytmy\n"
@@ -4009,14 +4010,17 @@ msgstr "Brak pomocy o '%s'"
 #~ "stosowaæ\n"
 #~ "zarówno do szyfrowania jak i do tworzenia podpisów cyfrowych\n"
 #~ "W standardzie OpenPGP algorytm ElGamala wystêpuje w dwóch wersjach:\n"
-#~ "obs³uguj±cej podpisywanie, oraz obs³uguj±cej podpisywanie i szyfrowanie; z\n"
+#~ "obs³uguj±cej podpisywanie, oraz obs³uguj±cej podpisywanie i szyfrowanie; "
+#~ "z\n"
 #~ "technicznego punktu widzenia algorytm dzia³a tak samo, ale pewne "
 #~ "wspó³czynniki\n"
 #~ "musz± byæ dobrane tak aby klucz nadawa³ siê do sk³adania bezpiecznych\n"
-#~ "podpisów. Ten program obs³uguje obie wersje, ale inne implementacje OpenPGP\n"
+#~ "podpisów. Ten program obs³uguje obie wersje, ale inne implementacje "
+#~ "OpenPGP\n"
 #~ "nie musz± rozumieæ obs³ugiwaæ klucza przeznaczonego jednocze¶nie do\n"
 #~ "podpisywania i szyfrowania.\n"
-#~ "G³ówny klucz musi byæ zawsze kluczem s³u¿±cym umo¿liwiaj±cym podpisywanie,\n"
+#~ "G³ówny klucz musi byæ zawsze kluczem s³u¿±cym umo¿liwiaj±cym "
+#~ "podpisywanie,\n"
 #~ "dlatego te¿ ten program nie obs³uguje osobnych kluczy ElGamala s³u¿±cych "
 #~ "tylko\n"
 #~ "do szyfrowania."
@@ -4088,7 +4092,8 @@ msgstr "Brak pomocy o '%s'"
 
 #~ msgid "keyedit.remove.uid.okay"
 #~ msgstr ""
-#~ "Odpowiedz \"tak\" je¶li na pewno chcesz skasowaæ ten identyfikator klucza.\n"
+#~ "Odpowiedz \"tak\" je¶li na pewno chcesz skasowaæ ten identyfikator "
+#~ "klucza.\n"
 #~ "Utracisz wszystkie podpisy innych u¿ytkowników z³o¿one na tym "
 #~ "identyfikatorze!"
 

po/pt_BR.po

@@ -5,27 +5,27 @@
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2001-04-29 16:39+0200\n"
+"POT-Creation-Date: 2001-05-28 09:05+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"
-"Xgettext-Options: --default-domain=gnupg --directory=.. --add-comments "
+"Xgettext-Options: --default-domain=gnupg --directory=.. --add-comments --"
-"--keyword=_ --keyword=N_ --files-from=./POTFILES.in\n"
+"keyword=_ --keyword=N_ --files-from=./POTFILES.in\n"
 "Files: util/secmem.c util/argparse.c cipher/random.c cipher/rand-dummy.c "
 "cipher/rand-unix.c cipher/rand-w32.c g10/g10.c g10/pkclist.c g10/keygen.c "
-"g10/decrypt.c g10/encode.c g10/import.c g10/keyedit.c g10/keylist.c "
+"g10/decrypt.c g10/encode.c g10/import.c g10/keyedit.c g10/keylist.c g10/"
-"g10/mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c "
+"mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c g10/"
-"g10/sig-check.c g10/sign.c g10/trustdb.c g10/verify.c\n"
+"sig-check.c g10/sign.c g10/trustdb.c g10/verify.c\n"
 
-#: util/secmem.c:79
+#: util/secmem.c:84
 msgid "Warning: using insecure memory!\n"
 msgstr "Aviso: usando memória insegura!\n"
 
-#: util/secmem.c:299
+#: util/secmem.c:304
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "a operação não é possível sem memória segura inicializada\n"
 
-#: util/secmem.c:300
+#: util/secmem.c:305
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(você pode ter usado o programa errado para esta tarefa)\n"
 
@@ -619,7 +619,7 @@ msgstr ""
 "descritor de arquivo DA"
 
 #: g10/g10.c:310
-msgid "|KEYID|ulimately trust this key"
+msgid "|KEYID|ultimately trust this key"
 msgstr ""
 
 #: g10/g10.c:311
@@ -867,7 +867,7 @@ msgstr "--delete-key id-usu
 #: g10/g10.c:1305
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
-msgstr "--delete-secret-key id-usuário"
+msgstr "--delete-secret-and-public-key id-usuário"
 
 #: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
 #, c-format
@@ -1717,21 +1717,21 @@ msgstr "entradas demais no cache pk - desativado\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2536
+#: g10/getkey.c:249 g10/getkey.c:2525
 #, fuzzy
 msgid "[User id not found]"
-msgstr "%s: usuário não encontrado\n"
+msgstr "[usuário não encontrado]"
 
 #: g10/getkey.c:453
 msgid "too many entries in unk cache - disabled\n"
 msgstr "entradas demais no cache unk - desativado\n"
 
-#: g10/getkey.c:2207
+#: g10/getkey.c:2196
 #, 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:2249 g10/trustdb.c:577
+#: g10/getkey.c:2238 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"
@@ -2316,7 +2316,7 @@ msgstr "lista prefer
 #: g10/keyedit.c:607
 #, fuzzy
 msgid "showpref"
-msgstr "pref"
+msgstr "showpref"
 
 #: g10/keyedit.c:608
 msgid "passwd"
@@ -2481,12 +2481,12 @@ msgstr "Esta chave foi desativada"
 #: g10/keyedit.c:1173
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
-msgstr "chave %08lX: a subchave foi revogada!\n"
+msgstr "rev! a subchave foi revogada: %s\n"
 
 #: g10/keyedit.c:1176
 #, fuzzy
 msgid "rev- faked revocation found\n"
-msgstr "   novas revogações de chaves: %lu\n"
+msgstr "rev- revogações de chaves incorreta\n"
 
 #: g10/keyedit.c:1178
 #, c-format
@@ -2759,7 +2759,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:576
+#: g10/passphrase.c:313 g10/passphrase.c:580
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID principal da chave %08lX)"
@@ -2773,7 +2773,8 @@ msgid ""
 msgstr ""
 "\n"
 "Você precisa de uma frase secreta para desbloquear a chave secreta do\n"
-"usuário: \""
+"usuário: \"%.*s\"\n"
+"%u-bit %s chave, ID %08lX, criada %s%s\n"
 
 #: g10/passphrase.c:344
 #, fuzzy
@@ -2798,12 +2799,12 @@ msgstr ""
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:408 g10/passphrase.c:477
+#: g10/passphrase.c:408 g10/passphrase.c:481
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:562
+#: g10/passphrase.c:566
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2813,20 +2814,20 @@ msgstr ""
 "Você precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "usuário: \""
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:575
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:609
+#: g10/passphrase.c:613
 msgid "can't query password in batchmode\n"
 msgstr "impossível pedir senha em modo não-interativo\n"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:617
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:621
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
@@ -2849,7 +2850,7 @@ msgstr "lendo de \"stdin\" ...\n"
 #: g10/plaintext.c:391
 #, fuzzy
 msgid "no signed data\n"
-msgstr "impossível abrir dados assinados `%s'\n"
+msgstr "no dados assinados\n"
 
 #: g10/plaintext.c:399
 #, c-format
@@ -2882,7 +2883,7 @@ msgstr "NOTA: algoritmo de criptografia %d n
 #: g10/pubkey-enc.c:198
 #, fuzzy, 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 %s\n"
 
 #: g10/hkp.c:59
 #, c-format
@@ -2960,7 +2961,7 @@ msgstr "a chave p
 #: g10/sig-check.c:328
 #, fuzzy, 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"
@@ -2969,7 +2970,7 @@ msgstr "assumindo assinatura incorreta devido a um bit cr
 #: g10/sign.c:152
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
-msgstr "lid %lu: leitura de registro de assinatura falhou: %s\n"
+msgstr "leitura de registro de assinatura falhou: %s\n"
 
 #: g10/sign.c:161
 #, c-format
@@ -3469,7 +3470,7 @@ msgstr ""
 #: g10/skclist.c:138
 #, fuzzy, c-format
 msgid "skipped `%s': duplicated\n"
-msgstr "ignorado `%s': %s\n"
+msgstr "ignorado `%s': duplicado\n"
 
 #: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
@@ -3479,7 +3480,7 @@ 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
@@ -3559,9 +3560,7 @@ msgstr ""
 #: g10/encr-data.c:97
 #, fuzzy
 msgid "problem handling encrypted packet\n"
-msgstr ""
+msgstr "eliminar o campo keyid dos pacotes criptografados\n"
-"eliminar o campo keyid dos pacotes\n"
-"criptografados"
 
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
@@ -3858,11 +3857,11 @@ msgstr "Nenhuma ajuda dispon
 #~ msgstr "nenhuma chave secreta para descriptografia disponível\n"
 
 #~ msgid ""
-#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "RSA keys are deprecated; please consider creating a new key and use this "
-#~ "in the future\n"
+#~ "key in the future\n"
 #~ msgstr ""
-#~ "Chaves RSA não são recomendáveis; por favor considere criar uma nova chave e "
+#~ "Chaves RSA não são recomendáveis; por favor considere criar uma nova "
-#~ "usá-la no futuro\n"
+#~ "chave e usá-la no futuro\n"
 
 #~ msgid "set debugging flags"
 #~ msgstr "definir parâmetros de depuração"
@@ -3899,7 +3898,8 @@ msgstr "Nenhuma ajuda dispon
 
 #~ msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n"
 #~ msgstr ""
-#~ "NOTA: assinatura rec %lu[%d] está na lista de sugestões de %lu mas não está\n"
+#~ "NOTA: assinatura rec %lu[%d] está na lista de sugestões de %lu mas não "
+#~ "está\n"
 #~ "      marcada\n"
 
 #~ msgid "sig rec %lu[%d] in hintlist of %lu does not point to a dir record\n"

po/pt_PT.po

@@ -8,23 +8,23 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 2001-04-29 16:39+0200\n"
+"POT-Creation-Date: 2001-05-28 09:05+0200\n"
 "PO-Revision-Date: 2001-04-08 16:28+00:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-latin-1\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: none\n"
 
-#: util/secmem.c:79
+#: util/secmem.c:84
 msgid "Warning: using insecure memory!\n"
 msgstr "Aviso: a utilizar memória insegura!\n"
 
-#: util/secmem.c:299
+#: util/secmem.c:304
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "a operação não é possível sem memória segura inicializada\n"
 
-#: util/secmem.c:300
+#: util/secmem.c:305
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(você pode ter usado o programa errado para esta tarefa)\n"
 
@@ -611,7 +611,8 @@ msgstr ""
 "descritor de ficheiro DF"
 
 #: g10/g10.c:310
-msgid "|KEYID|ulimately trust this key"
+#, fuzzy
+msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|confiar totalmente nesta chave"
 
 #: g10/g10.c:311
@@ -1706,7 +1707,7 @@ msgstr "entradas demais no cache pk - desactivado\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2536
+#: g10/getkey.c:249 g10/getkey.c:2525
 msgid "[User id not found]"
 msgstr "[Utilizador não encontrado]"
 
@@ -1714,12 +1715,12 @@ msgstr "[Utilizador n
 msgid "too many entries in unk cache - disabled\n"
 msgstr "entradas demais no cache unk - desactivado\n"
 
-#: g10/getkey.c:2207
+#: g10/getkey.c:2196
 #, 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:2249 g10/trustdb.c:577
+#: g10/getkey.c:2238 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"
@@ -2303,7 +2304,7 @@ msgstr "lista prefer
 #: g10/keyedit.c:607
 #, fuzzy
 msgid "showpref"
-msgstr "pref"
+msgstr "showpref"
 
 #: g10/keyedit.c:608
 msgid "passwd"
@@ -2741,7 +2742,7 @@ msgstr "vari
 msgid "can't connect to `%s': %s\n"
 msgstr "impossível ligar a `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:576
+#: g10/passphrase.c:313 g10/passphrase.c:580
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID principal da chave %08lX)"
@@ -2779,12 +2780,12 @@ msgstr "resposta do agente inv
 msgid "cancelled by user\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: g10/passphrase.c:408 g10/passphrase.c:477
+#: g10/passphrase.c:408 g10/passphrase.c:481
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
-#: g10/passphrase.c:562
+#: g10/passphrase.c:566
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2794,20 +2795,20 @@ msgstr ""
 "Você precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "utilizador: \""
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:575
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:609
+#: g10/passphrase.c:613
 msgid "can't query password in batchmode\n"
 msgstr "impossível pedir senha em modo não-interactivo\n"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:617
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:621
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 

po/sv.po

@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1e\n"
-"POT-Creation-Date: 2001-04-29 16:39+0200\n"
+"POT-Creation-Date: 2001-05-28 09:05+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"
@@ -21,15 +21,15 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:79
+#: util/secmem.c:84
 msgid "Warning: using insecure memory!\n"
 msgstr "Varning: använder osäkert minne!\n"
 
-#: util/secmem.c:299
+#: util/secmem.c:304
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operationen är ej möjlig utan tillgång till säkert minne\n"
 
-#: util/secmem.c:300
+#: util/secmem.c:305
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan ha använt fel program för denna uppgift)\n"
 
@@ -614,7 +614,7 @@ msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
 #: g10/g10.c:310
-msgid "|KEYID|ulimately trust this key"
+msgid "|KEYID|ultimately trust this key"
 msgstr ""
 
 #: g10/g10.c:311
@@ -863,7 +863,7 @@ msgstr "--delete-key anv
 #: g10/g10.c:1305
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
-msgstr "--delete-secret-key användaridentitet"
+msgstr "--delete-secret-and-public-key användaridentitet"
 
 # Filnamn både med och utan fnuttar finns. lite ologiskt. Vill någon
 # fixa en patch?
@@ -1721,21 +1721,21 @@ msgstr "f
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2536
+#: g10/getkey.c:249 g10/getkey.c:2525
 #, fuzzy
 msgid "[User id not found]"
-msgstr "%s: hittade inte användaren\n"
+msgstr "[hittade inte användaren]"
 
 #: g10/getkey.c:453
 msgid "too many entries in unk cache - disabled\n"
 msgstr "för många poster i unk-cachen - inaktiverad\n"
 
-#: g10/getkey.c:2207
+#: g10/getkey.c:2196
 #, 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:2249 g10/trustdb.c:577
+#: g10/getkey.c:2238 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"
@@ -2321,7 +2321,7 @@ msgstr "skriv ut inst
 #: g10/keyedit.c:607
 #, fuzzy
 msgid "showpref"
-msgstr "pref"
+msgstr "showpref"
 
 #: g10/keyedit.c:608
 msgid "passwd"
@@ -2486,12 +2486,12 @@ msgstr "Denna nyckel har deaktiverats"
 #: g10/keyedit.c:1173
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
-msgstr "nyckeln %08lX: en undernyckel har återkallats!\n"
+msgstr "rev! en undernyckel har återkallats: %s\n"
 
 #: g10/keyedit.c:1176
 #, fuzzy
 msgid "rev- faked revocation found\n"
-msgstr "     nya återkallelser av nycklar: %lu\n"
+msgstr "rev- fel återkallelser av nycklar\n"
 
 #: g10/keyedit.c:1178
 #, c-format
@@ -2775,7 +2775,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "kan inte ansluta till \"%s\": %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:576
+#: g10/passphrase.c:313 g10/passphrase.c:580
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (huvudnyckelns identitet %08lX)"
@@ -2789,7 +2789,8 @@ msgid ""
 msgstr ""
 "\n"
 "Du behöver en lösenordsfras för att låsa upp den hemliga nyckeln för\n"
-"användaren: \""
+"användaren: \"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
 
 #: g10/passphrase.c:344
 #, fuzzy
@@ -2813,12 +2814,12 @@ msgstr ""
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:408 g10/passphrase.c:477
+#: g10/passphrase.c:408 g10/passphrase.c:481
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:562
+#: g10/passphrase.c:566
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2828,20 +2829,20 @@ msgstr ""
 "Du behöver en lösenordsfras för att låsa upp den hemliga nyckeln för\n"
 "användaren: \""
 
-#: g10/passphrase.c:571
+#: g10/passphrase.c:575
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bits  %s-nyckel, ID %08lX, skapad %s"
 
-#: g10/passphrase.c:609
+#: g10/passphrase.c:613
 msgid "can't query password in batchmode\n"
 msgstr "kan inte fråga efter lösenord i batch-läge\n"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:617
 msgid "Enter passphrase: "
 msgstr "Ange lösenordsfras: "
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:621
 msgid "Repeat passphrase: "
 msgstr "Repetera lösenordsfrasen: "
 
@@ -2864,7 +2865,7 @@ msgstr "l
 #: g10/plaintext.c:391
 #, fuzzy
 msgid "no signed data\n"
-msgstr "kan inte öppna signerad data \"%s\"\n"
+msgstr "ingen signerad data\n"
 
 #: g10/plaintext.c:399
 #, c-format
@@ -2975,7 +2976,7 @@ msgstr "den publika nyckeln
 #: g10/sig-check.c:328
 #, fuzzy, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
-msgstr "NOTERA: signaturnyckeln är för gammal, gick ut vid %s\n"
+msgstr "NOTERA: signaturnyckeln är %08lX för gammal, gick ut vid %s\n"
 
 #: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
@@ -3490,7 +3491,7 @@ msgstr ""
 #: g10/skclist.c:138
 #, fuzzy, c-format
 msgid "skipped `%s': duplicated\n"
-msgstr "hoppade över \"%s\": %s\n"
+msgstr "hoppade över \"%s\": dubblett\n"
 
 #: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
@@ -3500,7 +3501,7 @@ msgstr "hoppade
 #: g10/skclist.c:149
 #, fuzzy
 msgid "skipped: secret key already present\n"
-msgstr "%s: hoppade över: publik nyckel finns redan\n"
+msgstr "hoppade över: publik nyckel finns redan\n"
 
 #: g10/skclist.c:160
 #, c-format
@@ -3902,8 +3903,8 @@ msgstr "Det finns ingen hj
 
 # maila gnupg-bugs om konstigt felmeddelande, man skapar nycklar i pluralis
 #~ msgid ""
-#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "RSA keys are deprecated; please consider creating a new key and use this "
-#~ "in the future\n"
+#~ "key in the future\n"
 #~ msgstr ""
-#~ "RSA-nycklar är förlegade; överväg att skapa nya nycklar och använd dessa i "
+#~ "RSA-nycklar är förlegade; överväg att skapa nya nycklar och använd dessa "
-#~ "framtiden\n"
+#~ "i framtiden\n"

scripts/mk-w32-dist

@@ -28,7 +28,7 @@ fi
 
 rm * || true
 ln ../g10/gpg gpg.exe
-i386--mingw32-strip gpg.exe
+mingw32 strip gpg.exe
 if [ -f ../doc/gpg.man ] ; then
   sed `printf "s/\b.//g"` ../doc/gpg.man >gpg.man
 else
@@ -41,6 +41,8 @@ cp ${srcdir}/COPYING .
 todos COPYING
 ln ${srcdir}/doc/README.W32 .
 todos README.W32
+ln ${srcdir}/doc/FAQ .
+todos FAQ
 for i in ${srcdir}/po/*.gmo; do ln $i "$(basename $i .gmo).mo" ; done
 zip "gnupg-w32-$(cat ${srcdir}/VERSION).zip" *