[git] GnuPG - branch, master, updated. gnupg-2.1.0-beta751-11-gf2011e4
by Werner Koch
cvs at cvs.gnupg.org
Wed Jul 23 21:13:24 CEST 2014
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 f2011e4622e708f6461a591c58ac95bc3b2befbe (commit)
via b3378b3a56fc90ba8ae38e6298b23a378305af32 (commit)
via a24510d53bb23e3a680ed2c306e576268c07060d (commit)
from ea186540db5b418bc6f6e5ca90337672c9981c88 (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 f2011e4622e708f6461a591c58ac95bc3b2befbe
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jul 23 21:12:10 2014 +0200
po: Update the German (de) translation
--
diff --git a/po/de.po b/po/de.po
index 7cdca4a..4dc1f03 100644
--- a/po/de.po
+++ b/po/de.po
@@ -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: 2014-06-27 20:13+0200\n"
+"PO-Revision-Date: 2014-07-23 21:11+0200\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
"Language: de\n"
@@ -231,44 +231,6 @@ msgstr "Diese trotzdem benutzen"
#, c-format
msgid ""
-"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
-"at least %u character long."
-msgid_plural ""
-"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
-"at least %u characters long."
-msgstr[0] ""
-"WARNUNG: Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben. "
-"Eine Passphrase sollte%%0Amindestens %u Zeichen lang sein."
-msgstr[1] ""
-"WARNUNG: Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben. "
-"Eine Passphrase sollte%%0Amindestens %u Zeichen lang sein."
-
-#, c-format
-msgid ""
-"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
-"contain at least %u digit or%%0Aspecial character."
-msgid_plural ""
-"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
-"contain at least %u digits or%%0Aspecial characters."
-msgstr[0] ""
-"WARNUNG: Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben. "
-"Eine Passphrase sollte%%0Amindestens %u Sonderzeichen oder eine Ziffer "
-"enthalten."
-msgstr[1] ""
-"WARNUNG: Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben. "
-"Eine Passphrase sollte%%0Amindestens %u Sonderzeichen oder Ziffern enthalten."
-
-#, c-format
-msgid ""
-"Warning: You have entered an insecure passphrase.%%0AA passphrase may not be "
-"a known term or match%%0Acertain pattern."
-msgstr ""
-"WARNUNG: Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben. "
-"Eine Passphrase sollte kein%%0Abekanntes Wort sein oder nach bekannten "
-"Regeln aufgebaut sein."
-
-#, c-format
-msgid ""
"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
msgstr ""
"Sie haben keine Passphrase eingegeben!%0AEine leere Passphrase ist nicht "
@@ -287,6 +249,32 @@ msgid "Yes, protection is not needed"
msgstr "Ja, ein Schutz ist nicht notwendig"
#, c-format
+msgid "A passphrase should be at least %u character long."
+msgid_plural "A passphrase should be at least %u characters long."
+msgstr[0] "Eine Passphrase sollte mindestens %u Zeichen lang sein."
+msgstr[1] "Eine Passphrase sollte mindestens %u Zeichen lang sein."
+
+#, c-format
+msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
+msgid_plural ""
+"A passphrase should contain at least %u digits or%%0Aspecial characters."
+msgstr[0] ""
+"Eine Passphrase sollte mindestens %u Sonderzeichen oder%%0Aeine Ziffer "
+"enthalten."
+msgstr[1] ""
+"Eine Passphrase sollte mindestens %u Sonderzeichen oder%%0AZiffern enthalten."
+
+#, c-format
+msgid "A passphrase may not be a known term or match%%0Acertain pattern."
+msgstr ""
+"Eine Passphrase sollte kein bekanntes Wort sein oder%%0Anach bekannten "
+"Regeln aufgebaut sein."
+
+msgid "Warning: You have entered an insecure passphrase."
+msgstr ""
+"WARNUNG: Sie haben eine offensichtlich unsichere%%0APassphrase eingegeben."
+
+#, c-format
msgid "Please enter the passphrase to%0Aprotect your new key"
msgstr "Bitte geben Sie die Passphrase ein,%0Aum Ihren Schlüssel zu schützen."
@@ -671,10 +659,6 @@ msgstr "Ich werde sie später ändern"
msgid "Delete key"
msgstr "Schlüssel löschen"
-#, fuzzy
-#| msgid ""
-#| "Warning: This key is also listed for use with SSH!\n"
-#| "Deleting the key will may remove your ability to access remote machines."
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
@@ -1721,6 +1705,9 @@ msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
msgid "list secret keys"
msgstr "Liste der geheimen Schlüssel"
+msgid "quickly generate a new key pair"
+msgstr "Schnell ein neues Schlüsselpaar erzeugen"
+
msgid "generate a new key pair"
msgstr "Ein neues Schlüsselpaar erzeugen"
@@ -3900,6 +3887,33 @@ msgstr ""
"unterstützen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
"tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n"
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
+
+#, c-format
+msgid ""
+"About to create a key for:\n"
+" \"%s\"\n"
+"\n"
+msgstr ""
+"Erzeugung eines Schlüssels für:\n"
+" \"%s\"\n"
+"\n"
+
+msgid "Continue? (Y/n) "
+msgstr "Fortsetzen? (J/n) "
+
+#, c-format
+msgid "A key for \"%s\" already exists\n"
+msgstr "Ein Schlüssel für \"%s\" existiert bereits\n"
+
+msgid "Create anyway? (y/N) "
+msgstr "Trotzdem erzeugen? (j/N) "
+
+msgid "creating anyway\n"
+msgstr "wird trotzdem erzeugt\n"
+
msgid "Key generation canceled.\n"
msgstr "Schlüsselerzeugung abgebrochen.\n"
@@ -3927,10 +3941,6 @@ msgstr ""
"Unterschlüssel für diesem Zweck erzeugen.\n"
#, c-format
-msgid "Key generation failed: %s\n"
-msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
-
-#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
@@ -4865,10 +4875,8 @@ msgstr "Widerrufzertifikat erzeugt.\n"
msgid "no revocation keys found for \"%s\"\n"
msgstr "keine Widerrufsschlüssel für \"%s\" gefunden\n"
-#, fuzzy
-#| msgid "Create a revocation certificate for this key? (y/N) "
msgid "This is a revocation certificate for the OpenPGP key:"
-msgstr "Ein Widerrufszertifikat für diesen Schlüssel erzeugen? (j/N) "
+msgstr "Dies ist ein Widerrufszertifikat für den OpenPGP Schlüssel:"
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
@@ -4876,12 +4884,21 @@ msgid ""
"it is better to generate a new revocation certificate and give\n"
"a reason for the revocation."
msgstr ""
+"Benutzen Sie es, um einen Schlüssel zu widerrufen, falls der private\n"
+"Schlüssel verloren wurde oder kompromittiert ist. Falls jedoch auf\n"
+"den privaten Schlüssel noch zugegriffen werden kann, so ist es besser,\n"
+"ein neues Widerrufszertifikat zu erzeugen, um den Grund des Widerrufs\n"
+"mit angeben zu können."
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before making use of this revocation certificate."
msgstr ""
+"Um eine versehentliche Aktivierung des Widerrufszertifikats zu\n"
+"vermeiden, wurde ein Doppelpunkt direkt vor den 5 Spiegelstrichen\n"
+"unten eingefügt. Vor dem Import dieses Widerrufszertifikats\n"
+"entfernen Sie bitte dieses Doppelpunkt mittels eines Texteditors."
#, c-format
msgid "secret key \"%s\" not found: %s\n"
commit b3378b3a56fc90ba8ae38e6298b23a378305af32
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jul 23 19:51:52 2014 +0200
agent: Show just one warning with all failed passphrase constraints.
* agent/genkey.c (check_passphrase_constraints): Build a final warning
after all checks.
diff --git a/agent/genkey.c b/agent/genkey.c
index 59c0c0d..9918c12 100644
--- a/agent/genkey.c
+++ b/agent/genkey.c
@@ -179,9 +179,12 @@ take_this_one_anyway (ctrl_t ctrl, const char *desc)
int
check_passphrase_constraints (ctrl_t ctrl, const char *pw, int silent)
{
- gpg_error_t err;
+ gpg_error_t err = 0;
unsigned int minlen = opt.min_passphrase_len;
unsigned int minnonalpha = opt.min_passphrase_nonalpha;
+ char *msg1 = NULL;
+ char *msg2 = NULL;
+ char *msg3 = NULL;
if (!pw)
pw = "";
@@ -200,52 +203,51 @@ check_passphrase_constraints (ctrl_t ctrl, const char *pw, int silent)
if (silent)
return gpg_error (GPG_ERR_INV_PASSPHRASE);
- return take_this_one_anyway2 (ctrl, desc,
+ err = take_this_one_anyway2 (ctrl, desc,
_("Yes, protection is not needed"));
+ goto leave;
}
+ /* Now check the constraints and collect the error messages unless
+ in in silent mode which returns immediately. */
if (utf8_charcount (pw) < minlen )
{
- char *desc;
-
if (silent)
- return gpg_error (GPG_ERR_INV_PASSPHRASE);
+ {
+ err = gpg_error (GPG_ERR_INV_PASSPHRASE);
+ goto leave;
+ }
- desc = xtryasprintf
- ( ngettext ("Warning: You have entered an insecure passphrase.%%0A"
- "A passphrase should be at least %u character long.",
- "Warning: You have entered an insecure passphrase.%%0A"
+ msg1 = xtryasprintf
+ ( ngettext ("A passphrase should be at least %u character long.",
"A passphrase should be at least %u characters long.",
minlen), minlen );
- if (!desc)
- return gpg_error_from_syserror ();
- err = take_this_one_anyway (ctrl, desc);
- xfree (desc);
- if (err)
- return err;
+ if (!msg1)
+ {
+ err = gpg_error_from_syserror ();
+ goto leave;
+ }
}
if (nonalpha_count (pw) < minnonalpha )
{
- char *desc;
-
if (silent)
- return gpg_error (GPG_ERR_INV_PASSPHRASE);
+ {
+ err = gpg_error (GPG_ERR_INV_PASSPHRASE);
+ goto leave;
+ }
- desc = xtryasprintf
- ( ngettext ("Warning: You have entered an insecure passphrase.%%0A"
- "A passphrase should contain at least %u digit or%%0A"
+ msg2 = xtryasprintf
+ ( ngettext ("A passphrase should contain at least %u digit or%%0A"
"special character.",
- "Warning: You have entered an insecure passphrase.%%0A"
"A passphrase should contain at least %u digits or%%0A"
"special characters.",
minnonalpha), minnonalpha );
- if (!desc)
- return gpg_error_from_syserror ();
- err = take_this_one_anyway (ctrl, desc);
- xfree (desc);
- if (err)
- return err;
+ if (!msg2)
+ {
+ err = gpg_error_from_syserror ();
+ goto leave;
+ }
}
/* If configured check the passphrase against a list of known words
@@ -255,20 +257,54 @@ check_passphrase_constraints (ctrl_t ctrl, const char *pw, int silent)
if (*pw && opt.check_passphrase_pattern &&
check_passphrase_pattern (ctrl, pw))
{
- const char *desc =
- /* */ _("Warning: You have entered an insecure passphrase.%%0A"
- "A passphrase may not be a known term or match%%0A"
- "certain pattern.");
-
if (silent)
- return gpg_error (GPG_ERR_INV_PASSPHRASE);
+ {
+ err = gpg_error (GPG_ERR_INV_PASSPHRASE);
+ goto leave;
+ }
- err = take_this_one_anyway (ctrl, desc);
- if (err)
- return err;
+ msg3 = xtryasprintf
+ (_("A passphrase may not be a known term or match%%0A"
+ "certain pattern."));
+ if (!msg3)
+ {
+ err = gpg_error_from_syserror ();
+ goto leave;
+ }
}
- return 0;
+ if (msg1 || msg2 || msg3)
+ {
+ char *msg;
+ size_t n;
+
+ msg = strconcat
+ (_("Warning: You have entered an insecure passphrase."),
+ "%0A%0A",
+ msg1? msg1 : "", msg1? "%0A" : "",
+ msg2? msg2 : "", msg2? "%0A" : "",
+ msg3? msg3 : "", msg3? "%0A" : "",
+ NULL);
+ if (!msg)
+ {
+ err = gpg_error_from_syserror ();
+ goto leave;
+ }
+ /* Strip a trailing "%0A". */
+ n = strlen (msg);
+ if (n > 3 && !strcmp (msg + n - 3, "%0A"))
+ msg[n-3] = 0;
+
+ /* Show error messages. */
+ err = take_this_one_anyway (ctrl, msg);
+ xfree (msg);
+ }
+
+ leave:
+ xfree (msg1);
+ xfree (msg2);
+ xfree (msg3);
+ return err;
}
commit a24510d53bb23e3a680ed2c306e576268c07060d
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jul 23 19:16:51 2014 +0200
agent: Only one confirmation prompt for an empty passphrase.
* agent/genkey.c (check_passphrase_constraints): Moev empty passphrase
check to the front.
diff --git a/agent/genkey.c b/agent/genkey.c
index c040f13..59c0c0d 100644
--- a/agent/genkey.c
+++ b/agent/genkey.c
@@ -186,6 +186,24 @@ check_passphrase_constraints (ctrl_t ctrl, const char *pw, int silent)
if (!pw)
pw = "";
+ /* The first check is to warn about an empty passphrase. */
+ if (!*pw)
+ {
+ const char *desc = (opt.enforce_passphrase_constraints?
+ _("You have not entered a passphrase!%0A"
+ "An empty passphrase is not allowed.") :
+ _("You have not entered a passphrase - "
+ "this is in general a bad idea!%0A"
+ "Please confirm that you do not want to "
+ "have any protection on your key."));
+
+ if (silent)
+ return gpg_error (GPG_ERR_INV_PASSPHRASE);
+
+ return take_this_one_anyway2 (ctrl, desc,
+ _("Yes, protection is not needed"));
+ }
+
if (utf8_charcount (pw) < minlen )
{
char *desc;
@@ -230,7 +248,7 @@ check_passphrase_constraints (ctrl_t ctrl, const char *pw, int silent)
return err;
}
- /* If configured check the passphrase against a list of know words
+ /* If configured check the passphrase against a list of known words
and pattern. The actual test is done by an external program.
The warning message is generic to give the user no hint on how to
circumvent this list. */
@@ -250,26 +268,6 @@ check_passphrase_constraints (ctrl_t ctrl, const char *pw, int silent)
return err;
}
- /* The final check is to warn about an empty passphrase. */
- if (!*pw)
- {
- const char *desc = (opt.enforce_passphrase_constraints?
- _("You have not entered a passphrase!%0A"
- "An empty passphrase is not allowed.") :
- _("You have not entered a passphrase - "
- "this is in general a bad idea!%0A"
- "Please confirm that you do not want to "
- "have any protection on your key."));
-
- if (silent)
- return gpg_error (GPG_ERR_INV_PASSPHRASE);
-
- err = take_this_one_anyway2 (ctrl, desc,
- _("Yes, protection is not needed"));
- if (err)
- return err;
- }
-
return 0;
}
-----------------------------------------------------------------------
Summary of changes:
agent/genkey.c | 142 +++++++++++++++++++++++++++++++++++---------------------
po/de.po | 117 ++++++++++++++++++++++++++--------------------
2 files changed, 155 insertions(+), 104 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list