[svn] GnuPG - r4637 - in branches/STABLE-BRANCH-1-4: checks doc g10 util

[svn author wk]

Author: wk
Date: 2007-12-03 15:41:38 +0100 (Mon, 03 Dec 2007)
New Revision: 4637

Modified:
   branches/STABLE-BRANCH-1-4/checks/ChangeLog
   branches/STABLE-BRANCH-1-4/checks/Makefile.am
   branches/STABLE-BRANCH-1-4/doc/gpg.texi
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/keygen.c
   branches/STABLE-BRANCH-1-4/util/assuan-util.c
Log:
Comment typ fixes.
Workaround for bad translations of the capability menu.


Modified: branches/STABLE-BRANCH-1-4/checks/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/checks/ChangeLog	2007-12-03 14:18:22 UTC (rev 4636)
+++ branches/STABLE-BRANCH-1-4/checks/ChangeLog	2007-12-03 14:41:38 UTC (rev 4637)
@@ -3,6 +3,11 @@
 	* defs.inc: Use new --list-config method to get cipher and digest
 	names.
 
+2007-11-22  Werner Koch  <wk at 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 at jabberwocky.com>
 
 	* defs.inc (all_hash_algos): See "all_cipher_algos", below.

Modified: branches/STABLE-BRANCH-1-4/checks/Makefile.am
===================================================================
--- branches/STABLE-BRANCH-1-4/checks/Makefile.am	2007-12-03 14:18:22 UTC (rev 4636)
+++ branches/STABLE-BRANCH-1-4/checks/Makefile.am	2007-12-03 14:41:38 UTC (rev 4637)
@@ -58,7 +58,7 @@
 
 ./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
 

Modified: branches/STABLE-BRANCH-1-4/doc/gpg.texi
===================================================================
--- branches/STABLE-BRANCH-1-4/doc/gpg.texi	2007-12-03 14:18:22 UTC (rev 4636)
+++ branches/STABLE-BRANCH-1-4/doc/gpg.texi	2007-12-03 14:41:38 UTC (rev 4637)
@@ -1141,7 +1141,7 @@
 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:

Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2007-12-03 14:18:22 UTC (rev 4636)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2007-12-03 14:41:38 UTC (rev 4637)
@@ -1,3 +1,8 @@
+2007-12-03  Werner Koch  <wk at g10code.com>
+
+	* keygen.c (ask_key_flags): Add a translation remark and implement
+	a workaround.
+
 2007-11-28  David Shaw  <dshaw at jabberwocky.com>
 
 	* sig-check.c (do_check): Code to try both the incorrect and

Modified: branches/STABLE-BRANCH-1-4/g10/keygen.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/keygen.c	2007-12-03 14:18:22 UTC (rev 4636)
+++ branches/STABLE-BRANCH-1-4/g10/keygen.c	2007-12-03 14:41:38 UTC (rev 4637)
@@ -1343,13 +1343,26 @@
 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)

Modified: branches/STABLE-BRANCH-1-4/util/assuan-util.c
===================================================================
--- branches/STABLE-BRANCH-1-4/util/assuan-util.c	2007-12-03 14:18:22 UTC (rev 4636)
+++ branches/STABLE-BRANCH-1-4/util/assuan-util.c	2007-12-03 14:41:38 UTC (rev 4637)
@@ -112,7 +112,7 @@
     }
 }
 
-/* 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)