[git] GnuPG - branch, master, updated. gnupg-2.1.0-beta864-31-gcdd899e
by Werner Koch
cvs at cvs.gnupg.org
Sun Oct 26 12:53:29 CET 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 cdd899e160e03f6ed845b59381ce89c2de0b936a (commit)
via 4a22711e254cad59caf452c9e18d2527d9d06cf2 (commit)
via af1ff08bb9ff060d4589044fcca32cc9d66efa58 (commit)
from c9aadcb3a248632c07391ff3d829bece9320a901 (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 cdd899e160e03f6ed845b59381ce89c2de0b936a
Author: Werner Koch <wk at gnupg.org>
Date: Sun Oct 26 12:48:34 2014 +0100
Update NEWS.
--
diff --git a/NEWS b/NEWS
index ffe7733..b01c7c8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,14 @@
Noteworthy changes in version 2.1.0 (unreleased)
------------------------------------------------
+ * gpg: All support for v3 (PGP 2) keys has been dropped. All
+ signatures are now creates as v4 signatures.
+
+ * gpg: With pinentry-0.9.0 the passphrase "enter again" prompt shows
+ up in the same window as the "new passphrase" prompt.
+
+ * gpg: Allow importing keys with duplicated long key ids.
+
* Dirmngr may now be build without support for LDAP.
* For a complete list of changes see the lists of changes for the
commit 4a22711e254cad59caf452c9e18d2527d9d06cf2
Author: Werner Koch <wk at gnupg.org>
Date: Sun Oct 26 12:40:30 2014 +0100
po: Auto update
--
diff --git a/po/fr.po b/po/fr.po
index aad9a1f..29e3e9d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -65,6 +65,9 @@ msgstr ""
"Veuillez entrer votre phrase de passe, pour pouvoir débloquer la clef "
"secrète pendant cette session"
+msgid "does not match - try again"
+msgstr "ne correspond pas — veuillez réessayer"
+
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
@@ -72,6 +75,9 @@ msgstr ""
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (essai %d sur %d)"
+msgid "Repeat:"
+msgstr ""
+
msgid "PIN too long"
msgstr "Code personnel trop long"
@@ -158,9 +164,6 @@ msgstr ""
"Veuillez entrer une phrase de passe pour protéger la clef secrète%%0A %s"
"%%0A %s%%0Areçue dans l'espace de stockage de clefs de gpg-agent"
-msgid "does not match - try again"
-msgstr "ne correspond pas — veuillez réessayer"
-
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "échec de création du flux à partir de cette socket : %s\n"
@@ -7310,9 +7313,13 @@ msgstr ""
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Utilisation : @DIRMNGR@ [options] (-h pour l'aide)"
+#, fuzzy
+#| msgid ""
+#| "Syntax: @DIRMNGR@ [options] [command [args]]\n"
+#| "LDAP and OCSP access for @GNUPG@\n"
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
-"LDAP and OCSP access for @GNUPG@\n"
+"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
"Syntaxe : @DIRMNGR@ [options] [commande [arguments]]\n"
"Accès LDAP et OCSP pour @GNUPG@\n"
diff --git a/po/ja.po b/po/ja.po
index 975c2ec..0faf222 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -64,6 +64,9 @@ msgstr ""
"あなたのパスフレーズを入力してください(このセッションで秘密鍵のロックを解除す"
"るために使われます)"
+msgid "does not match - try again"
+msgstr "一致しません - もう一度"
+
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
@@ -71,6 +74,9 @@ msgstr ""
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (現在 %d / 最大 %d)"
+msgid "Repeat:"
+msgstr ""
+
msgid "PIN too long"
msgstr "PINが長すぎます"
@@ -157,9 +163,6 @@ msgstr ""
"パスフレーズを入力してください。gpg-agentの鍵の保管で受信した秘密鍵%%0A %s"
"%%0A %s%%0Aを保護します。"
-msgid "does not match - try again"
-msgstr "一致しません - もう一度"
-
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "ソケットからストリームを作成するのに失敗しました: %s\n"
@@ -6896,9 +6899,13 @@ msgstr ""
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "使い方: @DIRMNGR@ [オプション] (ヘルプは -h)"
+#, fuzzy
+#| msgid ""
+#| "Syntax: @DIRMNGR@ [options] [command [args]]\n"
+#| "LDAP and OCSP access for @GNUPG@\n"
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
-"LDAP and OCSP access for @GNUPG@\n"
+"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
"形式: @DIRMNGR@ [オプション] [コマンド [引数]]\n"
"@GnuPG@のLDAPとOCSPアクセス\n"
diff --git a/po/uk.po b/po/uk.po
index f5f3d91..2fc151c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -66,6 +66,9 @@ msgstr ""
"Будь ласка, вкажіть ваш пароль, щоб ключ можна було розблокувати для цього "
"сеансу"
+msgid "does not match - try again"
+msgstr "паролі не збігаються, повторіть спробу"
+
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
@@ -73,6 +76,9 @@ msgstr ""
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (спроба %d з %d)"
+msgid "Repeat:"
+msgstr ""
+
msgid "PIN too long"
msgstr "Занадто довгий пінкод"
@@ -160,9 +166,6 @@ msgstr ""
"Будь ласка, вкажіть пароль для захисту отриманого закритого ключа%%0A %s"
"%%0A %s%%0Aу сховищі ключів gpg-agent"
-msgid "does not match - try again"
-msgstr "паролі не збігаються, повторіть спробу"
-
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "не вдалося створити потік даних з сокета: %s\n"
@@ -7104,9 +7107,13 @@ msgstr ""
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Використання: @DIRMNGR@ [параметри] (-h — довідка)"
+#, fuzzy
+#| msgid ""
+#| "Syntax: @DIRMNGR@ [options] [command [args]]\n"
+#| "LDAP and OCSP access for @GNUPG@\n"
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
-"LDAP and OCSP access for @GNUPG@\n"
+"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
"Синтаксис: @DIRMNGR@ [параметри] [команда [аргументи]]\n"
"Доступ до LDAP і OCSP для @GNUPG@\n"
commit af1ff08bb9ff060d4589044fcca32cc9d66efa58
Author: Werner Koch <wk at gnupg.org>
Date: Sun Oct 26 12:40:11 2014 +0100
po: Translate new string to German.
--
diff --git a/po/de.po b/po/de.po
index fa56dd5..799291e 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-10-10 15:27+0200\n"
+"PO-Revision-Date: 2014-10-26 12:38+0100\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
"Language: de\n"
@@ -67,6 +67,9 @@ msgstr ""
"Bitte geben Sie Ihre Passphrase ein, so daß der geheime Schlüssel benutzt "
"werden kann."
+msgid "does not match - try again"
+msgstr "Keine Übereinstimmung - bitte nochmal versuchen."
+
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
@@ -74,6 +77,9 @@ msgstr ""
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (Versuch %d von %d)"
+msgid "Repeat:"
+msgstr "Nochmal:"
+
msgid "PIN too long"
msgstr "Die PIN ist zu lang"
@@ -163,9 +169,6 @@ msgstr ""
"Schlüssel%%0A %s%%0A %s%%0Aim Schlüsselspeicher des Gpg-Agenten zu "
"schützen."
-msgid "does not match - try again"
-msgstr "Keine Übereinstimmung - bitte nochmal versuchen."
-
#, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "Das Erzeugen eines Datenstroms aus dem Socket schlug fehl: %s\n"
@@ -7131,10 +7134,10 @@ msgstr "Gebrauch: @DIRMNGR@ [Optionen]"
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
-"LDAP and OCSP access for @GNUPG@\n"
+"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
"Syntax: @DIRMNGR@ [Optionen] [Kommando [Argumente]]\n"
-"LDAP und OCSP Zugriff für @GNUPG@\n"
+"Keyserver, CRL und OCSP Zugriff für @GNUPG@\n"
#, c-format
msgid "valid debug levels are: %s\n"
-----------------------------------------------------------------------
Summary of changes:
NEWS | 8 ++++++++
po/de.po | 15 +++++++++------
po/fr.po | 15 +++++++++++----
po/ja.po | 15 +++++++++++----
po/uk.po | 15 +++++++++++----
5 files changed, 50 insertions(+), 18 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list