[svn] GnuPG - r4775 - in trunk: agent doc g10 po
svn author wk
cvs at cvs.gnupg.org
Sun Jun 1 21:44:25 CEST 2008
Author: wk
Date: 2008-06-01 21:44:05 +0200 (Sun, 01 Jun 2008)
New Revision: 4775
Modified:
trunk/agent/ChangeLog
trunk/doc/a-decade-of-gnupg.txt
trunk/doc/help.de.txt
trunk/doc/help.txt
trunk/g10/ChangeLog
trunk/g10/keygen.c
trunk/po/be.po
trunk/po/ca.po
trunk/po/cs.po
trunk/po/da.po
trunk/po/de.po
trunk/po/el.po
trunk/po/eo.po
trunk/po/es.po
trunk/po/et.po
trunk/po/fi.po
trunk/po/fr.po
trunk/po/gl.po
trunk/po/hu.po
trunk/po/id.po
trunk/po/it.po
trunk/po/ja.po
trunk/po/nb.po
trunk/po/pl.po
trunk/po/pt.po
trunk/po/pt_BR.po
trunk/po/ro.po
trunk/po/ru.po
trunk/po/sk.po
trunk/po/sv.po
trunk/po/tr.po
trunk/po/zh_CN.po
trunk/po/zh_TW.po
Log:
Changes the header presented before requesting the user ID.
Modified: trunk/agent/ChangeLog
===================================================================
--- trunk/agent/ChangeLog 2008-05-28 10:08:37 UTC (rev 4774)
+++ trunk/agent/ChangeLog 2008-06-01 19:44:05 UTC (rev 4775)
@@ -1,7 +1,7 @@
2008-05-27 Werner Koch <wk at g10code.com>
- * trustlist.c (insert_colons): Fix stupidly wrong allocation
- computation.
+ * trustlist.c (insert_colons): Fix stupidly wrong allocation size
+ computation.
2008-05-26 Werner Koch <wk at g10code.com>
Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog 2008-05-28 10:08:37 UTC (rev 4774)
+++ trunk/g10/ChangeLog 2008-06-01 19:44:05 UTC (rev 4775)
@@ -1,3 +1,9 @@
+2008-05-31 Werner Koch <wk at g10code.com>
+
+ * keygen.c (ask_user_id): Change the string printed as header of
+ the user ID generation. Use code to not break existing
+ translations. Suggested by Eric Tetz.
+
2008-05-08 Werner Koch <wk at g10code.com>
* sig-check.c (do_check_messages): Print a revocation diagnostic
Modified: trunk/doc/a-decade-of-gnupg.txt
===================================================================
--- trunk/doc/a-decade-of-gnupg.txt 2008-05-28 10:08:37 UTC (rev 4774)
+++ trunk/doc/a-decade-of-gnupg.txt 2008-06-01 19:44:05 UTC (rev 4775)
@@ -196,3 +196,23 @@
[8] http://partners.nytimes.com/library/tech/99/11/cyber/articles/19encrypt.html
[9] http://www.heise.de/tp/r4/artikel/5/5124/1.html
+=== Remarks ===
+
+In a reply to this mail Alan Olsen remakrked on the ML:
+
+ MIT was forced to use the RSAREF library which had a non free
+ license. At first they used the RSAREF2 library, but then they were
+ told to use the RSAREF1 library. (I diffed the two libraries and
+ determined that the only difference was that RSAREF2 had fixed a
+ number of buffer overflows and other security flaws. There were no
+ added features.)
+
+ If I remember correctly, 2.5 had RSAREF2 and 2.6 had RSAREF1. One
+ of the main reasons for the creation of the "International version"
+ was the use of RSAREF. (Besides the security issues, it was pretty
+ damn slow. In the days of the i386 people cared about speed.)
+
+Jaime Suarez translated the text in his blog, see
+
+ http://wordpress.mundocripto.com
+
Modified: trunk/doc/help.de.txt
===================================================================
--- trunk/doc/help.de.txt 2008-05-28 10:08:37 UTC (rev 4774)
+++ trunk/doc/help.de.txt 2008-06-01 19:44:05 UTC (rev 4775)
@@ -102,16 +102,18 @@
.
.gpg.keygen.name
-Geben Sie den Namen des Schlüsselinhabers ein
+Geben Sie den Namen des Schlüsselinhabers ein.
+Beispiel: Heinrich Heine.
.
.gpg.keygen.email
Geben Sie eine Email-Adresse ein. Dies ist zwar nicht unbedingt notwendig,
aber sehr empfehlenswert.
+Beispiel: heinrichh at duesseldorf.de
.
.gpg.keygen.comment
-Geben Sie - bei Bedarf - einen Kommentar ein
+Geben Sie - bei Bedarf - einen Kommentar ein.
.
.gpg.keygen.userid.cmd
Modified: trunk/doc/help.txt
===================================================================
--- trunk/doc/help.txt 2008-05-28 10:08:37 UTC (rev 4774)
+++ trunk/doc/help.txt 2008-06-01 19:44:05 UTC (rev 4775)
@@ -161,16 +161,19 @@
.gpg.keygen.name
-Enter the name of the key holder.
+Enter the name of the key holder.
+Example: Heinrich Heine
.
.gpg.keygen.email
Please enter an optional but highly suggested email address.
+Example: heinrichh at duesseldorf.de
.
.gpg.keygen.comment
Please enter an optional comment.
+In general there is no need for a comment.
.
Modified: trunk/g10/keygen.c
===================================================================
--- trunk/g10/keygen.c 2008-05-28 10:08:37 UTC (rev 4774)
+++ trunk/g10/keygen.c 2008-06-01 19:44:05 UTC (rev 4775)
@@ -1941,12 +1941,31 @@
char *answer;
char *aname, *acomment, *amail, *uid;
- if( !mode )
- tty_printf( _("\n"
+ if ( !mode )
+ {
+ const char *s1 =
+ N_("\n"
+ "GnuPG needs to construct a user ID to identify your key.\n"
+ "\n");
+ const char *s2 = _(s1);
+
+ if (!strcmp (s1, s2))
+ {
+ /* There is no translation for the string thus we to use
+ the old info text. gettext has no way to tell whether
+ a translation is actually available, thus we need to
+ to compare again. */
+ const char *s3 = N_("\n"
"You need a user ID to identify your key; "
"the software constructs the user ID\n"
"from the Real Name, Comment and Email Address in this form:\n"
-" \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n\n") );
+" \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n\n");
+ const char *s4 = _(s3);
+ if (strcmp (s3, s4))
+ s2 = s3; /* A translation exists - use it. */
+ }
+ tty_printf ("%s", s2) ;
+ }
uid = aname = acomment = amail = NULL;
for(;;) {
char *p;
Modified: trunk/po/be.po [not shown]
Modified: trunk/po/ca.po [not shown]
Modified: trunk/po/cs.po [not shown]
Modified: trunk/po/da.po [not shown]
Modified: trunk/po/de.po [not shown]
Modified: trunk/po/el.po [not shown]
Modified: trunk/po/eo.po [not shown]
Modified: trunk/po/es.po [not shown]
Modified: trunk/po/et.po [not shown]
Modified: trunk/po/fi.po [not shown]
Modified: trunk/po/fr.po [not shown]
Modified: trunk/po/gl.po [not shown]
Modified: trunk/po/hu.po [not shown]
Modified: trunk/po/id.po [not shown]
Modified: trunk/po/it.po [not shown]
Modified: trunk/po/ja.po [not shown]
Modified: trunk/po/nb.po [not shown]
Modified: trunk/po/pl.po [not shown]
Modified: trunk/po/pt.po [not shown]
Modified: trunk/po/pt_BR.po [not shown]
Modified: trunk/po/ro.po [not shown]
Modified: trunk/po/ru.po [not shown]
Modified: trunk/po/sk.po [not shown]
Modified: trunk/po/sv.po [not shown]
Modified: trunk/po/tr.po [not shown]
Modified: trunk/po/zh_CN.po [not shown]
Modified: trunk/po/zh_TW.po [not shown]
More information about the Gnupg-commits
mailing list