[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.12-31-ge5580ae
by Werner Koch
cvs at cvs.gnupg.org
Tue Feb 12 18:37:43 CET 2019
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, STABLE-BRANCH-2-2 has been updated
via e5580ae7887adb640c330fb3c1e6d0e6984aaeb1 (commit)
via 7922e2dd1c7eee48a8a2cf4799827942489ddd0f (commit)
via d1df96bf1c48d2e7e9f22c712f98870d53f63851 (commit)
from d1bee9d1efa28fa9d35b7eed1e616c6362fd044e (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 e5580ae7887adb640c330fb3c1e6d0e6984aaeb1
Author: Werner Koch <wk at gnupg.org>
Date: Tue Feb 12 18:37:40 2019 +0100
Post release updates
--
diff --git a/NEWS b/NEWS
index fb40a74..221bc03 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 2.2.14 (unreleased)
+-------------------------------------------------
+
+
Noteworthy changes in version 2.2.13 (2019-02-12)
-------------------------------------------------
diff --git a/configure.ac b/configure.ac
index f0e06b8..9260684 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ min_automake_version="1.14"
m4_define([mym4_package],[gnupg])
m4_define([mym4_major], [2])
m4_define([mym4_minor], [2])
-m4_define([mym4_micro], [13])
+m4_define([mym4_micro], [14])
# To start a new development series, i.e a new major or minor number
# you need to mark an arbitrary commit before the first beta release
commit 7922e2dd1c7eee48a8a2cf4799827942489ddd0f
Author: Werner Koch <wk at gnupg.org>
Date: Tue Feb 12 16:06:31 2019 +0100
Release 2.2.13
diff --git a/AUTHORS b/AUTHORS
index 473b94c..32766a6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -15,9 +15,9 @@ copyrightable year that would otherwise be listed individually.
List of Copyright holders
=========================
- Copyright (C) 1997-2018 Werner Koch
- Copyright (C) 1994-2018 Free Software Foundation, Inc.
- Copyright (C) 2003-2013,2015-2018 g10 Code GmbH
+ Copyright (C) 1997-2019 Werner Koch
+ Copyright (C) 1994-2019 Free Software Foundation, Inc.
+ Copyright (C) 2003-2013,2015-2019 g10 Code GmbH
Copyright (C) 2002 Klarälvdalens Datakonsult AB
Copyright (C) 1995-1997, 2000-2007 Ulrich Drepper <drepper at gnu.ai.mit.edu>
Copyright (C) 1994 X Consortium
diff --git a/NEWS b/NEWS
index dfaa428..fb40a74 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,29 @@
-Noteworthy changes in version 2.2.13 (unreleased)
+Noteworthy changes in version 2.2.13 (2019-02-12)
-------------------------------------------------
+ * gpg: Implement key lookup via keygrip (using the & prefix).
+
+ * gpg: Allow generating Ed25519 key from existing key.
+
+ * gpg: Emit an ERROR status line if no key was found with -k.
+
+ * gpg: Stop early when trying to create a primary Elgamal key. [#4329]
+
+ * gpgsm: Print the card's key algorithms along with their keygrips
+ in interactive key generation.
+
+ * agent: Clear bogus pinentry cache in the error case. [#4348]
+
+ * scd: Support "acknowledge button" feature.
+
+ * scd: Fix for USB INTERRUPT transfer. [#4308]
+
+ * wks: Do no use compression for the the encrypted challenge and
+ response.
+
+ Release-info: https://dev.gnupg.org/T4290
+ See-also: gnupg-announce/2019q1/000434.html
+
Noteworthy changes in version 2.2.12 (2018-12-14)
-------------------------------------------------
diff --git a/README b/README
index 4580a39..85639a4 100644
--- a/README
+++ b/README
@@ -2,8 +2,8 @@
=========================
Version 2.2
- Copyright 1997-2018 Werner Koch
- Copyright 1998-2018 Free Software Foundation, Inc.
+ Copyright 1997-2019 Werner Koch
+ Copyright 1998-2019 Free Software Foundation, Inc.
* INTRODUCTION
diff --git a/common/argparse.c b/common/argparse.c
index 90d0ff7..8f2c711 100644
--- a/common/argparse.c
+++ b/common/argparse.c
@@ -71,7 +71,7 @@
#else /* Used by GnuPG */
# define ARGPARSE_GPL_VERSION 3
-# define ARGPARSE_CRIGHT_STR "Copyright (C) 2018 Free Software Foundation, Inc."
+# define ARGPARSE_CRIGHT_STR "Copyright (C) 2019 Free Software Foundation, Inc."
#endif /*GNUPG_MAJOR_VERSION*/
diff --git a/common/w32info-rc.h.in b/common/w32info-rc.h.in
index 2ff6863..ea9d463 100644
--- a/common/w32info-rc.h.in
+++ b/common/w32info-rc.h.in
@@ -29,4 +29,4 @@ built on @BUILD_HOSTNAME@ at @BUILD_TIMESTAMP@\0"
#define W32INFO_PRODUCTVERSION "@VERSION@\0"
#define W32INFO_LEGALCOPYRIGHT "Copyright \xa9 \
-2018 Free Software Foundation, Inc.\0"
+2019 Free Software Foundation, Inc.\0"
diff --git a/configure.ac b/configure.ac
index 0ee3ffc..f0e06b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
# configure.ac - for GnuPG 2.1
-# Copyright (C) 1998-2018 Free Software Foundation, Inc.
-# Copyright (C) 1998-2018 Werner Koch
+# Copyright (C) 1998-2019 Free Software Foundation, Inc.
+# Copyright (C) 1998-2019 Werner Koch
#
# This file is part of GnuPG.
#
diff --git a/g10/gpg.c b/g10/gpg.c
index 0e98c1a..a8f42e0 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1,7 +1,7 @@
/* gpg.c - The GnuPG utility (main for gpg)
- * Copyright (C) 1998-2011 Free Software Foundation, Inc.
- * Copyright (C) 1997-2017 Werner Koch
- * Copyright (C) 2015-2017 g10 Code GmbH
+ * Copyright (C) 1998-2019 Free Software Foundation, Inc.
+ * Copyright (C) 1997-2019 Werner Koch
+ * Copyright (C) 2015-2019 g10 Code GmbH
*
* This file is part of GnuPG.
*
commit d1df96bf1c48d2e7e9f22c712f98870d53f63851
Author: Werner Koch <wk at gnupg.org>
Date: Tue Feb 12 16:30:17 2019 +0100
po: Auto-update
--
diff --git a/po/ca.po b/po/ca.po
index ad6d235..19ad09c 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -228,8 +228,10 @@ msgstr ""
msgid "Reset Code"
msgstr ""
-#, c-format
-msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Push ACK button on card/token."
+msgstr ""
+
+msgid "Use the reader's pinpad for input."
msgstr ""
#, fuzzy
diff --git a/po/cs.po b/po/cs.po
index 24ada94..e3cc7ef 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -230,8 +230,12 @@ msgstr "PUK"
msgid "Reset Code"
msgstr "Resetační kód"
-#, c-format
-msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Push ACK button on card/token."
+msgstr ""
+
+#, fuzzy
+#| msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Use the reader's pinpad for input."
msgstr "%s%%0A%%0APro vstup použijte klávesnici čtečky."
msgid "Repeat this Reset Code"
diff --git a/po/da.po b/po/da.po
index 36cc3d7..e2ace1a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -226,8 +226,12 @@ msgstr "PUK"
msgid "Reset Code"
msgstr "Nulstillingskode"
-#, c-format
-msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Push ACK button on card/token."
+msgstr ""
+
+#, fuzzy
+#| msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Use the reader's pinpad for input."
msgstr "%s%%0A%%0ABrug læserens numeriske tastatur for indtastning."
msgid "Repeat this Reset Code"
diff --git a/po/de.po b/po/de.po
index ac4d77d..17d1cbe 100644
--- a/po/de.po
+++ b/po/de.po
@@ -212,8 +212,12 @@ msgstr "PUK"
msgid "Reset Code"
msgstr "Rückstellcode"
-#, c-format
-msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Push ACK button on card/token."
+msgstr ""
+
+#, fuzzy
+#| msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Use the reader's pinpad for input."
msgstr "%s%%0A%%0AZur Eingabe die Tastatur des Kartenlesers verwenden."
msgid "Repeat this Reset Code"
diff --git a/po/el.po b/po/el.po
index fc25941..920954e 100644
--- a/po/el.po
+++ b/po/el.po
@@ -206,8 +206,10 @@ msgstr ""
msgid "Reset Code"
msgstr ""
-#, c-format
-msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Push ACK button on card/token."
+msgstr ""
+
+msgid "Use the reader's pinpad for input."
msgstr ""
#, fuzzy
diff --git a/po/eo.po b/po/eo.po
index 8626ebc..4fabaa7 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -207,8 +207,10 @@ msgstr ""
msgid "Reset Code"
msgstr ""
-#, c-format
-msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Push ACK button on card/token."
+msgstr ""
+
+msgid "Use the reader's pinpad for input."
msgstr ""
#, fuzzy
diff --git a/po/es.po b/po/es.po
index c0e05fb..8e6ba70 100644
--- a/po/es.po
+++ b/po/es.po
@@ -222,8 +222,12 @@ msgstr "PUK"
msgid "Reset Code"
msgstr "Código de Reinicio"
-#, c-format
-msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Push ACK button on card/token."
+msgstr ""
+
+#, fuzzy
+#| msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Use the reader's pinpad for input."
msgstr "%s%%0A%%0A Use el teclado del lector como entrada."
msgid "Repeat this Reset Code"
diff --git a/po/et.po b/po/et.po
index 8b12acc..c3e541a 100644
--- a/po/et.po
+++ b/po/et.po
@@ -203,8 +203,10 @@ msgstr ""
msgid "Reset Code"
msgstr ""
-#, c-format
-msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Push ACK button on card/token."
+msgstr ""
+
+msgid "Use the reader's pinpad for input."
msgstr ""
#, fuzzy
diff --git a/po/fi.po b/po/fi.po
index 14b94c2..3ee250d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -219,8 +219,10 @@ msgstr ""
msgid "Reset Code"
msgstr ""
-#, c-format
-msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Push ACK button on card/token."
+msgstr ""
+
+msgid "Use the reader's pinpad for input."
msgstr ""
#, fuzzy
diff --git a/po/fr.po b/po/fr.po
index a8e618f..21684c7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -215,8 +215,12 @@ msgstr "CDP"
msgid "Reset Code"
msgstr "Code de réinitialisation"
-#, c-format
-msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Push ACK button on card/token."
+msgstr ""
+
+#, fuzzy
+#| msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Use the reader's pinpad for input."
msgstr "%s%%0A%%0AUtilisez le pavé numérique du lecteur en entrée."
msgid "Repeat this Reset Code"
diff --git a/po/gl.po b/po/gl.po
index 61942eb..295322d 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -205,8 +205,10 @@ msgstr ""
msgid "Reset Code"
msgstr ""
-#, c-format
-msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Push ACK button on card/token."
+msgstr ""
+
+msgid "Use the reader's pinpad for input."
msgstr ""
#, fuzzy
diff --git a/po/hu.po b/po/hu.po
index c45dac1..c0c3d70 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -203,8 +203,10 @@ msgstr ""
msgid "Reset Code"
msgstr ""
-#, c-format
-msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Push ACK button on card/token."
+msgstr ""
+
+msgid "Use the reader's pinpad for input."
msgstr ""
#, fuzzy
diff --git a/po/id.po b/po/id.po
index 00d416a..59f2c3e 100644
--- a/po/id.po
+++ b/po/id.po
@@ -208,8 +208,10 @@ msgstr ""
msgid "Reset Code"
msgstr ""
-#, c-format
-msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Push ACK button on card/token."
+msgstr ""
+
+msgid "Use the reader's pinpad for input."
msgstr ""
#, fuzzy
diff --git a/po/it.po b/po/it.po
index 42fdee3..fd88478 100644
--- a/po/it.po
+++ b/po/it.po
@@ -203,8 +203,10 @@ msgstr ""
msgid "Reset Code"
msgstr ""
-#, c-format
-msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Push ACK button on card/token."
+msgstr ""
+
+msgid "Use the reader's pinpad for input."
msgstr ""
#, fuzzy
diff --git a/po/nb.po b/po/nb.po
index 159349f..225d400 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -207,8 +207,12 @@ msgstr "PUK"
msgid "Reset Code"
msgstr "Tilbakestillingskode"
-#, c-format
-msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Push ACK button on card/token."
+msgstr ""
+
+#, fuzzy
+#| msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Use the reader's pinpad for input."
msgstr "%s%%0A%%0ABruk leserens kodeplate til å skrive."
msgid "Repeat this Reset Code"
diff --git a/po/pl.po b/po/pl.po
index cac673a..9339511 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -200,8 +200,12 @@ msgstr "PUK"
msgid "Reset Code"
msgstr "Kod resetujący"
-#, c-format
-msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Push ACK button on card/token."
+msgstr ""
+
+#, fuzzy
+#| msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Use the reader's pinpad for input."
msgstr "%s%%0A%%0ADo wpisywania należy użyć klawiatury czytnika."
msgid "Repeat this Reset Code"
diff --git a/po/pt.po b/po/pt.po
index 578649a..b7cca6a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -206,8 +206,10 @@ msgstr ""
msgid "Reset Code"
msgstr ""
-#, c-format
-msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Push ACK button on card/token."
+msgstr ""
+
+msgid "Use the reader's pinpad for input."
msgstr ""
#, fuzzy
diff --git a/po/ro.po b/po/ro.po
index 0f5dced..e2fa0d7 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -219,8 +219,10 @@ msgstr ""
msgid "Reset Code"
msgstr ""
-#, c-format
-msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Push ACK button on card/token."
+msgstr ""
+
+msgid "Use the reader's pinpad for input."
msgstr ""
#, fuzzy
diff --git a/po/ru.po b/po/ru.po
index 6972220..43af4e6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -204,8 +204,12 @@ msgstr "Код разблокировки PIN (PUK)"
msgid "Reset Code"
msgstr "Код сброса"
-#, c-format
-msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Push ACK button on card/token."
+msgstr ""
+
+#, fuzzy
+#| msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Use the reader's pinpad for input."
msgstr "%s%%0A%%0AВводите на клавиатуре считывателя."
msgid "Repeat this Reset Code"
diff --git a/po/sk.po b/po/sk.po
index c8a58fb..3bef735 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -206,8 +206,10 @@ msgstr ""
msgid "Reset Code"
msgstr ""
-#, c-format
-msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Push ACK button on card/token."
+msgstr ""
+
+msgid "Use the reader's pinpad for input."
msgstr ""
#, fuzzy
diff --git a/po/sv.po b/po/sv.po
index b763b8d..9ed59d8 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -236,9 +236,12 @@ msgstr "PUK-kod"
msgid "Reset Code"
msgstr "Nollställ kod"
-#, fuzzy, c-format
+msgid "Push ACK button on card/token."
+msgstr ""
+
+#, fuzzy
#| msgid "%s%%0A%%0AUse the reader's keypad for input."
-msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Use the reader's pinpad for input."
msgstr "%s%%0A%%0AAnvänd läsarens knappsats för inmatning."
msgid "Repeat this Reset Code"
diff --git a/po/tr.po b/po/tr.po
index 8e76bf2..576b4d0 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -207,10 +207,14 @@ msgstr ""
msgid "Reset Code"
msgstr "Sıfırlama Kodu"
-#, c-format
-msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Push ACK button on card/token."
msgstr ""
+#, fuzzy
+#| msgid "do not use a reader's keypad"
+msgid "Use the reader's pinpad for input."
+msgstr "bir okuyucu tuştakımı kullanılmaz"
+
msgid "Repeat this Reset Code"
msgstr "Bu Sıfırlama Kodu tekrarlansın"
diff --git a/po/uk.po b/po/uk.po
index ea8270b..45039a2 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -206,8 +206,12 @@ msgstr "PUK"
msgid "Reset Code"
msgstr "Код скидання"
-#, c-format
-msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Push ACK button on card/token."
+msgstr ""
+
+#, fuzzy
+#| msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Use the reader's pinpad for input."
msgstr "%s%%0A%%0AСкористайтеся додатковою клавіатурою зчитувача для введення."
msgid "Repeat this Reset Code"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ae0fdc4..203d4bf 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -197,9 +197,12 @@ msgstr "PUK"
msgid "Reset Code"
msgstr "重置代码"
-#, fuzzy, c-format
+msgid "Push ACK button on card/token."
+msgstr "按下 card/token 上的 ACK 按钮。"
+
+#, fuzzy
#| msgid "Use the reader's pinpad for input."
-msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Use the reader's pinpad for input."
msgstr "使用读卡器的小键盘输入。"
msgid "Repeat this Reset Code"
@@ -8609,9 +8612,6 @@ msgstr ""
"语法：gpg-check-pattern [选项] patternfile\n"
"按照 patternfile 检查一个由标准输入（stdin）给定的密码\n"
-#~ msgid "Push ACK button on card/token."
-#~ msgstr "按下 card/token 上的 ACK 按钮。"
-
#~ msgid "waiting for the dirmngr to come up ... (%ds)\n"
#~ msgstr "等待 dirmngr 启动 ... (%ds)\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 89dab47..e18d306 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -211,8 +211,12 @@ msgstr "PIN 重設碼 (PUK)"
msgid "Reset Code"
msgstr "重設碼"
-#, c-format
-msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Push ACK button on card/token."
+msgstr ""
+
+#, fuzzy
+#| msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgid "Use the reader's pinpad for input."
msgstr "%s%%0A%%0A使用讀卡機的鍵盤來輸入."
msgid "Repeat this Reset Code"
-----------------------------------------------------------------------
Summary of changes:
AUTHORS | 6 +++---
NEWS | 29 ++++++++++++++++++++++++++++-
README | 4 ++--
common/argparse.c | 2 +-
common/w32info-rc.h.in | 2 +-
configure.ac | 6 +++---
g10/gpg.c | 6 +++---
po/ca.po | 6 ++++--
po/cs.po | 8 ++++++--
po/da.po | 8 ++++++--
po/de.po | 8 ++++++--
po/el.po | 6 ++++--
po/eo.po | 6 ++++--
po/es.po | 8 ++++++--
po/et.po | 6 ++++--
po/fi.po | 6 ++++--
po/fr.po | 8 ++++++--
po/gl.po | 6 ++++--
po/hu.po | 6 ++++--
po/id.po | 6 ++++--
po/it.po | 6 ++++--
po/nb.po | 8 ++++++--
po/pl.po | 8 ++++++--
po/pt.po | 6 ++++--
po/ro.po | 6 ++++--
po/ru.po | 8 ++++++--
po/sk.po | 6 ++++--
po/sv.po | 7 +++++--
po/tr.po | 8 ++++++--
po/uk.po | 8 ++++++--
po/zh_CN.po | 10 +++++-----
po/zh_TW.po | 8 ++++++--
32 files changed, 165 insertions(+), 67 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list