[git] GnuPG - branch, master, updated. post-nuke-of-trailing-ws-34-g87a6a1c
by Werner Koch
cvs at cvs.gnupg.org
Tue Mar 8 14:24:39 CET 2011
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 87a6a1c3fe4b86a7db30fcce4d1e21e86d561e0f (commit)
via 444f2fe1cdfe0924e2f55aff4e38eb88742153d4 (commit)
from 327af90594204db9683fcee5c8c6b8098c8da37a (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 87a6a1c3fe4b86a7db30fcce4d1e21e86d561e0f
Author: Werner Koch <wk at gnupg.org>
Date: Tue Mar 8 14:00:04 2011 +0100
Post beta release updates
diff --git a/NEWS b/NEWS
index 6f368c8..beadfc3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 2.1.0beta3
+-----------------------------------------------------
+
+
Noteworthy changes in version 2.1.0beta2 (2011-03-08)
-----------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 622ab0a..f265dc3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,8 +24,8 @@ min_automake_version="1.10"
# Remember to change the version number immediately *after* a release.
# Set my_issvn to "yes" for non-released code. Remember to run an
# "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [2.1.0beta2])
-m4_define([my_issvn], [no])
+m4_define([my_version], [2.1.0])
+m4_define([my_issvn], [yes])
m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
| sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
commit 444f2fe1cdfe0924e2f55aff4e38eb88742153d4
Author: Werner Koch <wk at gnupg.org>
Date: Tue Mar 8 12:56:45 2011 +0100
Prepare for 1.5.0beta2
diff --git a/ChangeLog b/ChangeLog
index a48eedc..2118a1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2011-03-08 Werner Koch <wk at g10code.com>
+ Release 2.1.0beta2.
+
* configure.ac: Require libgcrypt 1.5.0.
(HAVE_GCRY_PK_ECDH, HAVE_GCRY_PK_GET_CURVE): Remove.
(utmp.h): Check for header.
diff --git a/NEWS b/NEWS
index 1255b34..6f368c8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Noteworthy changes in version 2.1.0beta2 (unreleased)
+Noteworthy changes in version 2.1.0beta2 (2011-03-08)
-----------------------------------------------------
* TMPDIR is now also honored when creating a socket using
diff --git a/configure.ac b/configure.ac
index f265dc3..622ab0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,8 +24,8 @@ min_automake_version="1.10"
# Remember to change the version number immediately *after* a release.
# Set my_issvn to "yes" for non-released code. Remember to run an
# "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [2.1.0])
-m4_define([my_issvn], [yes])
+m4_define([my_version], [2.1.0beta2])
+m4_define([my_issvn], [no])
m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
| sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
diff --git a/po/de.po b/po/de.po
index 16a8801..dab6c57 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,6 +1,6 @@
# GnuPG German translation
# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
# Walter Koch <koch at u32.de>, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006
# Merged with the gnupg 1.9.23 translation by Werner Koch on 2006-09-25.
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-2.1.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2011-02-10 20:53+0100\n"
+"PO-Revision-Date: 2011-03-08 12:47+0100\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
"MIME-Version: 1.0\n"
@@ -4279,7 +4279,9 @@ msgid "unknown option `%s'\n"
msgstr "Unbekannte Option '%s'\n"
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
-msgstr "Der öffentliche ECDSA Schlüssel muß ein Vielfaches von 8 Bit als Länge haben\n"
+msgstr ""
+"Der öffentliche ECDSA Schlüssel muß ein Vielfaches von 8 Bit als Länge "
+"haben\n"
#, c-format
msgid "File `%s' exists. "
@@ -4808,7 +4810,8 @@ msgstr "%s-Schlüssel %s verwendet ein unsicheres (%zu-Bit) Hashverfahren\n"
#, c-format
msgid "%s key %s requires a %zu bit or larger hash (hash is %s\n"
-msgstr "%s-Schlüssel %s benötigt einen mindestens %zu Bit langen Hash (Hash ist %s)\n"
+msgstr ""
+"%s-Schlüssel %s benötigt einen mindestens %zu Bit langen Hash (Hash ist %s)\n"
msgid "WARNING: signature digest conflict in message\n"
msgstr "WARNUNG: Widersprechende Hashverfahren in der signierten Nachricht\n"
@@ -5815,6 +5818,31 @@ msgid "line %d: not a valid email address\n"
msgstr "Zeile %d: Keine gültige E-Mailadresse\n"
#, c-format
+msgid "line %d: invalid serial number\n"
+msgstr "Zeile %d: Ungültige Seriennummer\n"
+
+#, c-format
+msgid "line %d: invalid issuer name label `%.*s'\n"
+msgstr "Zeile %d: ungültiger Issuer-Name-Label `%.*s'\n"
+
+#, c-format
+msgid "line %d: invalid issuer name `%s' at pos %d\n"
+msgstr "Zeile %d: ungültiger Herausgeber `%s' in Spalte %d\n"
+
+#, c-format
+msgid "line %d: invalid date given\n"
+msgstr "Zeile %d: Ungültiges Datum\n"
+
+#, c-format
+msgid "line %d: error getting signing key by keygrip `%s': %s\n"
+msgstr ""
+"Zeile %d: Fehler beim Holen des Signaturschlüssels per \"Keygrip\" `%s': %s\n"
+
+#, c-format
+msgid "line %d: invalid hash algorithm given\n"
+msgstr "Zeile %d: Ungültiges Hashverfahren\n"
+
+#, c-format
msgid "line %d: error reading key `%s' from card: %s\n"
msgstr "Zeile %d: Fehler beim Lesen des Schlüssels `%s' von der Karte: %s\n"
@@ -5918,12 +5946,23 @@ msgstr " (Optional. Beenden mit einer leeren Zeile):\n"
msgid "Enter URIs"
msgstr "Bitte geben Sie die URIs ein"
-msgid "Parameters to be used for the certificate request:\n"
-msgstr "Parameter die für die Zertifikatsanforderung benutzt werden sollen:\n"
+msgid "Create self-signed certificate? (y/N) "
+msgstr "Ein eigenbeglaubigtes Zertifikat erzeugen? (j/N) "
-msgid "Now creating certificate request. This may take a while ...\n"
-msgstr ""
-"Die Zertifikatsanforderung wird erzeugt. Dies kann einen Moment dauern ...\n"
+msgid "These parameters are used:\n"
+msgstr "Verwendete Parameter:\n"
+
+msgid "Now creating self-signed certificate. "
+msgstr "Das eigenbeglaubigte Zertifikat wird erzeugt. "
+
+msgid "Now creating certificate request. "
+msgstr "Die Zertifikatsanforderung wird erzeugt. "
+
+msgid "This may take a while ...\n"
+msgstr "Dies kann einen Moment dauern ...\n"
+
+msgid "Ready.\n"
+msgstr "Fertig.\n"
msgid "Ready. You should now send this request to your CA.\n"
msgstr "Fertig. Sie sollten nun diese Anforderung an die CA senden.\n"
@@ -7664,6 +7703,9 @@ msgstr "Prüfe die globale Konfigurationsdatei"
msgid "reload all or a given component"
msgstr "\"reload\" an alle oder eine Komponente senden"
+msgid "kill a given component"
+msgstr "\"kill\" an eine Komponente senden"
+
msgid "use as output file"
msgstr "Als Ausgabedatei benutzen"
@@ -7836,6 +7878,13 @@ msgstr ""
"Syntax: gpg-check-pattern [optionen] Musterdatei\n"
"Die von stdin gelesene Passphrase gegen die Musterdatei prüfen\n"
+#~ msgid "self-signed certificate"
+#~ msgstr "eigenbeglaubigtes Zertifikat"
+
+#~ msgid "Parameters to be used for the certificate request:\n"
+#~ msgstr ""
+#~ "Parameter die für die Zertifikatsanforderung benutzt werden sollen:\n"
+
#~ msgid "WARNING: unable to parse URI %s\n"
#~ msgstr "WARNUNG: die URI %s kann nicht analysiert werden\n"
diff --git a/sm/certreqgen-ui.c b/sm/certreqgen-ui.c
index b5b4219..236d53b 100644
--- a/sm/certreqgen-ui.c
+++ b/sm/certreqgen-ui.c
@@ -393,9 +393,12 @@ gpgsm_gencertreq_tty (ctrl_t ctrl, estream_t output_stream)
}
es_fputs (result, fp);
es_rewind (fp);
- tty_printf (_("Now creating %s. "
- "This may take a while ...\n"),
- selfsigned?_("self-signed certificate"):_("certificate request"));
+ if (selfsigned)
+ tty_printf ("%s", _("Now creating self-signed certificate. "));
+ else
+ tty_printf ("%s", _("Now creating certificate request. "));
+ tty_printf ("%s", _("This may take a while ...\n"));
+
{
int save_pem = ctrl->create_pem;
ctrl->create_pem = 1; /* Force creation of PEM. */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 2 +
NEWS | 6 ++++-
po/de.po | 67 +++++++++++++++++++++++++++++++++++++++++++++-------
sm/certreqgen-ui.c | 9 ++++--
4 files changed, 71 insertions(+), 13 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list