security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-02 12:01:32 +01:00
Code Activity

Comment typ fixes.

Browse Source 
Workaround for bad translations of the capability menu.
This commit is contained in:
Werner Koch 2007-12-03 14:41:38 +00:00
parent bc15e25d7a
commit aa9aec7068
6 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
checks/ChangeLog
View File

@ -3,6 +3,11 @@
* defs.inc: Use new --list-config method to get cipher and digest * defs.inc: Use new --list-config method to get cipher and digest
names. names.
2007-11-22 Werner Koch <wk@g10code.com>
* Makefile.am (./gpg_dearmor): Add --homedir so that we don't
auto create a ~/.gnupg/. From Gentoo.
2007-07-18 David Shaw <dshaw@jabberwocky.com> 2007-07-18 David Shaw <dshaw@jabberwocky.com>
* defs.inc (all_hash_algos): See "all_cipher_algos", below. * defs.inc (all_hash_algos): See "all_cipher_algos", below.

2
checks/Makefile.am
View File

@ -58,7 +58,7 @@ prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \
./gpg_dearmor: ./gpg_dearmor:
echo '#!/bin/sh' >./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 --no-secmem-warning --batch --dearmor" >>./gpg_dearmor
chmod 755 ./gpg_dearmor chmod 755 ./gpg_dearmor

2
doc/gpg.texi
View File

@ -1141,7 +1141,7 @@ found.
Set the name of the native character set. This is used to convert 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. 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 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 this option is not used, the default character set is determined from
the current locale. A verbosity level of 3 shows the chosen set. the current locale. A verbosity level of 3 shows the chosen set.
Valid values for @code{name} are: Valid values for @code{name} are:

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2007-12-03 Werner Koch <wk@g10code.com>
* keygen.c (ask_key_flags): Add a translation remark and implement
a workaround.
2007-11-28 David Shaw <dshaw@jabberwocky.com> 2007-11-28 David Shaw <dshaw@jabberwocky.com>
* sig-check.c (do_check): Code to try both the incorrect and * sig-check.c (do_check): Code to try both the incorrect and

17
g10/keygen.c
View File

@ -1343,13 +1343,26 @@ print_key_flags(int flags)
static unsigned int static unsigned int
ask_key_flags(int algo,int subkey) 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"); const char *togglers=_("SsEeAaQq");
char *answer=NULL; char *answer=NULL;
unsigned int current=0; unsigned int current=0;
unsigned int possible=openpgp_pk_algo_usage(algo); unsigned int possible=openpgp_pk_algo_usage(algo);
if(strlen(togglers)!=8) if ( strlen(togglers) != 8 )
BUG(); {
tty_printf ("NOTE: Bad translation at %s:%d. "
"Please report.\n", __FILE__, __LINE__);
togglers = "11223300";
}
/* Only primary keys may certify. */ /* Only primary keys may certify. */
if(subkey) if(subkey)

2
util/assuan-util.c
View File

@ -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. */ printing. */
void void
_assuan_log_sanitized_string (const char *string) _assuan_log_sanitized_string (const char *string)