1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00

Update spanish translation.

Cleanups.
Allow utf-8 in email addresses.
This commit is contained in:
Werner Koch 2009-01-08 15:48:51 +00:00
parent 511c7a89fc
commit 82ab848ea4
9 changed files with 256 additions and 277 deletions

2
NEWS
View File

@ -649,7 +649,7 @@ Noteworthy changes in version 1.9.0 (2003-08-05)
Copyright 2002, 2003, 2004, 2005, 2006, 2007, Copyright 2002, 2003, 2004, 2005, 2006, 2007,
2008 Free Software Foundation, Inc. 2008, 2009 Free Software Foundation, Inc.
This file is free software; as a special exception the author gives This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without unlimited permission to copy and/or distribute it, with or without

View File

@ -1,3 +1,9 @@
2009-01-08 Werner Koch <wk@g10code.com>
* misc.c (has_invalid_email_chars): Let non-ascii pass through.
* cpr.c [USE_SHM_COPROCESSING]: Remove this code.
2008-12-12 Werner Koch <wk@g10code.com> 2008-12-12 Werner Koch <wk@g10code.com>
* passphrase.c (passphrase_get): Write a STATUS_ERROR. * passphrase.c (passphrase_get): Write a STATUS_ERROR.

View File

@ -357,10 +357,6 @@ cpr_enabled()
{ {
if( opt.command_fd != -1 ) if( opt.command_fd != -1 )
return 1; return 1;
#ifdef USE_SHM_COPROCESSING
if( opt.shm_coprocess )
return 1;
#endif
return 0; return 0;
} }
@ -371,10 +367,6 @@ cpr_get_no_help( const char *keyword, const char *prompt )
if( opt.command_fd != -1 ) if( opt.command_fd != -1 )
return do_get_from_fd ( keyword, 0, 0 ); return do_get_from_fd ( keyword, 0, 0 );
#ifdef USE_SHM_COPROCESSING
if( opt.shm_coprocess )
return do_shm_get( keyword, 0, 0 );
#endif
for(;;) { for(;;) {
p = tty_get( prompt ); p = tty_get( prompt );
return p; return p;
@ -388,10 +380,6 @@ cpr_get( const char *keyword, const char *prompt )
if( opt.command_fd != -1 ) if( opt.command_fd != -1 )
return do_get_from_fd ( keyword, 0, 0 ); return do_get_from_fd ( keyword, 0, 0 );
#ifdef USE_SHM_COPROCESSING
if( opt.shm_coprocess )
return do_shm_get( keyword, 0, 0 );
#endif
for(;;) { for(;;) {
p = tty_get( prompt ); p = tty_get( prompt );
if( *p=='?' && !p[1] && !(keyword && !*keyword)) { if( *p=='?' && !p[1] && !(keyword && !*keyword)) {
@ -424,10 +412,6 @@ cpr_get_hidden( const char *keyword, const char *prompt )
if( opt.command_fd != -1 ) if( opt.command_fd != -1 )
return do_get_from_fd ( keyword, 1, 0 ); return do_get_from_fd ( keyword, 1, 0 );
#ifdef USE_SHM_COPROCESSING
if( opt.shm_coprocess )
return do_shm_get( keyword, 1, 0 );
#endif
for(;;) { for(;;) {
p = tty_get_hidden( prompt ); p = tty_get_hidden( prompt );
if( *p == '?' && !p[1] ) { if( *p == '?' && !p[1] ) {
@ -444,10 +428,6 @@ cpr_kill_prompt(void)
{ {
if( opt.command_fd != -1 ) if( opt.command_fd != -1 )
return; return;
#ifdef USE_SHM_COPROCESSING
if( opt.shm_coprocess )
return;
#endif
tty_kill_prompt(); tty_kill_prompt();
return; return;
} }
@ -460,10 +440,6 @@ cpr_get_answer_is_yes( const char *keyword, const char *prompt )
if( opt.command_fd != -1 ) if( opt.command_fd != -1 )
return !!do_get_from_fd ( keyword, 0, 1 ); return !!do_get_from_fd ( keyword, 0, 1 );
#ifdef USE_SHM_COPROCESSING
if( opt.shm_coprocess )
return !!do_shm_get( keyword, 0, 1 );
#endif
for(;;) { for(;;) {
p = tty_get( prompt ); p = tty_get( prompt );
trim_spaces(p); /* it is okay to do this here */ trim_spaces(p); /* it is okay to do this here */
@ -488,10 +464,6 @@ cpr_get_answer_yes_no_quit( const char *keyword, const char *prompt )
if( opt.command_fd != -1 ) if( opt.command_fd != -1 )
return !!do_get_from_fd ( keyword, 0, 1 ); return !!do_get_from_fd ( keyword, 0, 1 );
#ifdef USE_SHM_COPROCESSING
if( opt.shm_coprocess )
return !!do_shm_get( keyword, 0, 1 );
#endif
for(;;) { for(;;) {
p = tty_get( prompt ); p = tty_get( prompt );
trim_spaces(p); /* it is okay to do this here */ trim_spaces(p); /* it is okay to do this here */
@ -520,10 +492,6 @@ cpr_get_answer_okay_cancel (const char *keyword,
if( opt.command_fd != -1 ) if( opt.command_fd != -1 )
answer = do_get_from_fd ( keyword, 0, 0 ); answer = do_get_from_fd ( keyword, 0, 0 );
#ifdef USE_SHM_COPROCESSING
else if( opt.shm_coprocess )
answer = do_shm_get( keyword, 0, 0 );
#endif
if (answer) if (answer)
{ {

View File

@ -1958,6 +1958,11 @@ ask_user_id( int mode )
if ( !mode ) if ( !mode )
{ {
/* TRANSLATORS: This is the new string telling the user what
gpg is now going to do (i.e. ask for the parts of the user
ID). Note that if you do not tyranslated this string, a
different string will be used used, which might still have
a correct transaltion. */
const char *s1 = const char *s1 =
N_("\n" N_("\n"
"GnuPG needs to construct a user ID to identify your key.\n" "GnuPG needs to construct a user ID to identify your key.\n"
@ -1970,6 +1975,10 @@ ask_user_id( int mode )
the old info text. gettext has no way to tell whether the old info text. gettext has no way to tell whether
a translation is actually available, thus we need to a translation is actually available, thus we need to
to compare again. */ to compare again. */
/* TRANSLATORS: This string is in general not anymore used
but you should keep your existing translation. In case
the new string is not translated this old string will
be used. */
const char *s3 = N_("\n" const char *s3 = N_("\n"
"You need a user ID to identify your key; " "You need a user ID to identify your key; "
"the software constructs the user ID\n" "the software constructs the user ID\n"

View File

@ -1248,6 +1248,17 @@ unescape_percent_string (const unsigned char *s)
} }
/* Check whether the string has characters not valid in an RFC822
address. To cope with OpenPGP we ignore allow non-ascii characters
so that for example umlauts are legal in an email address. An
OpenPGP user ID must be utf-8 encoded and tehre is no strict
requirement for RFC-822. Thus to avoid IDNA encoding we put the
address verbatim as utf-8 into the user ID under the assumtiopn
that mail programs etc handle IDNA at a lower level and take
OpenPGP user IDS as utf-8. Note that we can't do an utf-8 encoding
checking here becuase in keygen.c this function is called with the
native encoding and native to utf-8 encoding is done only after
checking. */
int int
has_invalid_email_chars (const char *s) has_invalid_email_chars (const char *s)
{ {
@ -1257,8 +1268,8 @@ has_invalid_email_chars (const char *s)
for ( ; *s; s++ ) for ( ; *s; s++ )
{ {
if ( *s & 0x80 ) if ( (*s & 0x80) )
return 1; continue; /* We only care about ASCII. */
if ( *s == '@' ) if ( *s == '@' )
at_seen=1; at_seen=1;
else if ( !at_seen && !( !!strchr( valid_chars, *s ) || *s == '+' ) ) else if ( !at_seen && !( !!strchr( valid_chars, *s ) || *s == '+' ) )

View File

@ -1107,7 +1107,7 @@ strusage( int level )
break; break;
case 11: p = "foo"; break; case 11: p = "foo"; break;
case 13: p = "0.0"; break; case 13: p = "0.0"; break;
case 14: p = "Copyright (C) 2008 Free Software Foundation, Inc."; break; case 14: p = "Copyright (C) 2009 Free Software Foundation, Inc."; break;
case 15: p = case 15: p =
"This is free software: you are free to change and redistribute it.\n" "This is free software: you are free to change and redistribute it.\n"
"There is NO WARRANTY, to the extent permitted by law.\n"; "There is NO WARRANTY, to the extent permitted by law.\n";

View File

@ -1,3 +1,7 @@
2009-01-07 Jaime Suárez <jsuarez@mundocripto.com> (wk)
* es.po: Update.
2009-01-05 Nilgün Belma Bugüner <nilgun@belgeler.gen.tr> (wk) 2009-01-05 Nilgün Belma Bugüner <nilgun@belgeler.gen.tr> (wk)
* tr.po: Update. * tr.po: Update.

458
po/es.po

File diff suppressed because it is too large Load Diff

View File

@ -5,6 +5,9 @@
# remove the colon to armor this script. # remove the colon to armor this script.
SENDMAIL=": /usr/sbin/sendmail" SENDMAIL=": /usr/sbin/sendmail"
LC_ALL=C
LC_CTYPE=C
for file in *.po; do for file in *.po; do
addr=$(head -100 $file | awk '/^# ?Designated-Translator:/ { printf "%s", $0; exit 0}' | sed 's/.*\(<.*>\).*/\1/') addr=$(head -100 $file | awk '/^# ?Designated-Translator:/ { printf "%s", $0; exit 0}' | sed 's/.*\(<.*>\).*/\1/')
if [ -z "$addr" ]; then if [ -z "$addr" ]; then