[svn] GnuPG - r5456 - in trunk: agent common po

[svn author wk]

Author: wk
Date: 2010-10-18 16:56:52 +0200 (Mon, 18 Oct 2010)
New Revision: 5456

Modified:
   trunk/agent/ChangeLog
   trunk/agent/call-pinentry.c
   trunk/common/asshelp.c
   trunk/po/ChangeLog
   trunk/po/LINGUAS
   trunk/po/POTFILES.in
   trunk/po/de.po
Log:
Re-enabled german translation


Modified: trunk/agent/ChangeLog
===================================================================
--- trunk/agent/ChangeLog	2010-10-18 13:54:42 UTC (rev 5455)
+++ trunk/agent/ChangeLog	2010-10-18 14:56:52 UTC (rev 5456)
@@ -1,5 +1,8 @@
 2010-10-18  Werner Koch  <wk at g10code.com>
 
+	* call-pinentry.c (start_pinentry): Print name of pinentry on
+	connect error.
+
 	* call-scd.c (agent_card_pksign): Make sure to return an unsigned
 	number.
 

Modified: trunk/po/ChangeLog
===================================================================
--- trunk/po/ChangeLog	2010-10-18 13:54:42 UTC (rev 5455)
+++ trunk/po/ChangeLog	2010-10-18 14:56:52 UTC (rev 5456)
@@ -1,3 +1,11 @@
+2010-10-18  Werner Koch  <wk at g10code.com>
+
+	* de.po: Update.
+
+	* POTFILES.in: Add cvt-openpgp.c
+
+	* LINGUAS: Re-enable de.po.
+
 2010-04-13  Marcus Brinkmann  <marcus at g10code.de>
 
 	* POTFILES.in: Replace common/exechelp.c by

Modified: trunk/agent/call-pinentry.c
===================================================================
--- trunk/agent/call-pinentry.c	2010-10-18 13:54:42 UTC (rev 5455)
+++ trunk/agent/call-pinentry.c	2010-10-18 14:56:52 UTC (rev 5456)
@@ -332,8 +332,8 @@
 			    ASSUAN_PIPE_CONNECT_DETACHED);
   if (rc)
     {
-      log_error ("can't connect to the PIN entry module: %s\n",
-                 gpg_strerror (rc));
+      log_error ("can't connect to the PIN entry module `%s': %s\n",
+                 opt.pinentry_program, gpg_strerror (rc));
       assuan_release (ctx);
       return unlock_pinentry (gpg_error (GPG_ERR_NO_PIN_ENTRY));
     }

Modified: trunk/common/asshelp.c
===================================================================
--- trunk/common/asshelp.c	2010-10-18 13:54:42 UTC (rev 5455)
+++ trunk/common/asshelp.c	2010-10-18 14:56:52 UTC (rev 5456)
@@ -366,8 +366,8 @@
             agent_program = gnupg_module_name (GNUPG_MODULE_NAME_AGENT);
 
           if (verbose)
-            log_info (_("no running %s - starting `%s'\n"),
-                      "gpg-agent",  agent_program);
+            log_info (_("no running gpg-agent - starting `%s'\n"),
+                      agent_program);
           
           if (status_cb)
             status_cb (status_cb_arg, STATUS_PROGRESS, 
@@ -579,8 +579,8 @@
         dirmngr_program = gnupg_module_name (GNUPG_MODULE_NAME_DIRMNGR);
 
       if (verbose)
-        log_info (_("no running %s - starting `%s'\n"),
-                  "dirmngr", dirmngr_program);
+        log_info (_("no running Dirmngr - starting `%s'\n"),
+                  dirmngr_program);
           
       if (status_cb)
         status_cb (status_cb_arg, STATUS_PROGRESS, 

Modified: trunk/po/LINGUAS
===================================================================
--- trunk/po/LINGUAS	2010-10-18 13:54:42 UTC (rev 5455)
+++ trunk/po/LINGUAS	2010-10-18 14:56:52 UTC (rev 5456)
@@ -4,7 +4,7 @@
 #ca
 #cs
 #da
-#de
+de
 #eo
 #el
 #es

Modified: trunk/po/POTFILES.in
===================================================================
--- trunk/po/POTFILES.in	2010-10-18 13:54:42 UTC (rev 5455)
+++ trunk/po/POTFILES.in	2010-10-18 14:56:52 UTC (rev 5456)
@@ -10,6 +10,7 @@
 agent/trustlist.c
 agent/findkey.c
 agent/pksign.c
+agent/cvt-openpgp.c
 
 common/exechelp-posix.c
 common/exechelp-w32.c

Modified: trunk/po/de.po  [not shown]