[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.1.20-127-g99e6835
by Werner Koch
cvs at cvs.gnupg.org
Mon May 15 19:25:51 CEST 2017
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 99e68350a8a94b98a0864d858720859196168a6f (commit)
via 9574820329128f0ea8a98f9bfc0e77c73c3e0ec0 (commit)
via bd6074fbab83138e7ab6acd6a69fb6533bd3618a (commit)
via 4bd079dbdb44067688377156413dd32a82a89d22 (commit)
via 2d381b0f0ba97657e9fb2971eca6648bb77dd2cc (commit)
from abe3a9043f86b48b92ddcec47197e032e35a6f4f (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 99e68350a8a94b98a0864d858720859196168a6f
Author: Werner Koch <wk at gnupg.org>
Date: Mon May 15 17:21:58 2017 +0200
Post release updates
--
diff --git a/NEWS b/NEWS
index 574f7da..e2d282a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 2.1.22 (unreleased)
+-------------------------------------------------
+
+
Noteworthy changes in version 2.1.21 (2017-05-15)
-------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 9395fb8..da341d0 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], [1])
-m4_define([mym4_micro], [21])
+m4_define([mym4_micro], [22])
# 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 9574820329128f0ea8a98f9bfc0e77c73c3e0ec0
Author: Werner Koch <wk at gnupg.org>
Date: Mon May 15 16:11:09 2017 +0200
Release 2.1.21
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/NEWS b/NEWS
index 3c2b899..574f7da 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,25 @@
-Noteworthy changes in version 2.1.21 (unreleased)
+Noteworthy changes in version 2.1.21 (2017-05-15)
-------------------------------------------------
+ * gpg,gpgsm: Fix corruption of old style keyring.gpg files. This
+ bug was introduced with version 2.1.20. Note that the default
+ pubring.kbx format was not affected.
+
+ * gpg,dirmngr: Removed the skeleton config file support. The
+ system's standard methods for providing default configuration
+ files should be used instead.
+
+ * w32: The Windows installer now allows installion of GnuPG without
+ Administrator permissions.
+
+ * gpg: Fixed import filter property match bug.
+
+ * scd: Removed Linux support for Cardman 4040 PCMCIA reader.
+
+ * scd: Fixed some corner case bugs in resume/suspend handling.
+
+ * Many minor bug fixes and code cleanup.
+
Noteworthy changes in version 2.1.20 (2017-04-03)
-------------------------------------------------
diff --git a/README b/README
index 0ff9099..8be43d7 100644
--- a/README
+++ b/README
@@ -24,19 +24,10 @@
can be freely used, modified and distributed under the terms of the
GNU General Public License.
- We are currently maintaining three branches of GnuPG:
-
- - 2.1 (i.e. this release) is the latest stable version with a lot of
- new features.
-
- - 2.0 is an often used stable version. This branch will reach
- end-of-life on 2017-12-31.
-
- - 1.4 is the old standalone version which is most suitable for older
- or embedded platforms.
-
- You may not install 2.1 and 2.0 at the same time. However, it is
- possible to install 1.4 along with any of the 2.x versions.
+ 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.1.x version along
+ with any 2.0.x version. However, it is possible to install GnuPG
+ 1.4 along with a 2.x version.
* BUILD INSTRUCTIONS
commit bd6074fbab83138e7ab6acd6a69fb6533bd3618a
Author: Werner Koch <wk at gnupg.org>
Date: Mon May 15 16:04:06 2017 +0200
po: Auto-update
--
diff --git a/po/ca.po b/po/ca.po
index 8e57af2..950d95c 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -4995,17 +4995,6 @@ msgstr "s'està escrivint en stdout\n"
msgid "assuming signed data in '%s'\n"
msgstr "s'asumeix que hi ha dades signades en «%s»\n"
-#, fuzzy, c-format
-#| msgid "new configuration file `%s' created\n"
-msgid "new configuration file '%s' created\n"
-msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
-
-#, fuzzy, c-format
-#| msgid "WARNING: options in `%s' are not yet active during this run\n"
-msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr ""
-"AVÍS: les opcions en «%s» encara no estan actives durant aquesta execució\n"
-
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "no es pot treballar amb l'algoritme de clau pública %d\n"
@@ -5974,9 +5963,6 @@ msgstr[1] ""
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
-msgid ", "
-msgstr ""
-
#, fuzzy
#| msgid "list keys"
msgid "this key"
@@ -9162,6 +9148,18 @@ msgid ""
msgstr ""
#, fuzzy
+#~| msgid "new configuration file `%s' created\n"
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
+
+#, fuzzy
+#~| msgid "WARNING: options in `%s' are not yet active during this run\n"
+#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
+#~ msgstr ""
+#~ "AVÍS: les opcions en «%s» encara no estan actives durant aquesta "
+#~ "execució\n"
+
+#, fuzzy
#~| msgid "Key generation failed: %s\n"
#~ msgid "User ID revocation failed: %s\n"
#~ msgstr "La generació de claus ha fallat: %s\n"
diff --git a/po/cs.po b/po/cs.po
index a2e78e1..f0fe2d9 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4666,14 +4666,6 @@ msgid "assuming signed data in '%s'\n"
msgstr "v „%s“ se předpokládají podepsaná data\n"
#, c-format
-msgid "new configuration file '%s' created\n"
-msgstr "vytvořen nový konfigurační soubor „%s“\n"
-
-#, c-format
-msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr "VAROVÁNÍ: nastavení z „%s“ nejsou při tomto spuštění zatím aktivní\n"
-
-#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "nemohu pracovat s algoritmem veřejného klíče %d\n"
@@ -5630,9 +5622,6 @@ msgstr[2] ""
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
-msgid ", "
-msgstr ""
-
#, fuzzy
#| msgid "list keys"
msgid "this key"
@@ -8712,6 +8701,13 @@ msgstr ""
"Syntaxe: gpg-check-pattern [volby] soubor_se_vzorem\n"
"Prověří heslo zadané na vstupu proti souboru se vzory\n"
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr "vytvořen nový konfigurační soubor „%s“\n"
+
+#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
+#~ msgstr ""
+#~ "VAROVÁNÍ: nastavení z „%s“ nejsou při tomto spuštění zatím aktivní\n"
+
#, fuzzy
#~| msgid "Key generation failed: %s\n"
#~ msgid "User ID revocation failed: %s\n"
diff --git a/po/da.po b/po/da.po
index 2098d52..be65462 100644
--- a/po/da.po
+++ b/po/da.po
@@ -4892,17 +4892,6 @@ msgstr "skriver til stdout\n"
msgid "assuming signed data in '%s'\n"
msgstr "antager underskrevne data i »%s«\n"
-#, fuzzy, c-format
-#| msgid "new configuration file `%s' created\n"
-msgid "new configuration file '%s' created\n"
-msgstr "ny konfigurationsfil »%s« oprettet\n"
-
-#, fuzzy, c-format
-#| msgid "WARNING: options in `%s' are not yet active during this run\n"
-msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr ""
-"ADVARSEL: indstillinger i »%s« er endnu ikke aktive under denne kørsel\n"
-
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "kan ikke håndtere offentlig nøglealgoritme %d\n"
@@ -5876,9 +5865,6 @@ msgstr[1] ""
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
-msgid ", "
-msgstr ""
-
#, fuzzy
#| msgid "list keys"
msgid "this key"
@@ -9224,6 +9210,17 @@ msgstr ""
"Kontroller en adgangsfrase angivet på stdin mod mønsterfilen\n"
#, fuzzy
+#~| msgid "new configuration file `%s' created\n"
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr "ny konfigurationsfil »%s« oprettet\n"
+
+#, fuzzy
+#~| msgid "WARNING: options in `%s' are not yet active during this run\n"
+#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
+#~ msgstr ""
+#~ "ADVARSEL: indstillinger i »%s« er endnu ikke aktive under denne kørsel\n"
+
+#, fuzzy
#~| msgid "Key generation failed: %s\n"
#~ msgid "User ID revocation failed: %s\n"
#~ msgstr "Nøgleoprettelse mislykkedes: %s\n"
diff --git a/po/el.po b/po/el.po
index 58c66a7..96adc8e 100644
--- a/po/el.po
+++ b/po/el.po
@@ -4882,17 +4882,6 @@ msgstr "εγγραφή στην stdout\n"
msgid "assuming signed data in '%s'\n"
msgstr "υπόθεση υπογεγραμμένων δεδομένων στο `%s'\n"
-#, fuzzy, c-format
-#| msgid "new configuration file `%s' created\n"
-msgid "new configuration file '%s' created\n"
-msgstr "δημιουργήθηκε νέο αρχείο επιλογών `%s'\n"
-
-#, fuzzy, c-format
-#| msgid "WARNING: options in `%s' are not yet active during this run\n"
-msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr ""
-"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: οι επιλογες στο `%s' δεν είναι ενεργές σε αυτή την εκτέλεση\n"
-
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "αδυναμία χειρισμού του αλγόριθμου δημοσίου κλειδιού %d\n"
@@ -5847,9 +5836,6 @@ msgstr[1] ""
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
-msgid ", "
-msgstr ""
-
#, fuzzy
#| msgid "list keys"
msgid "this key"
@@ -8985,6 +8971,18 @@ msgid ""
msgstr ""
#, fuzzy
+#~| msgid "new configuration file `%s' created\n"
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr "δημιουργήθηκε νέο αρχείο επιλογών `%s'\n"
+
+#, fuzzy
+#~| msgid "WARNING: options in `%s' are not yet active during this run\n"
+#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
+#~ msgstr ""
+#~ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: οι επιλογες στο `%s' δεν είναι ενεργές σε αυτή την "
+#~ "εκτέλεση\n"
+
+#, fuzzy
#~| msgid "Key generation failed: %s\n"
#~ msgid "User ID revocation failed: %s\n"
#~ msgstr "Η δημιουργία κλειδιού απέτυχε: %s\n"
diff --git a/po/eo.po b/po/eo.po
index 7178bab..8ee1d6b 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -4857,14 +4857,6 @@ msgstr "skribas al la normala eligo\n"
msgid "assuming signed data in '%s'\n"
msgstr "supozas subskribitajn datenojn en '%s'\n"
-#, fuzzy, c-format
-msgid "new configuration file '%s' created\n"
-msgstr "%s: nova opcio-dosiero kreita\n"
-
-#, c-format
-msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr ""
-
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "ne povas trakti publikŝlosilan metodon %d\n"
@@ -5796,9 +5788,6 @@ msgstr[1] ""
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
-msgid ", "
-msgstr ""
-
#, fuzzy
#| msgid "list keys"
msgid "this key"
@@ -8929,6 +8918,10 @@ msgid ""
msgstr ""
#, fuzzy
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr "%s: nova opcio-dosiero kreita\n"
+
+#, fuzzy
#~| msgid "Key generation failed: %s\n"
#~ msgid "User ID revocation failed: %s\n"
#~ msgstr "Kreado de ŝlosiloj malsukcesis: %s\n"
diff --git a/po/es.po b/po/es.po
index 0b6b6bf..abc9b79 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4891,16 +4891,6 @@ msgstr "escribiendo en stdout\n"
msgid "assuming signed data in '%s'\n"
msgstr "asumiendo que hay datos firmados en `%s'\n"
-#, fuzzy, c-format
-#| msgid "new configuration file `%s' created\n"
-msgid "new configuration file '%s' created\n"
-msgstr "creado un nuevo fichero de configuración `%s'\n"
-
-#, fuzzy, c-format
-#| msgid "WARNING: options in `%s' are not yet active during this run\n"
-msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr "AVISO: las opciones en `%s' no están aún activas en esta ejecución\n"
-
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "no puedo manejar el algoritmo de clave pública %d\n"
@@ -5870,9 +5860,6 @@ msgstr[1] ""
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
-msgid ", "
-msgstr ""
-
#, fuzzy
#| msgid "list keys"
msgid "this key"
@@ -9263,6 +9250,17 @@ msgstr ""
"patrones\n"
#, fuzzy
+#~| msgid "new configuration file `%s' created\n"
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr "creado un nuevo fichero de configuración `%s'\n"
+
+#, fuzzy
+#~| msgid "WARNING: options in `%s' are not yet active during this run\n"
+#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
+#~ msgstr ""
+#~ "AVISO: las opciones en `%s' no están aún activas en esta ejecución\n"
+
+#, fuzzy
#~| msgid "Key generation failed: %s\n"
#~ msgid "User ID revocation failed: %s\n"
#~ msgstr "Creación de la clave fallida: %s\n"
diff --git a/po/et.po b/po/et.po
index 12e3d0b..355d45c 100644
--- a/po/et.po
+++ b/po/et.po
@@ -4830,16 +4830,6 @@ msgstr "kirjutan standardväljundisse\n"
msgid "assuming signed data in '%s'\n"
msgstr "eeldan allkirjastatud andmeid failis `%s'\n"
-#, fuzzy, c-format
-#| msgid "new configuration file `%s' created\n"
-msgid "new configuration file '%s' created\n"
-msgstr "uus omaduste fail `%s' on loodud\n"
-
-#, fuzzy, c-format
-#| msgid "WARNING: options in `%s' are not yet active during this run\n"
-msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
-
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "ei oska käsitleda avaliku võtme algoritmi %d\n"
@@ -5773,9 +5763,6 @@ msgstr[1] ""
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
-msgid ", "
-msgstr ""
-
#, fuzzy
#| msgid "list keys"
msgid "this key"
@@ -8903,6 +8890,16 @@ msgid ""
msgstr ""
#, fuzzy
+#~| msgid "new configuration file `%s' created\n"
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr "uus omaduste fail `%s' on loodud\n"
+
+#, fuzzy
+#~| msgid "WARNING: options in `%s' are not yet active during this run\n"
+#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
+#~ msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
+
+#, fuzzy
#~| msgid "Key generation failed: %s\n"
#~ msgid "User ID revocation failed: %s\n"
#~ msgstr "Võtme genereerimine ebaõnnestus: %s\n"
diff --git a/po/fi.po b/po/fi.po
index e84256c..ba6c056 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -4869,18 +4869,6 @@ msgstr "kirjoitetaan vakiotulosteeseen\n"
msgid "assuming signed data in '%s'\n"
msgstr "data kohteessa \"%s\" oletetaan allekirjoitetuksi\n"
-#, fuzzy, c-format
-#| msgid "new configuration file `%s' created\n"
-msgid "new configuration file '%s' created\n"
-msgstr "uusi asetustiedosto \"%s\" luotu\n"
-
-#, fuzzy, c-format
-#| msgid "WARNING: options in `%s' are not yet active during this run\n"
-msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr ""
-"VAROITUS: asetukset tiedostossa \"%s\" eivät ole käytössä vielä tässä "
-"ajossa\n"
-
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
@@ -5832,9 +5820,6 @@ msgstr[1] ""
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
-msgid ", "
-msgstr ""
-
#, fuzzy
#| msgid "list keys"
msgid "this key"
@@ -8967,6 +8952,18 @@ msgid ""
msgstr ""
#, fuzzy
+#~| msgid "new configuration file `%s' created\n"
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr "uusi asetustiedosto \"%s\" luotu\n"
+
+#, fuzzy
+#~| msgid "WARNING: options in `%s' are not yet active during this run\n"
+#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
+#~ msgstr ""
+#~ "VAROITUS: asetukset tiedostossa \"%s\" eivät ole käytössä vielä tässä "
+#~ "ajossa\n"
+
+#, fuzzy
#~| msgid "Key generation failed: %s\n"
#~ msgid "User ID revocation failed: %s\n"
#~ msgstr "Avaimen luonti epäonnistui: %s\n"
diff --git a/po/fr.po b/po/fr.po
index 5701c43..77e03b7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4752,15 +4752,6 @@ msgid "assuming signed data in '%s'\n"
msgstr "les données signées sont supposées être dans « %s »\n"
#, c-format
-msgid "new configuration file '%s' created\n"
-msgstr "nouveau fichier de configuration « %s » créé\n"
-
-#, c-format
-msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr ""
-"Attention : les options de « %s » ne sont pas encore actives cette fois\n"
-
-#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "impossible de gérer l'algorithme à clef publique %d\n"
@@ -5760,9 +5751,6 @@ msgstr[1] ""
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
-msgid ", "
-msgstr ""
-
#, fuzzy
#| msgid "list keys"
msgid "this key"
@@ -8936,6 +8924,13 @@ msgstr ""
"Vérifier une phrase secrète donnée sur l'entrée standard par rapport à "
"ficmotif\n"
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr "nouveau fichier de configuration « %s » créé\n"
+
+#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
+#~ msgstr ""
+#~ "Attention : les options de « %s » ne sont pas encore actives cette fois\n"
+
#, fuzzy
#~| msgid "Key generation failed: %s\n"
#~ msgid "User ID revocation failed: %s\n"
diff --git a/po/gl.po b/po/gl.po
index 3025883..35559b3 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -4880,16 +4880,6 @@ msgstr "escribindo na saída estándar\n"
msgid "assuming signed data in '%s'\n"
msgstr "suponse que hai datos asinados en `%s'\n"
-#, fuzzy, c-format
-#| msgid "new configuration file `%s' created\n"
-msgid "new configuration file '%s' created\n"
-msgstr " creouse un novo ficheiro de configuración `%s'\n"
-
-#, fuzzy, c-format
-#| msgid "WARNING: options in `%s' are not yet active during this run\n"
-msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr "AVISO: as opcións de `%s' aínda non están activas nesta execución\n"
-
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "non é posible manexa-lo algoritmo de chave pública %d\n"
@@ -5839,9 +5829,6 @@ msgstr[1] ""
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
-msgid ", "
-msgstr ""
-
#, fuzzy
#| msgid "list keys"
msgid "this key"
@@ -8994,6 +8981,16 @@ msgid ""
msgstr ""
#, fuzzy
+#~| msgid "new configuration file `%s' created\n"
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr " creouse un novo ficheiro de configuración `%s'\n"
+
+#, fuzzy
+#~| msgid "WARNING: options in `%s' are not yet active during this run\n"
+#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
+#~ msgstr "AVISO: as opcións de `%s' aínda non están activas nesta execución\n"
+
+#, fuzzy
#~| msgid "Key generation failed: %s\n"
#~ msgid "User ID revocation failed: %s\n"
#~ msgstr "A xeración da chave fallou: %s\n"
diff --git a/po/hu.po b/po/hu.po
index 0a93223..828f66c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -4847,17 +4847,6 @@ msgstr "Írok a szabványos kimenetre.\n"
msgid "assuming signed data in '%s'\n"
msgstr "Azt feltételezem, hogy az aláírt adat a %s állományban van.\n"
-#, fuzzy, c-format
-#| msgid "new configuration file `%s' created\n"
-msgid "new configuration file '%s' created\n"
-msgstr "\"%s\" új konfigurációs állományt létrehoztam.\n"
-
-#, fuzzy, c-format
-#| msgid "WARNING: options in `%s' are not yet active during this run\n"
-msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr ""
-"FIGYELEM: \"%s\" opciói csak a következő futáskor lesznek érvényesek!\n"
-
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "Nem tudom kezelni a(z) %d. számú nyilvános kulcsú algoritmust!\n"
@@ -5802,9 +5791,6 @@ msgstr[1] ""
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
-msgid ", "
-msgstr ""
-
#, fuzzy
#| msgid "list keys"
msgid "this key"
@@ -8934,6 +8920,17 @@ msgid ""
msgstr ""
#, fuzzy
+#~| msgid "new configuration file `%s' created\n"
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr "\"%s\" új konfigurációs állományt létrehoztam.\n"
+
+#, fuzzy
+#~| msgid "WARNING: options in `%s' are not yet active during this run\n"
+#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
+#~ msgstr ""
+#~ "FIGYELEM: \"%s\" opciói csak a következő futáskor lesznek érvényesek!\n"
+
+#, fuzzy
#~| msgid "Key generation failed: %s\n"
#~ msgid "User ID revocation failed: %s\n"
#~ msgstr "Kulcsgenerálás sikertelen: %s\n"
diff --git a/po/id.po b/po/id.po
index 3464c68..c2a698f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -4843,16 +4843,6 @@ msgstr "menulis ke stdout\n"
msgid "assuming signed data in '%s'\n"
msgstr "mengasumsikan data bertanda dalam `%s'\n"
-#, fuzzy, c-format
-#| msgid "new configuration file `%s' created\n"
-msgid "new configuration file '%s' created\n"
-msgstr "file konfigurasi baru `%s' tercipta\n"
-
-#, fuzzy, c-format
-#| msgid "WARNING: options in `%s' are not yet active during this run\n"
-msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr "PERINGATAN: opsi dalam `%s' belum aktif selama pelaksanaan ini\n"
-
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "tidak dapat menangani algoritma kunci publik %d\n"
@@ -5794,9 +5784,6 @@ msgstr[1] ""
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
-msgid ", "
-msgstr ""
-
#, fuzzy
#| msgid "list keys"
msgid "this key"
@@ -8925,6 +8912,16 @@ msgid ""
msgstr ""
#, fuzzy
+#~| msgid "new configuration file `%s' created\n"
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr "file konfigurasi baru `%s' tercipta\n"
+
+#, fuzzy
+#~| msgid "WARNING: options in `%s' are not yet active during this run\n"
+#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
+#~ msgstr "PERINGATAN: opsi dalam `%s' belum aktif selama pelaksanaan ini\n"
+
+#, fuzzy
#~| msgid "Key generation failed: %s\n"
#~ msgid "User ID revocation failed: %s\n"
#~ msgstr "Pembuatan kunci gagal: %s\n"
diff --git a/po/it.po b/po/it.po
index fb81476..7356598 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4862,18 +4862,6 @@ msgstr "scrivo su stdout\n"
msgid "assuming signed data in '%s'\n"
msgstr "suppongo che i dati firmati siano in `%s'\n"
-#, fuzzy, c-format
-#| msgid "new configuration file `%s' created\n"
-msgid "new configuration file '%s' created\n"
-msgstr "creato un nuovo file di configurazione `%s'\n"
-
-#, fuzzy, c-format
-#| msgid "WARNING: options in `%s' are not yet active during this run\n"
-msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr ""
-"ATTENZIONE: le opzioni in `%s' non sono ancora attive durante questa\n"
-"esecuzione del programma\n"
-
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
@@ -5835,9 +5823,6 @@ msgstr[1] ""
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
-msgid ", "
-msgstr ""
-
#, fuzzy
#| msgid "list keys"
msgid "this key"
@@ -8969,6 +8954,18 @@ msgid ""
msgstr ""
#, fuzzy
+#~| msgid "new configuration file `%s' created\n"
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr "creato un nuovo file di configurazione `%s'\n"
+
+#, fuzzy
+#~| msgid "WARNING: options in `%s' are not yet active during this run\n"
+#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
+#~ msgstr ""
+#~ "ATTENZIONE: le opzioni in `%s' non sono ancora attive durante questa\n"
+#~ "esecuzione del programma\n"
+
+#, fuzzy
#~| msgid "Key generation failed: %s\n"
#~ msgid "User ID revocation failed: %s\n"
#~ msgstr "Generazione della chiave fallita: %s\n"
diff --git a/po/ja.po b/po/ja.po
index ae180b9..97ac30b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4470,14 +4470,6 @@ msgid "assuming signed data in '%s'\n"
msgstr "署名されたデータが'%s'にあると想定します\n"
#, c-format
-msgid "new configuration file '%s' created\n"
-msgstr "新しいコンフィグレーション・ファイル'%s'ができました\n"
-
-#, c-format
-msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr "*警告*: '%s'のオプションはこの実行では、まだ有効になりません\n"
-
-#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "公開鍵のアルゴリズム%dは、取り扱えません\n"
@@ -5365,9 +5357,6 @@ msgstr[0] "電子メールアドレス\"%s\"は%d個の鍵に結びつけられ
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr "この電子メールアドレス\"%s\"の鍵の統計:\n"
-msgid ", "
-msgstr ", "
-
msgid "this key"
msgstr "この鍵"
@@ -8333,6 +8322,15 @@ msgstr ""
"形式: gpg-check-pattern [オプション] パターンファイル\n"
"パターンファイルに対して標準入力のパスフレーズを確認する\n"
+#~ msgid ", "
+#~ msgstr ", "
+
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr "新しいコンフィグレーション・ファイル'%s'ができました\n"
+
+#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
+#~ msgstr "*警告*: '%s'のオプションはこの実行では、まだ有効になりません\n"
+
#~ msgid "User ID revocation failed: %s\n"
#~ msgstr "ユーザIDの失効に失敗しました: %s\n"
diff --git a/po/nb.po b/po/nb.po
index f20daa0..9de4f45 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4559,14 +4559,6 @@ msgid "assuming signed data in '%s'\n"
msgstr "antar signert data i «%s»\n"
#, c-format
-msgid "new configuration file '%s' created\n"
-msgstr "ny oppsettsfil «%s» opprettet\n"
-
-#, c-format
-msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr "ADVARSEL: valgene i «%s» trer ikke i kraft for gjeldende programøkt\n"
-
-#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "klarte ikke å håndtere offentlig nøkkelalgoritme %d\n"
@@ -5499,9 +5491,6 @@ msgstr[1] "E-postadressen «%s» er tilknyttet %d nøkler:\n"
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr "Statistikk for nøkler med e-postadresse «%s»:\n"
-msgid ", "
-msgstr ""
-
msgid "this key"
msgstr "denne nøkkelen"
@@ -8613,6 +8602,13 @@ msgstr ""
"Syntaks: gpg-check-pattern [valg] mønsterfil\n"
"Kontroller passordfrase oppgitt på standard innkanal mot valgt mønsterfil\n"
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr "ny oppsettsfil «%s» opprettet\n"
+
+#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
+#~ msgstr ""
+#~ "ADVARSEL: valgene i «%s» trer ikke i kraft for gjeldende programøkt\n"
+
#~ msgid "User ID revocation failed: %s\n"
#~ msgstr "oppheving av bruker-ID mislyktes: %s\n"
diff --git a/po/pl.po b/po/pl.po
index 4bf61fa..beb85e5 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -4919,16 +4919,6 @@ msgstr "zapisywanie na wyjście standardowe\n"
msgid "assuming signed data in '%s'\n"
msgstr "przyjęto obecność podpisanych danych w '%s'\n"
-#, fuzzy, c-format
-#| msgid "new configuration file `%s' created\n"
-msgid "new configuration file '%s' created\n"
-msgstr "nowy plik ustawień ,,%s'' został utworzony\n"
-
-#, fuzzy, c-format
-#| msgid "WARNING: options in `%s' are not yet active during this run\n"
-msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr "OSTRZEŻENIE: opcje w ,,%s'' nie są jeszcze uwzględnione.\n"
-
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "nie można obsłużyć tego algorytmu klucza publicznego: %d\n"
@@ -5916,9 +5906,6 @@ msgstr[2] ""
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
-msgid ", "
-msgstr ""
-
#, fuzzy
#| msgid "list keys"
msgid "this key"
@@ -9294,6 +9281,16 @@ msgstr ""
"Sprawdzanie hasła ze standardowego wejścia względem pliku wzorców\n"
#, fuzzy
+#~| msgid "new configuration file `%s' created\n"
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr "nowy plik ustawień ,,%s'' został utworzony\n"
+
+#, fuzzy
+#~| msgid "WARNING: options in `%s' are not yet active during this run\n"
+#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
+#~ msgstr "OSTRZEŻENIE: opcje w ,,%s'' nie są jeszcze uwzględnione.\n"
+
+#, fuzzy
#~| msgid "Key generation failed: %s\n"
#~ msgid "User ID revocation failed: %s\n"
#~ msgstr "Generacja klucza nie powiodła się: %s\n"
diff --git a/po/pt.po b/po/pt.po
index cf05b41..d446cdc 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -4857,16 +4857,6 @@ msgstr "a escrever em \"stdout\"\n"
msgid "assuming signed data in '%s'\n"
msgstr "a assumir dados assinados em `%s'\n"
-#, fuzzy, c-format
-#| msgid "new configuration file `%s' created\n"
-msgid "new configuration file '%s' created\n"
-msgstr "criado um novo ficheiro de configuração `%s'\n"
-
-#, fuzzy, c-format
-#| msgid "WARNING: options in `%s' are not yet active during this run\n"
-msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr "AVISO: opções em `%s' ainda não estão activas nesta execução\n"
-
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "impossível manipular algoritmo de chave pública %d\n"
@@ -5802,9 +5792,6 @@ msgstr[1] ""
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
-msgid ", "
-msgstr ""
-
#, fuzzy
#| msgid "list keys"
msgid "this key"
@@ -8936,6 +8923,16 @@ msgid ""
msgstr ""
#, fuzzy
+#~| msgid "new configuration file `%s' created\n"
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr "criado um novo ficheiro de configuração `%s'\n"
+
+#, fuzzy
+#~| msgid "WARNING: options in `%s' are not yet active during this run\n"
+#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
+#~ msgstr "AVISO: opções em `%s' ainda não estão activas nesta execução\n"
+
+#, fuzzy
#~| msgid "Key generation failed: %s\n"
#~ msgid "User ID revocation failed: %s\n"
#~ msgstr "A geração de chaves falhou: %s\n"
diff --git a/po/ro.po b/po/ro.po
index d2fa764..82138a4 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -4859,17 +4859,6 @@ msgstr "scriu la stdout\n"
msgid "assuming signed data in '%s'\n"
msgstr "presupun date semnate în `%s'\n"
-#, fuzzy, c-format
-#| msgid "new configuration file `%s' created\n"
-msgid "new configuration file '%s' created\n"
-msgstr "fişier de configurare nou `%s' creat\n"
-
-#, fuzzy, c-format
-#| msgid "WARNING: options in `%s' are not yet active during this run\n"
-msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr ""
-"AVERTISMENT: opţiunile din %s nu sunt încă active în timpul acestei rulări\n"
-
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "nu pot mânui algoritmul cu cheie publică %d\n"
@@ -5835,9 +5824,6 @@ msgstr[1] ""
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
-msgid ", "
-msgstr ""
-
#, fuzzy
#| msgid "list keys"
msgid "this key"
@@ -9008,6 +8994,18 @@ msgid ""
msgstr ""
#, fuzzy
+#~| msgid "new configuration file `%s' created\n"
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr "fişier de configurare nou `%s' creat\n"
+
+#, fuzzy
+#~| msgid "WARNING: options in `%s' are not yet active during this run\n"
+#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
+#~ msgstr ""
+#~ "AVERTISMENT: opţiunile din %s nu sunt încă active în timpul acestei "
+#~ "rulări\n"
+
+#, fuzzy
#~| msgid "Key generation failed: %s\n"
#~ msgid "User ID revocation failed: %s\n"
#~ msgstr "Generarea cheii a eşuat: %s\n"
diff --git a/po/ru.po b/po/ru.po
index 001c730..bc025f7 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4584,14 +4584,6 @@ msgid "assuming signed data in '%s'\n"
msgstr "предполагается, что подписанные данные находятся в '%s'\n"
#, c-format
-msgid "new configuration file '%s' created\n"
-msgstr "создан новый файл настроек '%s'\n"
-
-#, c-format
-msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr "Внимание: параметры в '%s' при этом запуске еще не действуют\n"
-
-#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "не могу использовать алгоритм с открытым ключом %d\n"
@@ -5516,9 +5508,6 @@ msgstr[2] "Адрес электронной почты \"%s\" связан с %
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr "Статистика ключей с адресом электронной почты \"%s\":\n"
-msgid ", "
-msgstr ", "
-
msgid "this key"
msgstr "этот ключ"
@@ -8606,6 +8595,15 @@ msgstr ""
"Синтаксис: gpg-check-pattern [параметры] файл_образцов\n"
"Проверить фразу-пароль, поступающую из stdin, по файлу образцов\n"
+#~ msgid ", "
+#~ msgstr ", "
+
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr "создан новый файл настроек '%s'\n"
+
+#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
+#~ msgstr "Внимание: параметры в '%s' при этом запуске еще не действуют\n"
+
#~ msgid "User ID revocation failed: %s\n"
#~ msgstr "Сбой при отзыве идентификатора: %s\n"
diff --git a/po/sk.po b/po/sk.po
index 7b72fe4..fb3e686 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4863,16 +4863,6 @@ msgstr "zapisujem na štandardný výstup (stdout)\n"
msgid "assuming signed data in '%s'\n"
msgstr "predpokladám podpísané dáta v `%s'\n"
-#, fuzzy, c-format
-#| msgid "new configuration file `%s' created\n"
-msgid "new configuration file '%s' created\n"
-msgstr "vytvorený nový konfiguračný súbor `%s'\n"
-
-#, fuzzy, c-format
-#| msgid "WARNING: options in `%s' are not yet active during this run\n"
-msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr "VAROVANIE: nastavenie v `%s' ešte nie je aktívne\n"
-
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "nemôžem pracovať s algoritmom verejného kľúča %d\n"
@@ -5819,9 +5809,6 @@ msgstr[1] ""
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
-msgid ", "
-msgstr ""
-
#, fuzzy
#| msgid "list keys"
msgid "this key"
@@ -8955,6 +8942,16 @@ msgid ""
msgstr ""
#, fuzzy
+#~| msgid "new configuration file `%s' created\n"
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr "vytvorený nový konfiguračný súbor `%s'\n"
+
+#, fuzzy
+#~| msgid "WARNING: options in `%s' are not yet active during this run\n"
+#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
+#~ msgstr "VAROVANIE: nastavenie v `%s' ešte nie je aktívne\n"
+
+#, fuzzy
#~| msgid "Key generation failed: %s\n"
#~ msgid "User ID revocation failed: %s\n"
#~ msgstr "Vytvorenie kľúča sa nepodarilo: %s\n"
diff --git a/po/sv.po b/po/sv.po
index c8912ae..1f9ff53 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -4974,17 +4974,6 @@ msgstr "skriver till standard ut\n"
msgid "assuming signed data in '%s'\n"
msgstr "antar att signerad data finns i filen \"%s\"\n"
-#, fuzzy, c-format
-#| msgid "new configuration file `%s' created\n"
-msgid "new configuration file '%s' created\n"
-msgstr "ny konfigurationsfil \"%s\" skapad\n"
-
-#, fuzzy, c-format
-#| msgid "WARNING: options in `%s' are not yet active during this run\n"
-msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr ""
-"VARNING: inställningar i \"%s\" är ännu inte aktiva under denna körning\n"
-
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "kan inte hantera algoritmen %d för publika nycklar\n"
@@ -5976,9 +5965,6 @@ msgstr[1] ""
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
-msgid ", "
-msgstr ""
-
#, fuzzy
#| msgid "list keys"
msgid "this key"
@@ -9369,6 +9355,17 @@ msgstr ""
"Kontrollera en lösenfras angiven på standard in mot mönsterfilen\n"
#, fuzzy
+#~| msgid "new configuration file `%s' created\n"
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr "ny konfigurationsfil \"%s\" skapad\n"
+
+#, fuzzy
+#~| msgid "WARNING: options in `%s' are not yet active during this run\n"
+#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
+#~ msgstr ""
+#~ "VARNING: inställningar i \"%s\" är ännu inte aktiva under denna körning\n"
+
+#, fuzzy
#~| msgid "Key generation failed: %s\n"
#~ msgid "User ID revocation failed: %s\n"
#~ msgstr "Nyckelgenereringen misslyckades: %s\n"
diff --git a/po/tr.po b/po/tr.po
index 4ece9fd..b707775 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4916,17 +4916,6 @@ msgstr "standart çıktıya yazıyor\n"
msgid "assuming signed data in '%s'\n"
msgstr "\"%s\" içindeki veri imzalı kabul ediliyor\n"
-#, fuzzy, c-format
-#| msgid "new configuration file `%s' created\n"
-msgid "new configuration file '%s' created\n"
-msgstr "yeni yapılandırma dosyası `%s' oluşturuldu\n"
-
-#, fuzzy, c-format
-#| msgid "WARNING: options in `%s' are not yet active during this run\n"
-msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr ""
-"UYARI: `%s' deki seçenekler bu çalıştırma sırasında henüz etkin değil\n"
-
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "%d genel anahtar algoritması kullanılamadı\n"
@@ -5902,9 +5891,6 @@ msgstr[1] ""
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
-msgid ", "
-msgstr ""
-
#, fuzzy
#| msgid "list keys"
msgid "this key"
@@ -9273,6 +9259,17 @@ msgstr ""
"karşılaştırır\n"
#, fuzzy
+#~| msgid "new configuration file `%s' created\n"
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr "yeni yapılandırma dosyası `%s' oluşturuldu\n"
+
+#, fuzzy
+#~| msgid "WARNING: options in `%s' are not yet active during this run\n"
+#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
+#~ msgstr ""
+#~ "UYARI: `%s' deki seçenekler bu çalıştırma sırasında henüz etkin değil\n"
+
+#, fuzzy
#~| msgid "Key generation failed: %s\n"
#~ msgid "User ID revocation failed: %s\n"
#~ msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
diff --git a/po/uk.po b/po/uk.po
index b5e5209..5102058 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -4639,14 +4639,6 @@ msgid "assuming signed data in '%s'\n"
msgstr "припускаємо підписані дані у «%s»\n"
#, c-format
-msgid "new configuration file '%s' created\n"
-msgstr "створено новий файл налаштувань «%s»\n"
-
-#, c-format
-msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr "УВАГА: параметри у «%s» ще не є активними під час цього запуску\n"
-
-#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "робота з алгоритмом створення відкритого ключа %d неможлива\n"
@@ -5592,9 +5584,6 @@ msgstr[2] "Адресу електронної пошти «%s» пов’яза
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr "Статистичні дані для ключів із адресою електронної пошти «%s»:\n"
-msgid ", "
-msgstr ", "
-
msgid "this key"
msgstr "цей ключ"
@@ -8695,6 +8684,15 @@ msgstr ""
"Синтаксис: gpg-check-pattern [параметри] файл_шаблонів\n"
"Перевірити пароль, вказаний у stdin, за допомогою файла_шаблонів\n"
+#~ msgid ", "
+#~ msgstr ", "
+
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr "створено новий файл налаштувань «%s»\n"
+
+#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
+#~ msgstr "УВАГА: параметри у «%s» ще не є активними під час цього запуску\n"
+
#~ msgid "User ID revocation failed: %s\n"
#~ msgstr "Спроба відкликання ідентифікатор користувача зазнала невдачі: %s\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c025fd6..f9b5548 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4752,16 +4752,6 @@ msgstr "正在写入到标准输出\n"
msgid "assuming signed data in '%s'\n"
msgstr "假定被签名的数据是‘%s’\n"
-#, fuzzy, c-format
-#| msgid "new configuration file `%s' created\n"
-msgid "new configuration file '%s' created\n"
-msgstr "新的配置文件‘%s’已建立\n"
-
-#, fuzzy, c-format
-#| msgid "WARNING: options in `%s' are not yet active during this run\n"
-msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr "警告：在‘%s’里的选项于此次运行期间未被使用\n"
-
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "无法操作公钥算法 %d\n"
@@ -5681,9 +5671,6 @@ msgstr[1] ""
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
-msgid ", "
-msgstr ""
-
#, fuzzy
#| msgid "list keys"
msgid "this key"
@@ -8832,6 +8819,16 @@ msgid ""
msgstr ""
#, fuzzy
+#~| msgid "new configuration file `%s' created\n"
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr "新的配置文件‘%s’已建立\n"
+
+#, fuzzy
+#~| msgid "WARNING: options in `%s' are not yet active during this run\n"
+#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
+#~ msgstr "警告：在‘%s’里的选项于此次运行期间未被使用\n"
+
+#, fuzzy
#~| msgid "Key generation failed: %s\n"
#~ msgid "User ID revocation failed: %s\n"
#~ msgstr "生成密钥失败：%s\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 046db45..637ec29 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -4552,14 +4552,6 @@ msgid "assuming signed data in '%s'\n"
msgstr "假設被簽署的資料在 '%s'\n"
#, c-format
-msgid "new configuration file '%s' created\n"
-msgstr "新的組態檔案 '%s' 已建立\n"
-
-#, c-format
-msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr "警告: 在 '%s' 裡的選項於這次執行期間並沒有被啟用\n"
-
-#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "無法操作 %d 公開金鑰演算法\n"
@@ -5480,9 +5472,6 @@ msgstr[0] ""
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr ""
-msgid ", "
-msgstr ""
-
#, fuzzy
#| msgid "list keys"
msgid "this key"
@@ -8474,6 +8463,12 @@ msgstr ""
"語法: gpg-check-pattern [選項] 樣式檔案\n"
"用樣式檔案來檢查由標準輸入給定的密語\n"
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr "新的組態檔案 '%s' 已建立\n"
+
+#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
+#~ msgstr "警告: 在 '%s' 裡的選項於這次執行期間並沒有被啟用\n"
+
#, fuzzy
#~| msgid "Key generation failed: %s\n"
#~ msgid "User ID revocation failed: %s\n"
commit 4bd079dbdb44067688377156413dd32a82a89d22
Author: Werner Koch <wk at gnupg.org>
Date: Mon May 15 16:00:37 2017 +0200
po: Update German translation
diff --git a/po/de.po b/po/de.po
index e6a7cd2..8a4c0f9 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: 2017-04-03 17:10+0200\n"
+"PO-Revision-Date: 2017-05-15 16:00+0200\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
"Language: de\n"
@@ -4635,15 +4635,6 @@ msgid "assuming signed data in '%s'\n"
msgstr "die unterzeichneten Daten sind wohl in '%s'\n"
#, c-format
-msgid "new configuration file '%s' created\n"
-msgstr "Neue Konfigurationsdatei `%s' erstellt\n"
-
-#, c-format
-msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr ""
-"WARNUNG: Optionen in `%s' sind während dieses Laufes noch nicht wirksam\n"
-
-#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
@@ -5617,9 +5608,6 @@ msgstr[1] "Die Email-Adresse \"%s\" ist mit %d Schlüsseln assoziert:\n"
msgid "Statistics for keys with the email address \"%s\":\n"
msgstr "Statistik für Schlüssel mit der Email-Adresse \"%s\":\n"
-msgid ", "
-msgstr ""
-
msgid "this key"
msgstr "dieser Schlüssel"
@@ -5761,59 +5749,47 @@ msgstr "Fehler beim Setzen der TOFU Binding Vertrauensstufe auf %s\n"
msgid "error changing TOFU policy: %s\n"
msgstr "Fehler beim Ändern der TOFU Richtlinie: %s\n"
-#, fuzzy, c-format
-#| msgid "%d~year"
-#| msgid_plural "%d~years"
+#, c-format
msgid "%lld~year"
msgid_plural "%lld~years"
-msgstr[0] "%d~Jahr"
-msgstr[1] "%d~Jahre"
+msgstr[0] "%lld~Jahr"
+msgstr[1] "%lld~Jahre"
-#, fuzzy, c-format
-#| msgid "%d~month"
-#| msgid_plural "%d~months"
+#, c-format
msgid "%lld~month"
msgid_plural "%lld~months"
-msgstr[0] "%d~Monat"
-msgstr[1] "%d~Monate"
+msgstr[0] "%lld~Monat"
+msgstr[1] "%lld~Monate"
#, c-format
msgid "%lld~week"
msgid_plural "%lld~weeks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%lld~Woche"
+msgstr[1] "%lld Wochen"
-#, fuzzy, c-format
-#| msgid "%d~day"
-#| msgid_plural "%d~days"
+#, c-format
msgid "%lld~day"
msgid_plural "%lld~days"
-msgstr[0] "%d~Tag"
-msgstr[1] "%d~Tage"
+msgstr[0] "%lld~Tag"
+msgstr[1] "%lld~Tage"
-#, fuzzy, c-format
-#| msgid "%d~hour"
-#| msgid_plural "%d~hours"
+#, c-format
msgid "%lld~hour"
msgid_plural "%lld~hours"
-msgstr[0] "%d~Stunde"
-msgstr[1] "%d~Stunden"
+msgstr[0] "%lld~Stunde"
+msgstr[1] "%lld~Stunden"
-#, fuzzy, c-format
-#| msgid "%d~minute"
-#| msgid_plural "%d~minutes"
+#, c-format
msgid "%lld~minute"
msgid_plural "%lld~minutes"
-msgstr[0] "%d~Minute"
-msgstr[1] "%d~Minuten"
+msgstr[0] "%lld~Minute"
+msgstr[1] "%lld~Minuten"
-#, fuzzy, c-format
-#| msgid "%d~second"
-#| msgid_plural "%d~seconds"
+#, c-format
msgid "%lld~second"
msgid_plural "%lld~seconds"
-msgstr[0] "%d~Sekunde"
-msgstr[1] "%d~Sekunden"
+msgstr[0] "%lld~Sekunde"
+msgstr[1] "%lld~Sekunden"
#, fuzzy, c-format
#| msgid "TOFU: few signatures %d message %s"
@@ -8801,6 +8777,13 @@ msgstr ""
"Syntax: gpg-check-pattern [optionen] Musterdatei\n"
"Die von stdin gelesene Passphrase gegen die Musterdatei prüfen\n"
+#~ msgid "new configuration file '%s' created\n"
+#~ msgstr "Neue Konfigurationsdatei `%s' erstellt\n"
+
+#~ msgid "WARNING: options in '%s' are not yet active during this run\n"
+#~ msgstr ""
+#~ "WARNUNG: Optionen in `%s' sind während dieses Laufes noch nicht wirksam\n"
+
#~ msgid "User ID revocation failed: %s\n"
#~ msgstr "Widerufen der User-ID fehlgeschlagen: %s\n"
commit 2d381b0f0ba97657e9fb2971eca6648bb77dd2cc
Author: Werner Koch <wk at gnupg.org>
Date: Mon May 15 15:56:46 2017 +0200
gpg: Do not mark ", " translatable.
* g10/tofu.c (ask_about_binding): Remove useless translation markers.
--
Translation and in particular punctuation marks can only be translated
with context. Thus making a sole comma translatable is useless.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/g10/tofu.c b/g10/tofu.c
index 1c1c396..ba46244 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -1786,12 +1786,12 @@ ask_about_binding (ctrl_t ctrl,
if ((binding->flags & BINDING_REVOKED))
{
es_fprintf (fp, _("revoked"));
- es_fprintf (fp, _(", "));
+ es_fprintf (fp, ", ");
}
else if ((binding->flags & BINDING_EXPIRED))
{
es_fprintf (fp, _("expired"));
- es_fprintf (fp, _(", "));
+ es_fprintf (fp, ", ");
}
if (this_key)
-----------------------------------------------------------------------
Summary of changes:
NEWS | 25 ++++++++++++++++++++-
README | 17 ++++----------
configure.ac | 2 +-
g10/tofu.c | 4 ++--
po/ca.po | 26 ++++++++++------------
po/cs.po | 18 ++++++---------
po/da.po | 25 +++++++++------------
po/de.po | 73 +++++++++++++++++++++++-------------------------------------
po/el.po | 26 ++++++++++------------
po/eo.po | 15 ++++---------
po/es.po | 24 +++++++++-----------
po/et.po | 23 +++++++++----------
po/fi.po | 27 ++++++++++------------
po/fr.po | 19 ++++++----------
po/gl.po | 23 +++++++++----------
po/hu.po | 25 +++++++++------------
po/id.po | 23 +++++++++----------
po/it.po | 27 ++++++++++------------
po/ja.po | 20 ++++++++---------
po/nb.po | 18 ++++++---------
po/pl.po | 23 +++++++++----------
po/pt.po | 23 +++++++++----------
po/ro.po | 26 ++++++++++------------
po/ru.po | 20 ++++++++---------
po/sk.po | 23 +++++++++----------
po/sv.po | 25 +++++++++------------
po/tr.po | 25 +++++++++------------
po/uk.po | 20 ++++++++---------
po/zh_CN.po | 23 +++++++++----------
po/zh_TW.po | 17 +++++---------
30 files changed, 302 insertions(+), 383 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list