[git] GnuPG - branch, master, updated. gnupg-2.1.0-beta751-21-gcb12702

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  cb127024b9ca893f83bc26ebaa8769bf09c2fcff (commit)
       via  a57c33c855c6757c8770529ee71f0f90744cd7a6 (commit)
      from  1bde869d114bcf08e6972a2f93c2664684ab8721 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cb127024b9ca893f83bc26ebaa8769bf09c2fcff
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Aug 12 10:36:30 2014 +0200

    po: Remove extra LF from ja.po
    
    --

diff --git a/po/ja.po b/po/ja.po
index 3551b3e..69f152e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.1\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2014-08-07 10:06+0900\n"
+"PO-Revision-Date: 2014-08-12 16:21+0200\n"
 "Last-Translator: NIIBE Yutaka <gniibe at fsij.org>\n"
 "Language-Team: none\n"
 "Language: ja\n"
@@ -3080,7 +3080,7 @@ msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "\"%s\" はプライマリ・フィンガープリントではありません\n"
 
 msgid "No matching user IDs."
-msgstr "マッチするユーザIDはありません。\n"
+msgstr "マッチするユーザIDはありません。"
 
 msgid "Nothing to sign.\n"
 msgstr "署名するものがありません。\n"

commit a57c33c855c6757c8770529ee71f0f90744cd7a6
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Aug 12 10:36:30 2014 +0200

    gpg: Make --with-colons work again for --search-keys.
    
    * g10/keyserver.c (search_line_handler): Replace log_debug by
    es_printf.

diff --git a/g10/keyserver.c b/g10/keyserver.c
index ac70da9..4249caf 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -836,7 +836,7 @@ show_prompt (ctrl_t ctrl, KEYDB_SEARCH_DESC *desc, int numdesc,
    KS_SEARCH command.  If SPECIAL is 0, LINE is the actual data line
    received with all escaping removed and guaranteed to be exactly one
    line with stripped LF; an EOF is indicated by LINE passed as NULL.
-   If special is 1, the line conatins the source of the information
+   If special is 1, the line contains the source of the information
    (usually an URL).  LINE may be modified after return.  */
 static gpg_error_t
 search_line_handler (void *opaque, int special, char *line)
@@ -865,7 +865,7 @@ search_line_handler (void *opaque, int special, char *line)
   /* Print the received line.  */
   if (opt.with_colons && line)
     {
-      log_debug ("%s\n",line);
+      es_printf ("%s\n", line);
     }
 
   /* Look for an info: line.  The only current info: values defined

-----------------------------------------------------------------------

Summary of changes:
 g10/keyserver.c |    4 ++--
 po/ja.po        |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org