diff options
| -rw-r--r-- | g10/ChangeLog | 9 | ||||
| -rw-r--r-- | g10/keyserver.c | 4 | ||||
| -rw-r--r-- | g10/mainproc.c | 2 | ||||
| -rw-r--r-- | g10/pkclist.c | 2 | ||||
| -rw-r--r-- | scripts/w32installer.nsi | 2 |
5 files changed, 13 insertions, 6 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 1aad49789..44d5f447a 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +2005-12-08 Werner Koch <[email protected]> + + * keyserver.c (keyserver_fetch): Made strings translatable. + 2005-12-08 David Shaw <[email protected]> * 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 <[email protected]> + + * pkclist.c (do_we_trust): Add NOTREACHED comment. + 2005-11-20 David Shaw <[email protected]> * 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 <[email protected]> * gpgv.c (keyserver_import_fprint): New stub. diff --git a/g10/keyserver.c b/g10/keyserver.c index 47c03c97b..44e963cbd 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -1848,13 +1848,13 @@ keyserver_fetch(STRLIST urilist) 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; diff --git a/g10/mainproc.c b/g10/mainproc.c index 7c1392160..075dde1ce 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -62,7 +62,7 @@ struct mainproc_context { 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; diff --git a/g10/pkclist.c b/g10/pkclist.c index 6824b7097..0e2de2803 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -436,7 +436,7 @@ do_we_trust( PKT_public_key *pk, unsigned int trustlevel ) return 1; /* yes */ } - return 1; /* yes */ + return 1; /*NOTREACHED*/ } diff --git a/scripts/w32installer.nsi b/scripts/w32installer.nsi index 92bb2710c..4c0fa3882 100644 --- a/scripts/w32installer.nsi +++ b/scripts/w32installer.nsi @@ -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. ; |