[svn] GnuPG - r3960 - in trunk: g10 scripts

[svn author wk]

Author: wk
Date: 2005-12-08 08:42:41 +0100 (Thu, 08 Dec 2005)
New Revision: 3960

Modified:
   trunk/g10/ChangeLog
   trunk/g10/keyserver.c
   trunk/g10/mainproc.c
   trunk/g10/pkclist.c
   trunk/scripts/w32installer.nsi
Log:
Made strings translatable. Minor fixes.

Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2005-12-08 05:52:41 UTC (rev 3959)
+++ trunk/g10/ChangeLog	2005-12-08 07:42:41 UTC (rev 3960)
@@ -1,3 +1,7 @@
+2005-12-08  Werner Koch  <wk at g10code.com>
+
+	* keyserver.c (keyserver_fetch): Made strings translatable.
+
 2005-12-08  David Shaw  <dshaw at jabberwocky.com>
 
 	* options.h, keyserver.c (curl_cant_handle, keyserver_spawn,
@@ -15,6 +19,10 @@
 
 	* gpg.c (main): Call it from here for --fetch-keys.
 
+2005-12-07  Werner Koch  <wk at g10code.com>
+
+	* pkclist.c (do_we_trust): Add NOTREACHED comment.
+
 2005-11-20  David Shaw  <dshaw at jabberwocky.com>
 
 	* main.h, keylist.c (print_revokers): New.  Print the "rvk"
@@ -363,7 +371,6 @@
 	--passphrase command line option.  Only useful in very special
 	circumstances.
 
->>>>>>> .r3884
 2005-08-05  Werner Koch  <wk at g10code.com>
 
 	* gpgv.c (keyserver_import_fprint): New stub.

Modified: trunk/g10/keyserver.c
===================================================================
--- trunk/g10/keyserver.c	2005-12-08 05:52:41 UTC (rev 3959)
+++ trunk/g10/keyserver.c	2005-12-08 07:42:41 UTC (rev 3960)
@@ -1848,13 +1848,13 @@
 
 	  rc=keyserver_work(GET,NULL,&desc,1,spec);
 	  if(rc)
-	    log_info("WARNING: unable to fetch URI %s: %s\n",
+	    log_info (_("WARNING: unable to fetch URI %s: %s\n"),
 		     sl->d,g10_errstr(rc));
 
 	  free_keyserver_spec(spec);
 	}
       else
-	log_info("WARNING: unable to parse URI %s\n",sl->d);
+	log_info (_("WARNING: unable to parse URI %s\n"),sl->d);
     }
 
   return 0;

Modified: trunk/g10/mainproc.c
===================================================================
--- trunk/g10/mainproc.c	2005-12-08 05:52:41 UTC (rev 3959)
+++ trunk/g10/mainproc.c	2005-12-08 07:42:41 UTC (rev 3960)
@@ -62,7 +62,7 @@
     PKT_user_id     *last_user_id;
     md_filter_context_t mfx;
     int sigs_only;   /* process only signatures and reject all other stuff */
-    int encrypt_only; /* process only encrytion messages */
+    int encrypt_only; /* process only encryption messages */
     STRLIST signed_data;
     const char *sigfilename;
     DEK *dek;

Modified: trunk/g10/pkclist.c
===================================================================
--- trunk/g10/pkclist.c	2005-12-08 05:52:41 UTC (rev 3959)
+++ trunk/g10/pkclist.c	2005-12-08 07:42:41 UTC (rev 3960)
@@ -436,7 +436,7 @@
       return 1; /* yes */
     }
 
-  return 1; /* yes */
+  return 1; /*NOTREACHED*/
 }
 
 

Modified: trunk/scripts/w32installer.nsi
===================================================================
--- trunk/scripts/w32installer.nsi	2005-12-08 05:52:41 UTC (rev 3959)
+++ trunk/scripts/w32installer.nsi	2005-12-08 07:42:41 UTC (rev 3960)
@@ -1,4 +1,4 @@
-; w32installer.nsi                         -*- mode: lisp; coding: latin-1; -*-
+; w32installer.nsi                                  -*- coding: latin-1; -*-
 ;                   W32 Installer script
 ; Copyright (C) 2005 Free Software Foundation, Inc.
 ;