From aa9aec7068ddd0bd52a697f7de582530753dcde9 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 3 Dec 2007 14:41:38 +0000 Subject: [PATCH] Comment typ fixes. Workaround for bad translations of the capability menu. --- checks/ChangeLog | 5 +++++ checks/Makefile.am | 2 +- doc/gpg.texi | 2 +- g10/ChangeLog | 5 +++++ g10/keygen.c | 17 +++++++++++++++-- util/assuan-util.c | 2 +- 6 files changed, 28 insertions(+), 5 deletions(-) diff --git a/checks/ChangeLog b/checks/ChangeLog index a61cf104d..8e7166b71 100644 --- a/checks/ChangeLog +++ b/checks/ChangeLog @@ -3,6 +3,11 @@ * defs.inc: Use new --list-config method to get cipher and digest names. +2007-11-22 Werner Koch + + * Makefile.am (./gpg_dearmor): Add --homedir so that we don't + auto create a ~/.gnupg/. From Gentoo. + 2007-07-18 David Shaw * defs.inc (all_hash_algos): See "all_cipher_algos", below. diff --git a/checks/Makefile.am b/checks/Makefile.am index 70ae58b0b..92f1e183c 100644 --- a/checks/Makefile.am +++ b/checks/Makefile.am @@ -58,7 +58,7 @@ prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \ ./gpg_dearmor: echo '#!/bin/sh' >./gpg_dearmor - echo "../g10/gpg --no-options --no-greeting \ + echo "../g10/gpg --no-options --no-greeting --homedir . \ --no-secmem-warning --batch --dearmor" >>./gpg_dearmor chmod 755 ./gpg_dearmor diff --git a/doc/gpg.texi b/doc/gpg.texi index 9667417b8..8628282c9 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -1141,7 +1141,7 @@ found. Set the name of the native character set. This is used to convert some informational strings like user IDs to the proper UTF-8 encoding. Note that this has nothing to do with the character set of data to be -encrypted or signed; GnuPG does not recode user supplied data. If +encrypted or signed; GnuPG does not recode user-supplied data. If this option is not used, the default character set is determined from the current locale. A verbosity level of 3 shows the chosen set. Valid values for @code{name} are: diff --git a/g10/ChangeLog b/g10/ChangeLog index 9f63972f9..474f2cded 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2007-12-03 Werner Koch + + * keygen.c (ask_key_flags): Add a translation remark and implement + a workaround. + 2007-11-28 David Shaw * sig-check.c (do_check): Code to try both the incorrect and diff --git a/g10/keygen.c b/g10/keygen.c index 64c075065..a74c9a2f2 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -1343,13 +1343,26 @@ print_key_flags(int flags) static unsigned int ask_key_flags(int algo,int subkey) { + /* TRANSLATORS: Please use only plain ASCII characters for the + translation. If this is not possible use single digits. Here is + a description of the fucntions: + + s = Toggle signing capability + e = Toggle encryption capability + a = Toggle authentication capability + q = Finish + */ const char *togglers=_("SsEeAaQq"); char *answer=NULL; unsigned int current=0; unsigned int possible=openpgp_pk_algo_usage(algo); - if(strlen(togglers)!=8) - BUG(); + if ( strlen(togglers) != 8 ) + { + tty_printf ("NOTE: Bad translation at %s:%d. " + "Please report.\n", __FILE__, __LINE__); + togglers = "11223300"; + } /* Only primary keys may certify. */ if(subkey) diff --git a/util/assuan-util.c b/util/assuan-util.c index 72558210e..12f2b0253 100644 --- a/util/assuan-util.c +++ b/util/assuan-util.c @@ -112,7 +112,7 @@ _assuan_log_print_buffer (FILE *fp, const void *buffer, size_t length) } } -/* Log a user supplied string. Escapes non-printable before +/* Log a user-supplied string. Escapes non-printable before printing. */ void _assuan_log_sanitized_string (const char *string)