[svn] GnuPG - r4919 - in trunk: common po

[svn author wk]

Author: wk
Date: 2009-01-19 17:15:30 +0100 (Mon, 19 Jan 2009)
New Revision: 4919

Modified:
   trunk/common/ChangeLog
   trunk/common/audit.c
   trunk/common/convert.c
   trunk/po/ChangeLog
   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:
Add a few translations to the audit-log.


Modified: trunk/common/ChangeLog
===================================================================
--- trunk/common/ChangeLog	2009-01-13 14:01:56 UTC (rev 4918)
+++ trunk/common/ChangeLog	2009-01-19 16:15:30 UTC (rev 4919)
@@ -1,3 +1,10 @@
+2009-01-19  Werner Koch  <wk at g10code.com>
+
+	* audit.c (writeout_li): Translate a few more result strings.
+	Fixes bug#970.
+
+	* convert.c (hex2str): Fix optimization to append a nul character.
+
 2008-12-05  Werner Koch  <wk at g10code.com>
 
 	* percent.c, t-percent.c: New.
@@ -1309,7 +1316,7 @@
 	
 	
  Copyright 2001, 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/po/ChangeLog
===================================================================
--- trunk/po/ChangeLog	2009-01-13 14:01:56 UTC (rev 4918)
+++ trunk/po/ChangeLog	2009-01-19 16:15:30 UTC (rev 4919)
@@ -1,3 +1,7 @@
+2009-01-19  Werner Koch  <wk at g10code.com>
+
+	* de.po: Translated a few new audit-log related strings.
+
 2009-01-12  Maxim Britov <maxim.britov at gmail.com>  (wk)
 
 	* ru.po: Update.

Modified: trunk/common/audit.c
===================================================================
--- trunk/common/audit.c	2009-01-13 14:01:56 UTC (rev 4918)
+++ trunk/common/audit.c	2009-01-19 16:15:30 UTC (rev 4919)
@@ -451,18 +451,42 @@
 
   if (ctx->use_html && format && oktext)
     {
-      if (!strcmp (oktext, "Yes"))
+      if (!strcmp (oktext, "Yes") 
+          || !strcmp (oktext, "good") )
         color = "green";
-      else if (!strcmp (oktext, "No"))
+      else if (!strcmp (oktext, "No")
+               || !strcmp (oktext, "bad") )
         color = "red";
     }
 
   if (format && oktext)
     {
+      const char *s = NULL;
+
       if (!strcmp (oktext, "Yes"))
         oktext = _("Yes");
       else if (!strcmp (oktext, "No"))
         oktext = _("No");
+      else if (!strcmp (oktext, "good"))
+        {
+          /* TRANSLATORS: Copy the prefix between the vertical bars
+             verbatim.  It will not be printed.  */
+          oktext = _("|audit-log-result|Good");
+        }
+      else if (!strcmp (oktext, "bad"))
+        oktext = _("|audit-log-result|Bad");
+      else if (!strcmp (oktext, "unsupported"))
+        oktext = _("|audit-log-result|Not supported");
+      else if (!strcmp (oktext, "no-cert"))
+        oktext = _("|audit-log-result|No certificate");
+      else if (!strcmp (oktext, "error"))
+        oktext = _("|audit-log-result|Error");
+      else
+        s = "";
+
+      /* If we have set a prefix, skip it.  */
+      if (!s && *oktext == '|' && (s=strchr (oktext+1,'|')))
+        oktext = s+1;
     }
 
   if (ctx->use_html)

Modified: trunk/common/convert.c
===================================================================
--- trunk/common/convert.c	2009-01-13 14:01:56 UTC (rev 4918)
+++ trunk/common/convert.c	2009-01-19 16:15:30 UTC (rev 4919)
@@ -194,7 +194,9 @@
     ;
   if (*s && (!isascii (*s) || !isspace (*s)) )
     return NULL;   /* Not followed by Nul or white space.  */
-  need_nul = !(s[-2] == '0' && s[-1] == '0');
+  /* We need to append a nul character.  However we don't want that if
+     the hexstring already ends with "00".  */
+  need_nul = ((s == hexstring) || !(s[-2] == '0' && s[-1] == '0'));
   if (need_nul)
     count++;
 

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]