[svn] GnuPG - r4910 - in trunk: . g10 jnlib po scripts
svn author wk
cvs at cvs.gnupg.org
Thu Jan 8 16:48:52 CET 2009
Author: wk
Date: 2009-01-08 16:48:51 +0100 (Thu, 08 Jan 2009)
New Revision: 4910
Modified:
trunk/NEWS
trunk/g10/ChangeLog
trunk/g10/cpr.c
trunk/g10/keygen.c
trunk/g10/misc.c
trunk/jnlib/argparse.c
trunk/po/ChangeLog
trunk/po/es.po
trunk/scripts/mail-to-translators
Log:
Update spanish translation.
Cleanups.
Allow utf-8 in email addresses.
Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog 2009-01-05 19:56:52 UTC (rev 4909)
+++ trunk/g10/ChangeLog 2009-01-08 15:48:51 UTC (rev 4910)
@@ -1,3 +1,9 @@
+2009-01-08 Werner Koch <wk at 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 at g10code.com>
* passphrase.c (passphrase_get): Write a STATUS_ERROR.
Modified: trunk/po/ChangeLog
===================================================================
--- trunk/po/ChangeLog 2009-01-05 19:56:52 UTC (rev 4909)
+++ trunk/po/ChangeLog 2009-01-08 15:48:51 UTC (rev 4910)
@@ -1,3 +1,7 @@
+2009-01-07 Jaime Suárez <jsuarez at mundocripto.com> (wk)
+
+ * es.po: Update.
+
2009-01-05 Nilgün Belma Bugüner <nilgun at belgeler.gen.tr> (wk)
* tr.po: Update.
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2009-01-05 19:56:52 UTC (rev 4909)
+++ trunk/NEWS 2009-01-08 15:48:51 UTC (rev 4910)
@@ -649,7 +649,7 @@
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
unlimited permission to copy and/or distribute it, with or without
Modified: trunk/g10/cpr.c
===================================================================
--- trunk/g10/cpr.c 2009-01-05 19:56:52 UTC (rev 4909)
+++ trunk/g10/cpr.c 2009-01-08 15:48:51 UTC (rev 4910)
@@ -357,10 +357,6 @@
{
if( opt.command_fd != -1 )
return 1;
-#ifdef USE_SHM_COPROCESSING
- if( opt.shm_coprocess )
- return 1;
-#endif
return 0;
}
@@ -371,10 +367,6 @@
if( opt.command_fd != -1 )
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(;;) {
p = tty_get( prompt );
return p;
@@ -388,10 +380,6 @@
if( opt.command_fd != -1 )
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(;;) {
p = tty_get( prompt );
if( *p=='?' && !p[1] && !(keyword && !*keyword)) {
@@ -424,10 +412,6 @@
if( opt.command_fd != -1 )
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(;;) {
p = tty_get_hidden( prompt );
if( *p == '?' && !p[1] ) {
@@ -444,10 +428,6 @@
{
if( opt.command_fd != -1 )
return;
-#ifdef USE_SHM_COPROCESSING
- if( opt.shm_coprocess )
- return;
-#endif
tty_kill_prompt();
return;
}
@@ -460,10 +440,6 @@
if( opt.command_fd != -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(;;) {
p = tty_get( prompt );
trim_spaces(p); /* it is okay to do this here */
@@ -488,10 +464,6 @@
if( opt.command_fd != -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(;;) {
p = tty_get( prompt );
trim_spaces(p); /* it is okay to do this here */
@@ -520,10 +492,6 @@
if( opt.command_fd != -1 )
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)
{
Modified: trunk/g10/keygen.c
===================================================================
--- trunk/g10/keygen.c 2009-01-05 19:56:52 UTC (rev 4909)
+++ trunk/g10/keygen.c 2009-01-08 15:48:51 UTC (rev 4910)
@@ -1958,6 +1958,11 @@
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 =
N_("\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -1970,6 +1975,10 @@
the old info text. gettext has no way to tell whether
a translation is actually available, thus we need to
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"
"You need a user ID to identify your key; "
"the software constructs the user ID\n"
Modified: trunk/g10/misc.c
===================================================================
--- trunk/g10/misc.c 2009-01-05 19:56:52 UTC (rev 4909)
+++ trunk/g10/misc.c 2009-01-08 15:48:51 UTC (rev 4910)
@@ -1248,6 +1248,17 @@
}
+/* 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
has_invalid_email_chars (const char *s)
{
@@ -1257,8 +1268,8 @@
for ( ; *s; s++ )
{
- if ( *s & 0x80 )
- return 1;
+ if ( (*s & 0x80) )
+ continue; /* We only care about ASCII. */
if ( *s == '@' )
at_seen=1;
else if ( !at_seen && !( !!strchr( valid_chars, *s ) || *s == '+' ) )
Modified: trunk/jnlib/argparse.c
===================================================================
--- trunk/jnlib/argparse.c 2009-01-05 19:56:52 UTC (rev 4909)
+++ trunk/jnlib/argparse.c 2009-01-08 15:48:51 UTC (rev 4910)
@@ -1107,7 +1107,7 @@
break;
case 11: p = "foo"; 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 =
"This is free software: you are free to change and redistribute it.\n"
"There is NO WARRANTY, to the extent permitted by law.\n";
Modified: trunk/po/es.po [not shown]
Modified: trunk/scripts/mail-to-translators
===================================================================
--- trunk/scripts/mail-to-translators 2009-01-05 19:56:52 UTC (rev 4909)
+++ trunk/scripts/mail-to-translators 2009-01-08 15:48:51 UTC (rev 4910)
@@ -5,6 +5,9 @@
# remove the colon to armor this script.
SENDMAIL=": /usr/sbin/sendmail"
+LC_ALL=C
+LC_CTYPE=C
+
for file in *.po; do
addr=$(head -100 $file | awk '/^# ?Designated-Translator:/ { printf "%s", $0; exit 0}' | sed 's/.*\(<.*>\).*/\1/')
if [ -z "$addr" ]; then
More information about the Gnupg-commits
mailing list