[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.11-29-g3520a7b
by Werner Koch
cvs at cvs.gnupg.org
Fri Dec 14 15:45:39 CET 2018
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 3520a7b1fcd85dcc6a40547ceba4452710a1f1a3 (commit)
via 7d8f4ee7cf56eda988acdc909160cbac71bff18a (commit)
via 0ed37d023bae9c89c2a643fe9d81a9ce67b9ff5e (commit)
from 35a91f1409c34097a0abf5ea848462f1a3894534 (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 3520a7b1fcd85dcc6a40547ceba4452710a1f1a3
Author: Werner Koch <wk at gnupg.org>
Date: Fri Dec 14 15:45:35 2018 +0100
Post release updates
--
diff --git a/NEWS b/NEWS
index 294709d..dfaa428 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 2.2.13 (unreleased)
+-------------------------------------------------
+
+
Noteworthy changes in version 2.2.12 (2018-12-14)
-------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 919ab31..0ee3ffc 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], [12])
+m4_define([mym4_micro], [13])
# 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 7d8f4ee7cf56eda988acdc909160cbac71bff18a
Author: Werner Koch <wk at gnupg.org>
Date: Fri Dec 14 15:02:44 2018 +0100
Release 2.2.12
diff --git a/NEWS b/NEWS
index ab6dbce..294709d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,40 @@
-Noteworthy changes in version 2.2.12 (unreleased)
+Noteworthy changes in version 2.2.12 (2018-12-14)
-------------------------------------------------
+ * tools: New commands --install-key and --remove-key for
+ gpg-wks-client. This allows to prepare a Web Key Directory on a
+ local file system for later upload to a web server.
+
+ * gpg: New --list-option "show-only-fpr-mbox". This makes the use
+ of the new gpg-wks-client --install-key command easier on Windows.
+
+ * gpg: Improve processing speed when --skip-verify is used.
+
+ * gpg: Fix a bug where a LF was accidentally written to the console.
+
+ * gpg: --card-status now shwos whether a card has the new KDF
+ feature enabled.
+
+ * agent: New runtime option --s2k-calibration=MSEC. New configure
+ option --with-agent-s2k-calibration=MSEC. [#3399]
+
+ * dirmngr: Try another keyserver from the pool on receiving a 502,
+ 503, or 504 error. [#4175]
+
+ * dirmngr: Avoid possible CSRF attacks via http redirects. A HTTP
+ query will not anymore follow a 3xx redirect unless the Location
+ header gives the same host. If the host is different only the
+ host and port is taken from the Location header and the original
+ path and query parts are kept.
+
+ * dirmngr: New command FLUSHCRL to flush all CRLS from disk and
+ memory. [#3967]
+
+ * New simplified Chinese translation (zh_CN).
+
+ Release-info: https://dev.gnupg.org/T4289
+ See-also: gnupg-announce/2018q4/000433.html
+
Noteworthy changes in version 2.2.11 (2018-11-06)
-------------------------------------------------
diff --git a/README b/README
index d46efd9..4580a39 100644
--- a/README
+++ b/README
@@ -24,10 +24,9 @@
can be freely used, modified and distributed under the terms of the
GNU General Public License.
- Note that the 2.0 series of GnuPG will reach end-of-life on
- 2017-12-31. It is not possible to install a 2.2.x version along
- with any 2.0.x version.
-
+ Note that the 2.0 series of GnuPG reached end-of-life on 2017-12-31.
+ It is not possible to install a 2.2.x version along with any 2.0.x
+ version.
* BUILD INSTRUCTIONS
@@ -120,7 +119,6 @@
Add other options as needed.
-
* MIGRATION from 1.4 or 2.0 to 2.2
The major change in 2.2 is gpg-agent taking care of the OpenPGP
@@ -168,7 +166,6 @@
fi
done )
-
* DOCUMENTATION
The complete documentation is in the texinfo manual named
@@ -181,7 +178,6 @@
version of the manual pertaining to the current development snapshot
is at [[https://gnupg.org/documentation/manuals/gnupg-devel/]] .
-
* Installing GnuPG 2.2. and GnuPG 1.4
GnuPG 2.2 is a current version of GnuPG with state of the art
@@ -192,7 +188,6 @@
possible, the 2.2 version can be installed under the name "gpg2"
using the configure option --enable-gpg-is-gpg2.
-
* HOW TO GET MORE INFORMATION
A description of new features and changes since version 2.1 can be
commit 0ed37d023bae9c89c2a643fe9d81a9ce67b9ff5e
Author: Werner Koch <wk at gnupg.org>
Date: Fri Dec 14 14:59:15 2018 +0100
po: Auto-update
--
diff --git a/po/ca.po b/po/ca.po
index e97c9f3..ad6d235 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8650,6 +8650,19 @@ msgstr ""
msgid "error accessing '%s': http status %u\n"
msgstr "error en la lectura de «%s»: %s\n"
+#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "too many redirections\n"
+msgstr "hi ha massa preferències «%c»\n"
+
+#, fuzzy, c-format
+#| msgid "writing to `%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "s'està escrivint en «%s»\n"
+
#, fuzzy, c-format
msgid "error allocating memory: %s\n"
msgstr "error en crear l'anell «%s»: %s\n"
@@ -8752,14 +8765,6 @@ msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
msgid "error reading HTTP response for '%s': %s\n"
msgstr "error en la lectura de «%s»: %s\n"
-#, c-format
-msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "too many redirections\n"
-msgstr "hi ha massa preferències «%c»\n"
-
#, fuzzy, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
diff --git a/po/cs.po b/po/cs.po
index c5c45e4..24ada94 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8179,6 +8179,20 @@ msgid "error accessing '%s': http status %u\n"
msgstr "chyba přístupu k „%s“: status HTTP %u\n"
#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr "URL „%s“ přesměrováno na „%s“ (%u)\n"
+
+#, c-format
+msgid "too many redirections\n"
+msgstr "příliš mnoho přesměrování\n"
+
+# g10/import.c:766 g10/openfile.c:261#, c-format
+#, fuzzy, c-format
+#| msgid "writing to '%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "zapisuje se do „%s“\n"
+
+#, c-format
msgid "error allocating memory: %s\n"
msgstr "chyba při alokování paměti: %s\n"
@@ -8279,14 +8293,6 @@ msgid "error reading HTTP response for '%s': %s\n"
msgstr "chyba při čtení HTTP odpovědi od „%s“: %s\n"
#, c-format
-msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr "URL „%s“ přesměrováno na „%s“ (%u)\n"
-
-#, c-format
-msgid "too many redirections\n"
-msgstr "příliš mnoho přesměrování\n"
-
-#, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "chyba při rozebírání OCSP odpovědi od „%s“: %s\n"
diff --git a/po/da.po b/po/da.po
index 0128441..36cc3d7 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8709,6 +8709,20 @@ msgstr ""
msgid "error accessing '%s': http status %u\n"
msgstr "fejl ved kørsel af »%s«: afslutningsstatus %d\n"
+#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "too many cipher preferences\n"
+msgid "too many redirections\n"
+msgstr "for mange chifferpræferencer\n"
+
+#, fuzzy, c-format
+#| msgid "writing to `%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "skriver til »%s«\n"
+
#, fuzzy, c-format
#| msgid "error allocating enough memory: %s\n"
msgid "error allocating memory: %s\n"
@@ -8825,15 +8839,6 @@ msgstr "fejl ved skrivning til »%s«: %s\n"
msgid "error reading HTTP response for '%s': %s\n"
msgstr "fejl ved læsning fra %s: %s\n"
-#, c-format
-msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr ""
-
-#, fuzzy, c-format
-#| msgid "too many cipher preferences\n"
-msgid "too many redirections\n"
-msgstr "for mange chifferpræferencer\n"
-
#, fuzzy, c-format
#| msgid "error binding socket to `%s': %s\n"
msgid "error parsing OCSP response for '%s': %s\n"
diff --git a/po/de.po b/po/de.po
index 6badf9d..ac4d77d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8367,6 +8367,19 @@ msgid "error accessing '%s': http status %u\n"
msgstr "Fehler beim Zugreifen auf `%s': HTTP Status %u\n"
#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr "URL `%s' nach `%s' umgeleitet (%u)\n"
+
+#, c-format
+msgid "too many redirections\n"
+msgstr "zu viele verschachtelte Umleitungen\n"
+
+#, fuzzy, c-format
+#| msgid "writing to '%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "Schreiben nach '%s'\n"
+
+#, c-format
msgid "error allocating memory: %s\n"
msgstr "Fehler beim Allozieren von Speicher: %s\n"
@@ -8467,14 +8480,6 @@ msgid "error reading HTTP response for '%s': %s\n"
msgstr "Fehler beim Lesen der HTTP Antwort von `%s': %s\n"
#, c-format
-msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr "URL `%s' nach `%s' umgeleitet (%u)\n"
-
-#, c-format
-msgid "too many redirections\n"
-msgstr "zu viele verschachtelte Umleitungen\n"
-
-#, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "Fehler beim Zerlegen der OCSP Antwort für `%s': %s\n"
diff --git a/po/el.po b/po/el.po
index a6a324c..fc25941 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8483,6 +8483,19 @@ msgstr ""
msgid "error accessing '%s': http status %u\n"
msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
+#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "too many redirections\n"
+msgstr "πάρα πολλές `%c' προεπιλογές\n"
+
+#, fuzzy, c-format
+#| msgid "writing to `%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "εγγραφή στο `%s'\n"
+
#, fuzzy, c-format
msgid "error allocating memory: %s\n"
msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
@@ -8585,14 +8598,6 @@ msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s
msgid "error reading HTTP response for '%s': %s\n"
msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
-#, c-format
-msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "too many redirections\n"
-msgstr "πάρα πολλές `%c' προεπιλογές\n"
-
#, fuzzy, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
diff --git a/po/eo.po b/po/eo.po
index bf430e4..8626ebc 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8399,6 +8399,19 @@ msgstr ""
msgid "error accessing '%s': http status %u\n"
msgstr "eraro dum legado de '%s': %s\n"
+#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "too many redirections\n"
+msgstr "tro da '%c'-preferoj\n"
+
+#, fuzzy, c-format
+#| msgid "writing to `%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "skribas al '%s'\n"
+
#, fuzzy, c-format
msgid "error allocating memory: %s\n"
msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
@@ -8501,14 +8514,6 @@ msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
msgid "error reading HTTP response for '%s': %s\n"
msgstr "eraro dum legado de '%s': %s\n"
-#, c-format
-msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "too many redirections\n"
-msgstr "tro da '%c'-preferoj\n"
-
#, fuzzy, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
diff --git a/po/es.po b/po/es.po
index 9e62659..c0e05fb 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8166,6 +8166,19 @@ msgid "error accessing '%s': http status %u\n"
msgstr "error mientras se accedía '%s': http status %u\n"
#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr "URL '%s' redirigida a '%s' (%u)\n"
+
+#, c-format
+msgid "too many redirections\n"
+msgstr "demasiadas redirecciones\n"
+
+#, fuzzy, c-format
+#| msgid "writing to '%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "escribiendo en '%s'\n"
+
+#, c-format
msgid "error allocating memory: %s\n"
msgstr "error al reservar memoria: %s\n"
@@ -8267,14 +8280,6 @@ msgid "error reading HTTP response for '%s': %s\n"
msgstr "error al leer la respuesta HTTP para '%s': %s\n"
#, c-format
-msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr "URL '%s' redirigida a '%s' (%u)\n"
-
-#, c-format
-msgid "too many redirections\n"
-msgstr "demasiadas redirecciones\n"
-
-#, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "error al leer la respuesta OCSP para '%s': %s\n"
diff --git a/po/et.po b/po/et.po
index 4a64887..8b12acc 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8399,6 +8399,19 @@ msgstr ""
msgid "error accessing '%s': http status %u\n"
msgstr "viga `%s' lugemisel: %s\n"
+#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "too many redirections\n"
+msgstr "liiga palju `%c' eelistusi\n"
+
+#, fuzzy, c-format
+#| msgid "writing to `%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "kirjutan faili `%s'\n"
+
#, fuzzy, c-format
msgid "error allocating memory: %s\n"
msgstr "viga võtmehoidla `%s' loomisel: %s\n"
@@ -8501,14 +8514,6 @@ msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
msgid "error reading HTTP response for '%s': %s\n"
msgstr "viga `%s' lugemisel: %s\n"
-#, c-format
-msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "too many redirections\n"
-msgstr "liiga palju `%c' eelistusi\n"
-
#, fuzzy, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
diff --git a/po/fi.po b/po/fi.po
index 5fb814d..14b94c2 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8461,6 +8461,19 @@ msgstr ""
msgid "error accessing '%s': http status %u\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
+#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "too many redirections\n"
+msgstr "liian monta \"%c\" valintaa\n"
+
+#, fuzzy, c-format
+#| msgid "writing to `%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "kirjoitetaan kohteeseen \"%s\"\n"
+
#, fuzzy, c-format
msgid "error allocating memory: %s\n"
msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
@@ -8563,14 +8576,6 @@ msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
msgid "error reading HTTP response for '%s': %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
-#, c-format
-msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "too many redirections\n"
-msgstr "liian monta \"%c\" valintaa\n"
-
#, fuzzy, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
diff --git a/po/fr.po b/po/fr.po
index c2a3d10..a8e618f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8528,6 +8528,19 @@ msgid "error accessing '%s': http status %u\n"
msgstr "erreur d'accès à « %s » : état HTTP %u\n"
#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr "URL « %s » redirigée vers « %s » (%u)\n"
+
+#, c-format
+msgid "too many redirections\n"
+msgstr "trop de redirections\n"
+
+#, fuzzy, c-format
+#| msgid "writing to '%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "écriture de « %s »\n"
+
+#, c-format
msgid "error allocating memory: %s\n"
msgstr "erreur d'allocation de mémoire : %s\n"
@@ -8629,14 +8642,6 @@ msgid "error reading HTTP response for '%s': %s\n"
msgstr "erreur de lecture de réponse HTTP pour « %s » : %s\n"
#, c-format
-msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr "URL « %s » redirigée vers « %s » (%u)\n"
-
-#, c-format
-msgid "too many redirections\n"
-msgstr "trop de redirections\n"
-
-#, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "erreur d'analyse de réponse OCSP pour « %s » : %s\n"
diff --git a/po/gl.po b/po/gl.po
index a8ac8ab..61942eb 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -8478,6 +8478,19 @@ msgstr ""
msgid "error accessing '%s': http status %u\n"
msgstr "erro lendo `%s': %s\n"
+#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "too many redirections\n"
+msgstr "demasiadas preferencias `%c'\n"
+
+#, fuzzy, c-format
+#| msgid "writing to `%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "escribindo a `%s'\n"
+
#, fuzzy, c-format
msgid "error allocating memory: %s\n"
msgstr "erro ao crea-lo chaveiro `%s': %s\n"
@@ -8580,14 +8593,6 @@ msgstr "erro escribindo no chaveiro `%s': %s\n"
msgid "error reading HTTP response for '%s': %s\n"
msgstr "erro lendo `%s': %s\n"
-#, c-format
-msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "too many redirections\n"
-msgstr "demasiadas preferencias `%c'\n"
-
#, fuzzy, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "erro ao enviar a `%s': %s\n"
diff --git a/po/hu.po b/po/hu.po
index c594a62..c45dac1 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8429,6 +8429,19 @@ msgstr ""
msgid "error accessing '%s': http status %u\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
+#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "too many redirections\n"
+msgstr "Túl sok \"%c\" preferencia.\n"
+
+#, fuzzy, c-format
+#| msgid "writing to `%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "Írok a \"%s\" állományba.\n"
+
#, fuzzy, c-format
msgid "error allocating memory: %s\n"
msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
@@ -8531,14 +8544,6 @@ msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
msgid "error reading HTTP response for '%s': %s\n"
msgstr "Hiba \"%s\" olvasásakor: %s\n"
-#, c-format
-msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "too many redirections\n"
-msgstr "Túl sok \"%c\" preferencia.\n"
-
#, fuzzy, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "Hiba %s-ra/-re küldéskor: %s\n"
diff --git a/po/id.po b/po/id.po
index c0d8069..00d416a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -8422,6 +8422,19 @@ msgstr ""
msgid "error accessing '%s': http status %u\n"
msgstr "kesalahan membaca `%s': %s\n"
+#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "too many redirections\n"
+msgstr "terlalu banyak preferensi `%c'\n"
+
+#, fuzzy, c-format
+#| msgid "writing to `%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "menulis ke `%s'\n"
+
#, fuzzy, c-format
msgid "error allocating memory: %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
@@ -8524,14 +8537,6 @@ msgstr "kesalahan menulis keyring `%s': %s\n"
msgid "error reading HTTP response for '%s': %s\n"
msgstr "kesalahan membaca `%s': %s\n"
-#, c-format
-msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "too many redirections\n"
-msgstr "terlalu banyak preferensi `%c'\n"
-
#, fuzzy, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
diff --git a/po/it.po b/po/it.po
index 49a5784..42fdee3 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8463,6 +8463,19 @@ msgstr ""
msgid "error accessing '%s': http status %u\n"
msgstr "errore leggendo `%s': %s\n"
+#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "too many redirections\n"
+msgstr "ci sono troppe preferenze `%c'\n"
+
+#, fuzzy, c-format
+#| msgid "writing to `%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "scrittura in `%s'\n"
+
#, fuzzy, c-format
msgid "error allocating memory: %s\n"
msgstr "errore creando il portachiavi `%s': %s\n"
@@ -8565,14 +8578,6 @@ msgstr "errore scrivendo il portachiavi `%s': %s\n"
msgid "error reading HTTP response for '%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
-#, c-format
-msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "too many redirections\n"
-msgstr "ci sono troppe preferenze `%c'\n"
-
#, fuzzy, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
diff --git a/po/ja.po b/po/ja.po
index c891b23..cde684b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7943,6 +7943,19 @@ msgid "error accessing '%s': http status %u\n"
msgstr "'%s'へアクセスのエラー: httpステイタス %u\n"
#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr "URL'%s' は '%s' (%u) へリダイレクトされました\n"
+
+#, c-format
+msgid "too many redirections\n"
+msgstr "リダイレクトが多すぎます\n"
+
+#, fuzzy, c-format
+#| msgid "writing to '%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "'%s'への書き込み\n"
+
+#, c-format
msgid "error allocating memory: %s\n"
msgstr "メモリの確保のエラー: %s\n"
@@ -8043,14 +8056,6 @@ msgid "error reading HTTP response for '%s': %s\n"
msgstr "'%s'のHTTP応答の読み込みエラー: %s\n"
#, c-format
-msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr "URL'%s' は '%s' (%u) へリダイレクトされました\n"
-
-#, c-format
-msgid "too many redirections\n"
-msgstr "リダイレクトが多すぎます\n"
-
-#, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "'%s'に対するOCSP応答構文解析エラー: %s\n"
diff --git a/po/nb.po b/po/nb.po
index b6a9698..159349f 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8083,6 +8083,19 @@ msgid "error accessing '%s': http status %u\n"
msgstr "fikk ikke tilgang til «%s»: http-status %u\n"
#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr "Videresendt fra adresse «%s» til «%s» (%u)\n"
+
+#, c-format
+msgid "too many redirections\n"
+msgstr "for mange videresendinger\n"
+
+#, fuzzy, c-format
+#| msgid "writing to '%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "skriver til «%s»\n"
+
+#, c-format
msgid "error allocating memory: %s\n"
msgstr "feil under minnetildeling: %s\n"
@@ -8183,14 +8196,6 @@ msgid "error reading HTTP response for '%s': %s\n"
msgstr "feil under lesing av HTTP-svar for «%s»: %s\n"
#, c-format
-msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr "Videresendt fra adresse «%s» til «%s» (%u)\n"
-
-#, c-format
-msgid "too many redirections\n"
-msgstr "for mange videresendinger\n"
-
-#, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "feil under tolking av OCSP-svar for «%s»: %s\n"
diff --git a/po/pl.po b/po/pl.po
index 52861fc..4b775d4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8773,6 +8773,20 @@ msgstr ""
msgid "error accessing '%s': http status %u\n"
msgstr "błąd uruchamiania ,,%s'': kod wyjścia %d\n"
+#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "too many cipher preferences\n"
+msgid "too many redirections\n"
+msgstr "zbyt wiele ustawień szyfru\n"
+
+#, fuzzy, c-format
+#| msgid "writing to `%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "zapis do ,,%s''\n"
+
#, fuzzy, c-format
#| msgid "error allocating enough memory: %s\n"
msgid "error allocating memory: %s\n"
@@ -8889,15 +8903,6 @@ msgstr "błąd zapisu do ,,%s'': %s\n"
msgid "error reading HTTP response for '%s': %s\n"
msgstr "błąd odczytu z %s: %s\n"
-#, c-format
-msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr ""
-
-#, fuzzy, c-format
-#| msgid "too many cipher preferences\n"
-msgid "too many redirections\n"
-msgstr "zbyt wiele ustawień szyfru\n"
-
#, fuzzy, c-format
#| msgid "error binding socket to `%s': %s\n"
msgid "error parsing OCSP response for '%s': %s\n"
diff --git a/po/pt.po b/po/pt.po
index 2e2e035..578649a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8423,6 +8423,19 @@ msgstr ""
msgid "error accessing '%s': http status %u\n"
msgstr "erro na leitura de `%s': %s\n"
+#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "too many redirections\n"
+msgstr "demasiadas preferências `%c'\n"
+
+#, fuzzy, c-format
+#| msgid "writing to `%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "a escrever para `%s'\n"
+
#, fuzzy, c-format
msgid "error allocating memory: %s\n"
msgstr "erro ao criar porta-chaves `%s': %s\n"
@@ -8525,14 +8538,6 @@ msgstr "erro na escrita do porta-chaves `%s': %s\n"
msgid "error reading HTTP response for '%s': %s\n"
msgstr "erro na leitura de `%s': %s\n"
-#, c-format
-msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "too many redirections\n"
-msgstr "demasiadas preferências `%c'\n"
-
#, fuzzy, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "erro ao enviar para `%s': %s\n"
diff --git a/po/ro.po b/po/ro.po
index f9510ba..0f5dced 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8533,6 +8533,20 @@ msgstr ""
msgid "error accessing '%s': http status %u\n"
msgstr "eroare la citire `%s': %s\n"
+#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "too many cipher preferences\n"
+msgid "too many redirections\n"
+msgstr "prea multe preferinţe de cifrare\n"
+
+#, fuzzy, c-format
+#| msgid "writing to `%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "scriu în `%s'\n"
+
#, fuzzy, c-format
msgid "error allocating memory: %s\n"
msgstr "eroare la crearea inelului de chei `%s': %s\n"
@@ -8637,15 +8651,6 @@ msgstr "eroare la scrierea inelului de chei `%s': %s\n"
msgid "error reading HTTP response for '%s': %s\n"
msgstr "eroare la citire `%s': %s\n"
-#, c-format
-msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr ""
-
-#, fuzzy, c-format
-#| msgid "too many cipher preferences\n"
-msgid "too many redirections\n"
-msgstr "prea multe preferinţe de cifrare\n"
-
#, fuzzy, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "eroare trimitere la `%s': %s\n"
diff --git a/po/ru.po b/po/ru.po
index a44b1ac..6972220 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8197,6 +8197,19 @@ msgid "error accessing '%s': http status %u\n"
msgstr "ошибка чтения '%s': статус HTTP %u\n"
#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr "URL '%s' перенаправлен на '%s' (%u)\n"
+
+#, c-format
+msgid "too many redirections\n"
+msgstr "слишком много перенаправлений\n"
+
+#, fuzzy, c-format
+#| msgid "writing to '%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "сохраняю в '%s'\n"
+
+#, c-format
msgid "error allocating memory: %s\n"
msgstr "ошибка выделения памяти: %s\n"
@@ -8297,14 +8310,6 @@ msgid "error reading HTTP response for '%s': %s\n"
msgstr "ошибка чтения ответа HTTP для '%s': %s\n"
#, c-format
-msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr "URL '%s' перенаправлен на '%s' (%u)\n"
-
-#, c-format
-msgid "too many redirections\n"
-msgstr "слишком много перенаправлений\n"
-
-#, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "ошибка разбора ответа OCSP для '%s': %s\n"
diff --git a/po/sk.po b/po/sk.po
index 36c4e67..c8a58fb 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8453,6 +8453,19 @@ msgstr ""
msgid "error accessing '%s': http status %u\n"
msgstr "chyba pri čítaní `%s': %s\n"
+#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "too many redirections\n"
+msgstr "príliš veľa `%c' predvolieb\n"
+
+#, fuzzy, c-format
+#| msgid "writing to `%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "zapisujem do '%s'\n"
+
#, fuzzy, c-format
msgid "error allocating memory: %s\n"
msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
@@ -8555,14 +8568,6 @@ msgstr "chyba pri zápise súboru kľúčov (keyring) `%s': %s\n"
msgid "error reading HTTP response for '%s': %s\n"
msgstr "chyba pri čítaní `%s': %s\n"
-#, c-format
-msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "too many redirections\n"
-msgstr "príliš veľa `%c' predvolieb\n"
-
#, fuzzy, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "chyba pri posielaní na `%s': %s\n"
diff --git a/po/sv.po b/po/sv.po
index 5091570..b763b8d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8851,6 +8851,20 @@ msgstr ""
msgid "error accessing '%s': http status %u\n"
msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
+#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "too many cipher preferences\n"
+msgid "too many redirections\n"
+msgstr "för många chifferinställningar\n"
+
+#, fuzzy, c-format
+#| msgid "writing to `%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "skriver till \"%s\"\n"
+
#, fuzzy, c-format
#| msgid "error allocating enough memory: %s\n"
msgid "error allocating memory: %s\n"
@@ -8967,15 +8981,6 @@ msgstr "fel vid skrivning till \"%s\": %s\n"
msgid "error reading HTTP response for '%s': %s\n"
msgstr "fel vid läsning från %s: %s\n"
-#, c-format
-msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr ""
-
-#, fuzzy, c-format
-#| msgid "too many cipher preferences\n"
-msgid "too many redirections\n"
-msgstr "för många chifferinställningar\n"
-
#, fuzzy, c-format
#| msgid "error binding socket to `%s': %s\n"
msgid "error parsing OCSP response for '%s': %s\n"
diff --git a/po/tr.po b/po/tr.po
index 6451e4e..8e76bf2 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8750,6 +8750,20 @@ msgstr ""
msgid "error accessing '%s': http status %u\n"
msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
+#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "too many cipher preferences\n"
+msgid "too many redirections\n"
+msgstr "çok fazla şifreleme tercihi\n"
+
+#, fuzzy, c-format
+#| msgid "writing to `%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "\"%s\"e yazıyor\n"
+
#, fuzzy, c-format
#| msgid "error allocating enough memory: %s\n"
msgid "error allocating memory: %s\n"
@@ -8866,15 +8880,6 @@ msgstr "`%s' yazılırken hata: %s\n"
msgid "error reading HTTP response for '%s': %s\n"
msgstr "%s okunurken hata: %s\n"
-#, c-format
-msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr ""
-
-#, fuzzy, c-format
-#| msgid "too many cipher preferences\n"
-msgid "too many redirections\n"
-msgstr "çok fazla şifreleme tercihi\n"
-
#, fuzzy, c-format
#| msgid "error binding socket to `%s': %s\n"
msgid "error parsing OCSP response for '%s': %s\n"
diff --git a/po/uk.po b/po/uk.po
index fae0cd8..ea8270b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8326,6 +8326,19 @@ msgid "error accessing '%s': http status %u\n"
msgstr "помилка під час спроби доступу до «%s»: стан http %u\n"
#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr "Адресу «%s» переспрямовано до «%s» (%u)\n"
+
+#, c-format
+msgid "too many redirections\n"
+msgstr "занадто багато переспрямувань\n"
+
+#, fuzzy, c-format
+#| msgid "writing to '%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "записуємо до «%s»\n"
+
+#, c-format
msgid "error allocating memory: %s\n"
msgstr "помилка під час спроби отримання області пам’яті: %s\n"
@@ -8426,14 +8439,6 @@ msgid "error reading HTTP response for '%s': %s\n"
msgstr "помилка під час спроби читання відповіді за HTTP для «%s»: %s\n"
#, c-format
-msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr "Адресу «%s» переспрямовано до «%s» (%u)\n"
-
-#, c-format
-msgid "too many redirections\n"
-msgstr "занадто багато переспрямувань\n"
-
-#, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "помилка під час обробки відповіді за OCSP для «%s»: %s\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 577a8c9..ae0fdc4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,13 +7,13 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU gnupg 2.3.0-beta485\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
"PO-Revision-Date: 2018-12-07 20:59+0800\n"
"Last-Translator: Chuhao Li <lchopn at gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh at googlegroups.com>\n"
"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-SourceCharset: iso-8859-1\n"
"X-Poedit-Basepath: .\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -197,10 +197,9 @@ msgstr "PUK"
msgid "Reset Code"
msgstr "重置代码"
-msgid "Push ACK button on card/token."
-msgstr "按下 card/token 上的 ACK 按钮。"
-
-msgid "Use the reader's pinpad for input."
+#, fuzzy, c-format
+#| msgid "Use the reader's pinpad for input."
+msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr "使用读卡器的小键盘输入。"
msgid "Repeat this Reset Code"
@@ -808,32 +807,28 @@ msgstr "警告： “%s%s” 是一个废弃的选项 - 此选项不会产生作
msgid "unknown debug flag '%s' ignored\n"
msgstr "未知的调试选项 ‘%s’ 已被忽略\n"
-#, c-format
-msgid "waiting for the dirmngr to come up ... (%ds)\n"
-msgstr "等待 dirmngr 启动 ... (%ds)\n"
-
-#, c-format
-msgid "waiting for the agent to come up ... (%ds)\n"
+#, fuzzy, c-format
+#| msgid "waiting for the agent to come up ... (%ds)\n"
+msgid "waiting for the %s to come up ... (%ds)\n"
msgstr "等待代理人程序启动 ... (%ds)\n"
-#, c-format
-msgid "connection to the dirmngr established\n"
-msgstr "与 dirmngr 的连接已建立\n"
-
-#, c-format
-msgid "connection to the agent established\n"
+#, fuzzy, c-format
+#| msgid "connection to the agent established\n"
+msgid "connection to %s established\n"
msgstr "到代理人程序的连接已建立\n"
#, c-format
msgid "no running gpg-agent - starting '%s'\n"
msgstr "没有正在运行的 gpg-agent 实例 - 正在启动 ‘%s’\n"
-#, c-format
-msgid "connection to the agent is in restricted mode\n"
+#, fuzzy, c-format
+#| msgid "connection to the agent is in restricted mode\n"
+msgid "connection to agent is in restricted mode\n"
msgstr "与代理人程序的连接处于限制模式\n"
-#, c-format
-msgid "no running dirmngr - starting '%s'\n"
+#, fuzzy, c-format
+#| msgid "no running dirmngr - starting '%s'\n"
+msgid "no running Dirmngr - starting '%s'\n"
msgstr "没有正在运行的 dirmngr 实例 - 正在启动‘%s’\n"
#. TRANSLATORS: Copy the prefix between the vertical bars
@@ -1250,11 +1245,16 @@ msgstr "您的选择是？ "
msgid "[not set]"
msgstr "[未设定]"
-msgid "Mr."
-msgstr "先生"
+msgid "male"
+msgstr ""
-msgid "Mrs."
-msgstr "女士"
+msgid "female"
+msgstr ""
+
+#, fuzzy
+#| msgid "No reason specified"
+msgid "unspecified"
+msgstr "未指定原因"
msgid "not forced"
msgstr "非强制"
@@ -1307,8 +1307,8 @@ msgstr "错误：偏好字符串长度无效。\n"
msgid "Error: invalid characters in preference string.\n"
msgstr "错误：偏好字符串中存在无效字符。\n"
-msgid "Salutation (M = Mr., F = Mrs., or space): "
-msgstr "称呼（M = 先生，F = 女士，或者留空)： "
+msgid "Sex ((M)ale, (F)emale or space): "
+msgstr ""
msgid "Error: invalid response.\n"
msgstr "错误：无效的响应。\n"
@@ -1333,11 +1333,16 @@ msgstr "取得当前密钥信息时出错：%s\n"
msgid "Replace existing key? (y/N) "
msgstr "替换现存的密钥？(y/N) "
+#, fuzzy
+#| msgid ""
+#| "Note: There is no guarantee that the card supports the requested\n"
+#| " key type or size. If the key generation does not succeed,\n"
+#| " please check the documentation of your card to see which\n"
+#| " key types and sizes are supported.\n"
msgid ""
-"Note: There is no guarantee that the card supports the requested\n"
-" key type or size. If the key generation does not succeed,\n"
-" please check the documentation of your card to see which\n"
-" key types and sizes are supported.\n"
+"Note: There is no guarantee that the card supports the requested size.\n"
+" If the key generation does not succeed, please check the\n"
+" documentation of your card to see what sizes are allowed.\n"
msgstr ""
"注意：此处并不保证此卡片支持所请求的\n"
" 密钥类型或者长度。如果密钥没有成功生成，\n"
@@ -1455,10 +1460,6 @@ msgstr "真的要执行恢复出厂设置吗？ (输入“yes”) "
msgid "error for setup KDF: %s\n"
msgstr "设置 KDF 时出现错误： %s\n"
-#, c-format
-msgid "error for setup UIF: %s\n"
-msgstr "设置 KDF 时出现错误： %s\n"
-
msgid "quit this menu"
msgstr "退出此菜单"
@@ -1486,8 +1487,10 @@ msgstr "更改登录名"
msgid "change the language preferences"
msgstr "更改语言偏好"
-msgid "change card holder's salutation"
-msgstr "变更卡片持有人的称呼"
+#, fuzzy
+#| msgid "change card holder's name"
+msgid "change card holder's sex"
+msgstr "更改卡持有人的姓名"
msgid "change a CA fingerprint"
msgstr "更改一个 CA 指纹"
@@ -1516,9 +1519,6 @@ msgstr "针对 PIN 身份验证设置 KDF"
msgid "change the key attribute"
msgstr "更改密钥属性"
-msgid "change the User Interaction Flag"
-msgstr "变更用户交互选项"
-
msgid "gpg/card> "
msgstr "gpg/card> "
@@ -1602,8 +1602,9 @@ msgstr "创建密码时出现错误：%s\n"
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "由于在 S2K 模式，不能使用一个对称的 ESK 封包\n"
-#, c-format
-msgid "using cipher %s.%s\n"
+#, fuzzy, c-format
+#| msgid "using cipher %s.%s\n"
+msgid "using cipher %s\n"
msgstr "使用密文 %s.%s\n"
#, c-format
@@ -1641,16 +1642,18 @@ msgstr "警告： 强制压缩算法 %s (%d) 与接收者的偏好设置冲突\n
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "强行对称密文算法 %s (%d) 与接收者的偏好设置冲突\n"
-#, c-format
-msgid "%s/%s.%s encrypted for: \"%s\"\n"
+#, fuzzy, c-format
+#| msgid "%s/%s.%s encrypted for: \"%s\"\n"
+msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s.%s 已加密给 \"%s\"\n"
#, c-format
msgid "option '%s' may not be used in %s mode\n"
msgstr "选项 ‘%s’ 可能不能用于 %s 模式\n"
-#, c-format
-msgid "%s.%s encrypted data\n"
+#, fuzzy, c-format
+#| msgid "%s.%s encrypted data\n"
+msgid "%s encrypted data\n"
msgstr "%s.%s 已加密的数据\n"
#, c-format
@@ -1726,9 +1729,6 @@ msgstr "导出时移除密钥中未使用的部分"
msgid "remove as much as possible from key during export"
msgstr "导出时尽可能移除密钥中的可选部分"
-msgid "Do not export user id or attribute packets"
-msgstr "不要导出用户标识或者属性包"
-
msgid "use the GnuPG key backup format"
msgstr "使用 GnuPG 密钥备份格式"
@@ -2273,10 +2273,6 @@ msgid "selected cipher algorithm is invalid\n"
msgstr "所选的密文算法无效\n"
#, c-format
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "所选择的 AEAD 算法无效\n"
-
-#, c-format
msgid "selected compression algorithm is invalid\n"
msgstr "所选的压缩算法无效\n"
@@ -2321,10 +2317,6 @@ msgid "invalid personal cipher preferences\n"
msgstr "无效的个人密文偏好设置\n"
#, c-format
-msgid "invalid personal AEAD preferences\n"
-msgstr "无效的个人 AEAD 偏好设置\n"
-
-#, c-format
msgid "invalid personal digest preferences\n"
msgstr "无效的个人摘要算法偏好设置\n"
@@ -2333,18 +2325,10 @@ msgid "invalid personal compress preferences\n"
msgstr "无效的个人压缩算法首选项\n"
#, c-format
-msgid "chunk size invalid - using %d\n"
-msgstr "块大小无效 - 使用 %d\n"
-
-#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 尚不能和 %s 并用\n"
#, c-format
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr "AEAD 算法‘%s’不能在 %s 模式下使用\n"
-
-#, c-format
msgid "digest algorithm '%s' may not be used in %s mode\n"
msgstr "摘要算法‘%s’不能在 %s 模式下使用\n"
@@ -2497,9 +2481,6 @@ msgstr "导入后移除密钥中无用的部分"
msgid "remove as much as possible from key after import"
msgstr "导入后尽可能多地移除密钥中的可选部分"
-msgid "Do not import user id or attribute packets"
-msgstr "不要导入用户标识或者属性包"
-
msgid "run import filters and export key immediately"
msgstr "运行导入过滤器并立即导出密钥"
@@ -2594,10 +2575,6 @@ msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " “%s”：密文算法 %s 的首选项\n"
#, c-format
-msgid " \"%s\": preference for AEAD algorithm %s\n"
-msgstr " \"%s\"：关于 AEAD 算法 %s 的偏好设置\n"
-
-#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " “%s”：散列算法 %s 对应首选项\n"
@@ -3384,9 +3361,6 @@ msgstr "“%s” 不是一个正确的指纹\n"
msgid "subkey \"%s\" not found\n"
msgstr "子密钥 “%s” 未找到\n"
-msgid "AEAD: "
-msgstr "AEAD： "
-
msgid "Digest: "
msgstr "摘要： "
@@ -3728,10 +3702,6 @@ msgid "too many compression preferences\n"
msgstr "过多的压缩算法偏好设置\n"
#, c-format
-msgid "too many AEAD preferences\n"
-msgstr "过多的 AEAD 偏好设置\n"
-
-#, c-format
msgid "invalid item '%s' in preference string\n"
msgstr "首选项字符串里有无效项‘%s’\n"
@@ -4331,15 +4301,12 @@ msgstr "警告：无法获取 URI %s：%s\n"
msgid "weird size for an encrypted session key (%d)\n"
msgstr "奇怪的加密会话密钥长度（%d）\n"
-#, c-format
-msgid "%s.%s encrypted session key\n"
+#, fuzzy, c-format
+#| msgid "%s.%s encrypted session key\n"
+msgid "%s encrypted session key\n"
msgstr "%s.%s 已加密的会话密钥\n"
#, c-format
-msgid "encrypted with unknown algorithm %d.%s\n"
-msgstr "以下列未知算法加密 %d.%s\n"
-
-#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "密码由未知的散列算法 %d 生成\n"
@@ -4348,6 +4315,10 @@ msgid "public key is %s\n"
msgstr "公钥是 %s\n"
#, c-format
+msgid "public key encrypted data: good DEK\n"
+msgstr "公钥加密数据：完好的数据加密密钥（DEK）\n"
+
+#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "由 %u 位的 %s 密钥加密，标识为 %s，生成于 %s\n"
@@ -4360,6 +4331,10 @@ msgid "encrypted with %s key, ID %s\n"
msgstr "由 %s 密钥加密、密钥号为 %s\n"
#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "公钥解密失败：%s\n"
+
+#, c-format
msgid "WARNING: multiple plaintexts seen\n"
msgstr "警告： 检测到多重纯文本\n"
@@ -4372,14 +4347,6 @@ msgid "encrypted with 1 passphrase\n"
msgstr "以 1 个密码加密\n"
#, c-format
-msgid "public key decryption failed: %s\n"
-msgstr "公钥解密失败：%s\n"
-
-#, c-format
-msgid "public key encrypted data: good DEK\n"
-msgstr "公钥加密数据：完好的数据加密密钥（DEK）\n"
-
-#, c-format
msgid "assuming %s encrypted data\n"
msgstr "假定 %s 为加密过的数据\n"
@@ -5301,8 +5268,9 @@ msgstr "警告：强制摘要算法 %s (%d) 与接收者的偏好设置冲突\n"
msgid "signing:"
msgstr "正在签名："
-#, c-format
-msgid "%s.%s encryption will be used\n"
+#, fuzzy, c-format
+#| msgid "%s.%s encryption will be used\n"
+msgid "%s encryption will be used\n"
msgstr "%s.%s 加密将被使用\n"
#, c-format
@@ -5941,14 +5909,6 @@ msgstr "输入行 %u 太长或者行末的 LF 缺失\n"
msgid "can't open fd %d: %s\n"
msgstr "无法打开 fd %d：%s\n"
-#, c-format
-msgid "WARNING: encrypting without integrity protection is dangerous\n"
-msgstr "警告：无完整性保护的加密是危险的\n"
-
-#, c-format
-msgid "Hint: Do not use option %s\n"
-msgstr "提示：不要使用选项 %s\n"
-
msgid "set debugging flags"
msgstr "设置调试选项"
@@ -7926,6 +7886,19 @@ msgid "error accessing '%s': http status %u\n"
msgstr "访问‘%s’时出现错误：http 状态码 %u\n"
#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr "URL '%s' 重定向到 '%s' (%u)\n"
+
+#, c-format
+msgid "too many redirections\n"
+msgstr "过多重定向\n"
+
+#, fuzzy, c-format
+#| msgid "writing to '%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "正在写入‘%s’\n"
+
+#, c-format
msgid "error allocating memory: %s\n"
msgstr "分配内存时出现错误：%s\n"
@@ -8026,14 +7999,6 @@ msgid "error reading HTTP response for '%s': %s\n"
msgstr "读取‘%s’的 HTTP 响应时出现错误：%s\n"
#, c-format
-msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr "URL '%s' 重定向到 '%s' (%u)\n"
-
-#, c-format
-msgid "too many redirections\n"
-msgstr "过多重定向\n"
-
-#, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "处理‘%s’的 OCSP 响应时出现错误：%s\n"
@@ -8643,3 +8608,66 @@ msgid ""
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"
+
+#~ msgid "connection to the dirmngr established\n"
+#~ msgstr "与 dirmngr 的连接已建立\n"
+
+#~ msgid "Mr."
+#~ msgstr "先生"
+
+#~ msgid "Mrs."
+#~ msgstr "女士"
+
+#~ msgid "Salutation (M = Mr., F = Mrs., or space): "
+#~ msgstr "称呼（M = 先生，F = 女士，或者留空)： "
+
+#~ msgid "error for setup UIF: %s\n"
+#~ msgstr "设置 KDF 时出现错误： %s\n"
+
+#~ msgid "change card holder's salutation"
+#~ msgstr "变更卡片持有人的称呼"
+
+#~ msgid "change the User Interaction Flag"
+#~ msgstr "变更用户交互选项"
+
+#~ msgid "Do not export user id or attribute packets"
+#~ msgstr "不要导出用户标识或者属性包"
+
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "所选择的 AEAD 算法无效\n"
+
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "无效的个人 AEAD 偏好设置\n"
+
+#~ msgid "chunk size invalid - using %d\n"
+#~ msgstr "块大小无效 - 使用 %d\n"
+
+#~ msgid "AEAD algorithm '%s' may not be used in %s mode\n"
+#~ msgstr "AEAD 算法‘%s’不能在 %s 模式下使用\n"
+
+#~ msgid "Do not import user id or attribute packets"
+#~ msgstr "不要导入用户标识或者属性包"
+
+#~ msgid " \"%s\": preference for AEAD algorithm %s\n"
+#~ msgstr " \"%s\"：关于 AEAD 算法 %s 的偏好设置\n"
+
+#~ msgid "AEAD: "
+#~ msgstr "AEAD： "
+
+#~ msgid "too many AEAD preferences\n"
+#~ msgstr "过多的 AEAD 偏好设置\n"
+
+#~ msgid "encrypted with unknown algorithm %d.%s\n"
+#~ msgstr "以下列未知算法加密 %d.%s\n"
+
+#~ msgid "WARNING: encrypting without integrity protection is dangerous\n"
+#~ msgstr "警告：无完整性保护的加密是危险的\n"
+
+#~ msgid "Hint: Do not use option %s\n"
+#~ msgstr "提示：不要使用选项 %s\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 908aa6e..89dab47 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8085,6 +8085,19 @@ msgid "error accessing '%s': http status %u\n"
msgstr "存取 '%s' 時出錯: http 狀態 %u\n"
#, c-format
+msgid "URL '%s' redirected to '%s' (%u)\n"
+msgstr "網址 '%s' 重新轉向至 '%s' (%u)\n"
+
+#, c-format
+msgid "too many redirections\n"
+msgstr "太多重新導向\n"
+
+#, fuzzy, c-format
+#| msgid "writing to '%s'\n"
+msgid "redirection changed to '%s'\n"
+msgstr "正在寫入 '%s'\n"
+
+#, c-format
msgid "error allocating memory: %s\n"
msgstr "配置記憶體時出錯: %s\n"
@@ -8186,14 +8199,6 @@ msgid "error reading HTTP response for '%s': %s\n"
msgstr "讀取 '%s' HTTP 回應時出錯: %s\n"
#, c-format
-msgid "URL '%s' redirected to '%s' (%u)\n"
-msgstr "網址 '%s' 重新轉向至 '%s' (%u)\n"
-
-#, c-format
-msgid "too many redirections\n"
-msgstr "太多重新導向\n"
-
-#, c-format
msgid "error parsing OCSP response for '%s': %s\n"
msgstr "剖析 '%s' OCSP 回應時出錯: %s\n"
-----------------------------------------------------------------------
Summary of changes:
NEWS | 40 +++++++++-
README | 11 +--
configure.ac | 2 +-
po/ca.po | 21 +++--
po/cs.po | 22 ++++--
po/da.po | 23 +++---
po/de.po | 21 +++--
po/el.po | 21 +++--
po/eo.po | 21 +++--
po/es.po | 21 +++--
po/et.po | 21 +++--
po/fi.po | 21 +++--
po/fr.po | 21 +++--
po/gl.po | 21 +++--
po/hu.po | 21 +++--
po/id.po | 21 +++--
po/it.po | 21 +++--
po/ja.po | 21 +++--
po/nb.po | 21 +++--
po/pl.po | 23 +++---
po/pt.po | 21 +++--
po/ro.po | 23 +++---
po/ru.po | 21 +++--
po/sk.po | 21 +++--
po/sv.po | 23 +++---
po/tr.po | 23 +++---
po/uk.po | 21 +++--
po/zh_CN.po | 254 +++++++++++++++++++++++++++++++++--------------------------
po/zh_TW.po | 21 +++--
29 files changed, 515 insertions(+), 328 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list