[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.1-32-g296783a

by Werner Koch cvs at cvs.gnupg.org
Thu Nov 2 17:49:32 CET 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  296783a3181afa605248e27c672cbce7aa88ac0d (commit)
       via  a124907742ab9c2fa382caa4e52803565cb083a3 (commit)
       via  acb300543422c660c87ac2f0211a42f792a65cc4 (commit)
       via  de3a740c2e1156e58d2f94faa85c051740c8988e (commit)
      from  3da47d19df89d302c0ea25921f4bd8ce55705afe (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 296783a3181afa605248e27c672cbce7aa88ac0d
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Nov 2 17:43:21 2017 +0100

    po: Fixed one string wrongly marked as fuzzy.
    
    --
    
    These seems to a a small gettext bug which claimed that
     "NOTE: There is no guarantee that the card supports[...]"
    was changed.  Also committed changes due to msgmerge.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/po/ca.po b/po/ca.po
index 738c5f7..4d9ce66 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1505,6 +1505,10 @@ msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "Quina grandària voleu? (1024) "
 
 #, c-format
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr ""
+
+#, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrodonida fins a %u bits\n"
 
@@ -2849,14 +2853,6 @@ msgid "key %s: doesn't match our copy\n"
 msgstr "clau %08lX: no correspon a la nostra còpia\n"
 
 #, fuzzy, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "clau %08lX: no s'ha trobat el bloc de claus original: %s\n"
-
-#, fuzzy, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "clau %08lX: no s'ha pogut llegir el bloc de claus original: %s\n"
-
-#, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clau %08lX: «%s» 1 ID d'usuari nou\n"
 
@@ -2945,6 +2941,14 @@ msgstr ""
 "clau %08lX: falta la clau pública: no es pot aplicar el certificat\n"
 "de revocació\n"
 
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "clau %08lX: no s'ha trobat el bloc de claus original: %s\n"
+
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "clau %08lX: no s'ha pogut llegir el bloc de claus original: %s\n"
+
 # O «rebutjara»? ivb
 # Per tots els canvis d'anglicisme «ignorat» -> «es descarta»,
 # «es rebutja» està bé. jm
@@ -3466,6 +3470,11 @@ msgstr ""
 msgid "Secret key is available.\n"
 msgstr "La clau secreta està disponible.\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "La clau secreta està disponible.\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "Cal la clau secreta per a fer açò.\n"
 
diff --git a/po/cs.po b/po/cs.po
index 17bff35..24d54c7 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg2 2.1.10\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2015-12-07 20:45+0100\n"
+"PO-Revision-Date: 2017-11-02 17:38+0100\n"
 "Last-Translator: Petr Pisar <petr.pisar at atlas.cz>\n"
 "Language-Team: Czech <gnupg-i18n at gnupg.org>\n"
 "Language: cs\n"
@@ -1393,6 +1393,11 @@ msgstr "Jakou délku klíče pro šifrování si přejete? (%u) "
 msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "Jakou délku klíče pro autentizaci si přejete? (%u) "
 
+#, fuzzy, c-format
+#| msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr "Karta bude nyní přenastavena na generování klíče dlouhého %u bitů\n"
+
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrouhleno na %u bitů\n"
@@ -2670,14 +2675,6 @@ msgid "key %s: doesn't match our copy\n"
 msgstr "klíč %s: neodpovídá naší kopii\n"
 
 #, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "klíč %s: nemohu najít originální blok klíče: %s\n"
-
-#, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "klíč %s: nemohu číst originální blok klíče: %s\n"
-
-#, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "klíč %s: „%s“ 1 nový identifikátor uživatele\n"
 
@@ -2763,6 +2760,14 @@ msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "klíč %s: chybí veřejný klíč – nemohu aplikovat revokační certifikát\n"
 
 #, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "klíč %s: nemohu najít originální blok klíče: %s\n"
+
+#, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "klíč %s: nemohu číst originální blok klíče: %s\n"
+
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "klíč %s: neplatný revokační certifikát: %s – zamítnuto\n"
 
@@ -3214,6 +3219,11 @@ msgstr "směstnat nepoužitelná ID uživatelů a odstranit z klíče všechny
 msgid "Secret key is available.\n"
 msgstr "Tajný klíč je dostupný.\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "Tajný klíč je dostupný.\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "Pro provedení této operace je potřeba tajný klíč.\n"
 
diff --git a/po/da.po b/po/da.po
index e124de5..bd6e9c5 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2012-11-01 20:27+0200\n"
+"PO-Revision-Date: 2017-11-02 17:39+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
 "Language: da\n"
@@ -1451,11 +1451,6 @@ msgstr "fejl ved indhentelse af aktuel nøgleinformation: %s\n"
 msgid "Replace existing key? (y/N) "
 msgstr "Erstat eksisterende nøgle? (j/N) "
 
-#, fuzzy
-#| msgid ""
-#| "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"
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1478,6 +1473,11 @@ msgstr "Hvilken nøglestørrelse ønsker du for krypteringsnøglen? (%u) "
 msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "Hvilken nøglestørrelse ønsker du for godkendelsesnøglen? (%u) "
 
+#, fuzzy, c-format
+#| msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr "Kortet vil nu blive omkonfigureret til at oprette en nøgle på %u bit\n"
+
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "afrundet op til %u bit\n"
@@ -2811,14 +2811,6 @@ msgid "key %s: doesn't match our copy\n"
 msgstr "nøgle %s: stemmer ikke med vores kopi\n"
 
 #, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "nøgle %s: kan ikke lokalisere original nøgleblok: %s\n"
-
-#, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "nøgle %s: kan ikke læse original nøgleblok: %s\n"
-
-#, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "nøgle %s: »%s« 1 ny bruger-id\n"
 
@@ -2908,6 +2900,14 @@ msgstr ""
 "nøgle %s: ingen offentlig nøgle - kan ikke anvende tilbagekaldscertifikat\n"
 
 #, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "nøgle %s: kan ikke lokalisere original nøgleblok: %s\n"
+
+#, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "nøgle %s: kan ikke læse original nøgleblok: %s\n"
+
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "nøgle %s: ugyldigt tilbagekaldscertifikat: %s - afvist\n"
 
@@ -3382,6 +3382,11 @@ msgstr ""
 msgid "Secret key is available.\n"
 msgstr "Hemmelig nøgle er tilgængelig.\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "Hemmelig nøgle er tilgængelig.\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "Har brug for den hemmelige nøgle for dette.\n"
 
diff --git a/po/el.po b/po/el.po
index a57c8b8..cc9439e 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1440,6 +1440,10 @@ msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "Τι μέγεθος κλειδιού θα θέλατε; (1024) "
 
 #, c-format
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr ""
+
+#, c-format
 msgid "rounded up to %u bits\n"
 msgstr "στρογγυλοποιήθηκε έως τα %u bits\n"
 
@@ -2771,14 +2775,6 @@ msgid "key %s: doesn't match our copy\n"
 msgstr "κλειδί %08lX: δεν ταιριάζει με το αντίγραφο μας\n"
 
 #, fuzzy, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "κλειδί %08lX: αδυναμία εντοπισμού του αρχικού τμήματος κλειδιού: %s\n"
-
-#, fuzzy, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "κλειδί %08lX: αδυναμία ανάγνωσης του αρχικού τμήματος κλειδιού: %s\n"
-
-#, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "κλειδί %08lX: \"%s\" 1 νέο user ID\n"
 
@@ -2868,6 +2864,14 @@ msgstr ""
 "ανάκλησης\n"
 
 #, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "κλειδί %08lX: αδυναμία εντοπισμού του αρχικού τμήματος κλειδιού: %s\n"
+
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "κλειδί %08lX: αδυναμία ανάγνωσης του αρχικού τμήματος κλειδιού: %s\n"
+
+#, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "κλειδί %08lX: μη έγκυρο πιστοποιητικό ανάκλησης: %s - απόρριψη\n"
 
@@ -3373,6 +3377,11 @@ msgstr ""
 msgid "Secret key is available.\n"
 msgstr "Το μυστικό κλειδί είναι διαθέσιμο.\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "Το μυστικό κλειδί είναι διαθέσιμο.\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "Απαιτείται το μυστικό κλειδί για να γίνει αυτό.\n"
 
diff --git a/po/eo.po b/po/eo.po
index 3c49698..611b987 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1442,6 +1442,10 @@ msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "Kiun ŝlosilgrandon vi deziras? (1024) "
 
 #, c-format
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr ""
+
+#, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rondigita ĝis %u bitoj\n"
 
@@ -2752,14 +2756,6 @@ msgid "key %s: doesn't match our copy\n"
 msgstr "ŝlosilo %08lX: diferencas de nia kopio\n"
 
 #, fuzzy, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "ŝlosilo %08lX: ne povas trovi originalan ŝlosilblokon: %s\n"
-
-#, fuzzy, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "ŝlosilo %08lX: ne povas legi originalan ŝlosilblokon: %s\n"
-
-#, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "ŝlosilo %08lX: 1 nova uzantidentigilo\n"
 
@@ -2848,6 +2844,14 @@ msgstr ""
 "ŝlosilo %08lX: publika ŝlosilo mankas - ne povas apliki revokatestilon\n"
 
 #, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "ŝlosilo %08lX: ne povas trovi originalan ŝlosilblokon: %s\n"
+
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "ŝlosilo %08lX: ne povas legi originalan ŝlosilblokon: %s\n"
+
+#, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "ŝlosilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
 
@@ -3357,6 +3361,11 @@ msgstr ""
 msgid "Secret key is available.\n"
 msgstr "Sekreta ŝlosilo estas havebla.\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "Sekreta ŝlosilo estas havebla.\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "Bezonas la sekretan ŝlosilon por fari tion.\n"
 
diff --git a/po/es.po b/po/es.po
index 95a2589..76d3952 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0.9\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2015-10-09 17:10+0200\n"
+"PO-Revision-Date: 2017-11-02 17:39+0100\n"
 "Last-Translator: Jaime Suárez <jaime.suma at gmail.com>\n"
 "Language-Team: Spanish <es at li.org>\n"
 "Language: es\n"
@@ -1469,11 +1469,6 @@ msgstr "error obteniendo la información actual de la clave: %s\n"
 msgid "Replace existing key? (y/N) "
 msgstr "¿Reemplazar la clave existente? (s/N) "
 
-#, fuzzy
-#| msgid ""
-#| "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"
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1495,6 +1490,11 @@ msgstr "¿De qué tamaño quiere la clave de Cifrado? (%u) "
 msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "¿De qué tamaño quiere la clave de Autenticación? (%u) "
 
+#, fuzzy, c-format
+#| msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr "Ahora la tarjeta se reconfigurará para generar una clave de %u bits\n"
+
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
@@ -2840,14 +2840,6 @@ msgid "key %s: doesn't match our copy\n"
 msgstr "clave %s: no coincide con nuestra copia\n"
 
 #, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "clave %s: no puede localizarse el bloque de claves original: %s\n"
-
-#, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "clave %s: no puede leerse el bloque de claves original: %s\n"
-
-#, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clave %s: \"%s\" 1 ID de usuario nuevo\n"
 
@@ -2938,6 +2930,14 @@ msgstr ""
 "certificado de revocación\n"
 
 #, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "clave %s: no puede localizarse el bloque de claves original: %s\n"
+
+#, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "clave %s: no puede leerse el bloque de claves original: %s\n"
+
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "clave %s: certificado de revocación inválido: %s - rechazado\n"
 
@@ -3395,6 +3395,11 @@ msgstr "compactar IDs inutilizables y borrar todas las firmas de la clave"
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "Clave secreta disponible.\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto.\n"
 
diff --git a/po/et.po b/po/et.po
index f852a29..66e905b 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1436,6 +1436,10 @@ msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "Millist võtmepikkust te soovite? (1024) "
 
 #, c-format
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr ""
+
+#, c-format
 msgid "rounded up to %u bits\n"
 msgstr "ümardatud üles %u bitini\n"
 
@@ -2756,14 +2760,6 @@ msgid "key %s: doesn't match our copy\n"
 msgstr "võti %08lX: ei sobi meie koopiaga\n"
 
 #, fuzzy, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "võti %08lX: ei leia algset võtmeblokki: %s\n"
-
-#, fuzzy, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "võti %08lX: ei õnnestu lugeda algset võtmeblokki: %s\n"
-
-#, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "võti %08lX: \"%s\" 1 uus kasutaja ID\n"
 
@@ -2852,6 +2848,14 @@ msgstr ""
 "võti %08lX: avalik võti puudub - tühistamise sertifikaati ei saa rakendada\n"
 
 #, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "võti %08lX: ei leia algset võtmeblokki: %s\n"
+
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "võti %08lX: ei õnnestu lugeda algset võtmeblokki: %s\n"
+
+#, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "võti %08lX: vigane tühistamise sertifikaat: %s - lükkasin tagasi\n"
 
@@ -3346,6 +3350,11 @@ msgstr ""
 msgid "Secret key is available.\n"
 msgstr "Salajane võti on kasutatav.\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "Salajane võti on kasutatav.\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "Selle tegamiseks on vaja salajast võtit.\n"
 
diff --git a/po/fi.po b/po/fi.po
index ea38194..15f7ce7 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1455,6 +1455,10 @@ msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "Minkä kokoisen avaimen haluat? (1024) "
 
 #, c-format
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr ""
+
+#, c-format
 msgid "rounded up to %u bits\n"
 msgstr "pyöristetty %u bittiin\n"
 
@@ -2773,14 +2777,6 @@ msgid "key %s: doesn't match our copy\n"
 msgstr "avain %08lX: ei vastaa omaa kopiotamme\n"
 
 #, fuzzy, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "avain %08lX: alkuperäistä avainlohkoa ei löydy: %s\n"
-
-#, fuzzy, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "avain %08lX. alkuperäisen avainlohko lukeminen ei onnistu: %s\n"
-
-#, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "avain %08lX: \"%s\" 1 uusi käyttäjätunnus\n"
 
@@ -2869,6 +2865,14 @@ msgstr ""
 "avain %08lX: ei julkista avainta - mitätöintivarmennetta ei voida käyttää\n"
 
 #, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "avain %08lX: alkuperäistä avainlohkoa ei löydy: %s\n"
+
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "avain %08lX. alkuperäisen avainlohko lukeminen ei onnistu: %s\n"
+
+#, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "avain %08lX: pätemätön mitätöintivarmenne: %s - hylätty\n"
 
@@ -3366,6 +3370,11 @@ msgstr ""
 msgid "Secret key is available.\n"
 msgstr "Salainen avain on saatavilla.\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "Salainen avain on saatavilla.\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "Tähän tarvitaan salainen avain.\n"
 
diff --git a/po/fr.po b/po/fr.po
index 916aef7..fa1e87f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.1\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2015-09-10 16:22+0200\n"
+"PO-Revision-Date: 2017-11-02 17:40+0100\n"
 "Last-Translator: David Prévot <david at tilapin.org>\n"
 "Language-Team: French <traduc at traduc.org>\n"
 "Language: fr\n"
@@ -1403,6 +1403,12 @@ msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr ""
 "Quelle taille de clef désirez-vous pour la clef d'authentification ? (%u) "
 
+#, fuzzy, c-format
+#| msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr ""
+"La carte sera maintenant reconfigurée pour générer une clef de %u bits\n"
+
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie à %u bits\n"
@@ -2710,14 +2716,6 @@ msgid "key %s: doesn't match our copy\n"
 msgstr "clef %s : ne correspond pas à notre copie\n"
 
 #, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "clef %s : impossible de trouver le bloc de clef d'origine : %s\n"
-
-#, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "clef %s : impossible de lire le bloc de clef d'origine : %s\n"
-
-#, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clef %s : « %s » 1 nouvelle identité\n"
 
@@ -2805,6 +2803,14 @@ msgstr ""
 "          de révocation\n"
 
 #, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "clef %s : impossible de trouver le bloc de clef d'origine : %s\n"
+
+#, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "clef %s : impossible de lire le bloc de clef d'origine : %s\n"
+
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "clef %s : certificat de révocation incorrect : %s — rejeté\n"
 
@@ -3265,6 +3271,11 @@ msgstr ""
 msgid "Secret key is available.\n"
 msgstr "La clef secrète est disponible.\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "La clef secrète est disponible.\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "La clef secrète est nécessaire pour faire cela.\n"
 
diff --git a/po/gl.po b/po/gl.po
index d8434f6..3b18702 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1445,6 +1445,10 @@ msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "¿Qué tamaño de chave quere? (1024) "
 
 #, c-format
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr ""
+
+#, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeado a %u bits\n"
 
@@ -2765,18 +2769,6 @@ msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: non coincide coa nosa copia\n"
 
 #, fuzzy, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr ""
-"chave %08lX: non foi posible localiza-lo bloque de chaves original:\n"
-"%s\n"
-
-#, fuzzy, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr ""
-"chave %08lX: non foi posible le-lo bloque de chaves original:\n"
-"%s\n"
-
-#, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %08lX: \"%s\" 1 novo ID de usuario\n"
 
@@ -2866,6 +2858,18 @@ msgstr ""
 "certificado de revocación\n"
 
 #, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr ""
+"chave %08lX: non foi posible localiza-lo bloque de chaves original:\n"
+"%s\n"
+
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr ""
+"chave %08lX: non foi posible le-lo bloque de chaves original:\n"
+"%s\n"
+
+#, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "chave %08lX: certificado de revocación incorrecto:\n"
@@ -3370,6 +3374,11 @@ msgstr ""
 msgid "Secret key is available.\n"
 msgstr "A chave secreta está disponible.\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "A chave secreta está disponible.\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "Cómpre a chave secreta para facer isto.\n"
 
diff --git a/po/hu.po b/po/hu.po
index 49bef6c..f18609d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1436,6 +1436,10 @@ msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "Milyen kulcsméretet szeretne? (1024) "
 
 #, c-format
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr ""
+
+#, c-format
 msgid "rounded up to %u bits\n"
 msgstr "Felkerekítve %u bitre.\n"
 
@@ -2753,14 +2757,6 @@ msgid "key %s: doesn't match our copy\n"
 msgstr "%08lX kulcs: Nem egyezik a mi másolatunkkal!\n"
 
 #, fuzzy, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "%08lX kulcs: Nem találom az eredeti kulcsblokkot: %s\n"
-
-#, fuzzy, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "%08lX kulcs: Nem tudom beolvasni az eredeti kulcsblokkot: %s\n"
-
-#, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "%08lX kulcs: \"%s\" 1 új felhasználói azonosító.\n"
 
@@ -2849,6 +2845,14 @@ msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "%08lX kulcs: Nincs nyilvános kulcs - nem tudok visszavonni.\n"
 
 #, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "%08lX kulcs: Nem találom az eredeti kulcsblokkot: %s\n"
+
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "%08lX kulcs: Nem tudom beolvasni az eredeti kulcsblokkot: %s\n"
+
+#, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "%08lX kulcs: Érvénytelen visszavonó igazolás: %s - visszautasítva.\n"
 
@@ -3345,6 +3349,11 @@ msgstr ""
 msgid "Secret key is available.\n"
 msgstr "Titkos kulcs rendelkezésre áll.\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "Titkos kulcs rendelkezésre áll.\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "Ehhez szükség van a titkos kulcsra.\n"
 
diff --git a/po/id.po b/po/id.po
index 786dc42..635ed7d 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1442,6 +1442,10 @@ msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
 #, c-format
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr ""
+
+#, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
@@ -2758,14 +2762,6 @@ msgid "key %s: doesn't match our copy\n"
 msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
 
 #, fuzzy, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "kunci %08lX: tidak dapat menemukan keyblock orisinal: %s\n"
-
-#, fuzzy, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n"
-
-#, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "kunci %08lX: 1 user ID baru \"%s\"\n"
 
@@ -2855,6 +2851,14 @@ msgstr ""
 "pembatalan\n"
 
 #, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "kunci %08lX: tidak dapat menemukan keyblock orisinal: %s\n"
+
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n"
+
+#, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
 
@@ -3350,6 +3354,11 @@ msgstr ""
 msgid "Secret key is available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "Kunci rahasia tersedia.\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
 
diff --git a/po/it.po b/po/it.po
index 1bcc8b8..fc43244 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1440,6 +1440,10 @@ msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "Di che dimensioni vuoi la chiave? (1024) "
 
 #, c-format
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr ""
+
+#, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
@@ -2764,14 +2768,6 @@ msgid "key %s: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
 #, fuzzy, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n"
-
-#, fuzzy, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
-
-#, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chiave %08lX: \"%s\" 1 nuovo user ID\n"
 
@@ -2861,6 +2857,14 @@ msgstr ""
 "certificato di revoca\n"
 
 #, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n"
+
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
+
+#, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n"
 
@@ -3357,6 +3361,11 @@ msgstr ""
 msgid "Secret key is available.\n"
 msgstr "È disponibile una chiave segreta.\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "È disponibile una chiave segreta.\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
diff --git a/po/ja.po b/po/ja.po
index 6567ab3..bdbc953 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.1.23\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2017-08-22 11:22+0900\n"
+"PO-Revision-Date: 2017-11-02 17:40+0100\n"
 "Last-Translator: NIIBE Yutaka <gniibe at fsij.org>\n"
 "Language-Team: none\n"
 "Language: ja\n"
@@ -1340,6 +1340,11 @@ msgstr "暗号化鍵の鍵長は? (%u) "
 msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "認証鍵の鍵長は? (%u) "
 
+#, fuzzy, c-format
+#| msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr "今、%uビットの鍵を生成するようにカードは再コンフィグされました\n"
+
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%uビットに切り上げます\n"
@@ -2545,14 +2550,6 @@ msgid "key %s: doesn't match our copy\n"
 msgstr "鍵%s: こちらの複製と合いません\n"
 
 #, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "鍵%s: 元の鍵ブロックに位置づけできません: %s\n"
-
-#, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "鍵%s: 元の鍵ブロックを読み込めません: %s\n"
-
-#, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "鍵%s: \"%s\" 新しいユーザIDを1個\n"
 
@@ -2638,6 +2635,14 @@ msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "鍵%s: 公開鍵がありません - 失効証明書を適用できません\n"
 
 #, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "鍵%s: 元の鍵ブロックに位置づけできません: %s\n"
+
+#, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "鍵%s: 元の鍵ブロックを読み込めません: %s\n"
+
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "鍵%s: 無効な失効証明書: %s - 拒否\n"
 
@@ -3079,6 +3084,11 @@ msgstr "使えないユーザIDをコンパクトにし、すべての署名を
 msgid "Secret key is available.\n"
 msgstr "秘密鍵が利用できます。\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "秘密鍵が利用できます。\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "この実行には秘密鍵がいります。\n"
 
diff --git a/po/nb.po b/po/nb.po
index 7a72323..8be6724 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 2.1\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2017-08-15 10:19+0200\n"
+"PO-Revision-Date: 2017-11-02 17:40+0100\n"
 "Last-Translator: Åka Sikrom <a4 at hush.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
 "Language: nb\n"
@@ -1343,6 +1343,11 @@ msgstr "Hvor stor skal krypteringsnøkkelen være? (%u) "
 msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "Hvor stor skal autentiseringsnøkkelen være? (%u) "
 
+#, fuzzy, c-format
+#| msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr "Kortet blir nå satt opp på nytt for å lage nøkkel på %u bit\n"
+
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet opp til %u bit\n"
@@ -2556,14 +2561,6 @@ msgid "key %s: doesn't match our copy\n"
 msgstr "nøkkel %s: stemmer ikke med vår kopi\n"
 
 #, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "nøkkel %s: finner ikke original nøkkelblokk: %s\n"
-
-#, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "nøkkel %s: klarte ikke å lese opprinnelig nøkkelblokk: %s\n"
-
-#, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "nøkkel %s: «%s» 1 ny bruker-ID\n"
 
@@ -2652,6 +2649,14 @@ msgstr ""
 "opphevelsessertifikat\n"
 
 #, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "nøkkel %s: finner ikke original nøkkelblokk: %s\n"
+
+#, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "nøkkel %s: klarte ikke å lese opprinnelig nøkkelblokk: %s\n"
+
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "nøkkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
 
@@ -3103,6 +3108,11 @@ msgstr ""
 msgid "Secret key is available.\n"
 msgstr "Hemmelig nøkkel er tilgjengelig.\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "Hemmelig nøkkel er tilgjengelig.\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "Du trenger tilhørende hemmelig nøkkel for å gjøre dette.\n"
 
diff --git a/po/pl.po b/po/pl.po
index c4e2d07..ef392ac 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.0.20\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2017-02-22 16:03+0100\n"
+"PO-Revision-Date: 2017-11-02 17:41+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
 "Language: pl\n"
@@ -1438,11 +1438,6 @@ msgstr "błąd podczas odczytu aktualnych informacji o kluczu: %s\n"
 msgid "Replace existing key? (y/N) "
 msgstr "Zastąpić istniejący klucz? (t/N) "
 
-#, fuzzy
-#| msgid ""
-#| "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"
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1464,6 +1459,11 @@ msgstr "Jakiej długości klucz do szyfrowania wygenerować? (%u) "
 msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "Jakiej długości klucz do uwierzytelniania wygenerować? (%u) "
 
+#, fuzzy, c-format
+#| msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr "Karta zostanie przekonfigurowana do tworzenia klucza %u-bitowego\n"
+
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrąglono do %u bitów\n"
@@ -2817,14 +2817,6 @@ msgid "key %s: doesn't match our copy\n"
 msgstr "klucz %s: nie zgadza się z lokalną kopią\n"
 
 #, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "klucz %s: brak oryginalnego bloku klucza; %s\n"
-
-#, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "klucz %s: nie można odczytać oryginalnego bloku klucza: %s\n"
-
-#, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "klucz %s: ,,%s'' 1 nowy identyfikator użytkownika\n"
 
@@ -2915,6 +2907,14 @@ msgstr ""
 "              unieważnienia\n"
 
 #, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "klucz %s: brak oryginalnego bloku klucza; %s\n"
+
+#, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "klucz %s: nie można odczytać oryginalnego bloku klucza: %s\n"
+
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "klucz %s: niepoprawny certyfikat unieważnienia: %s - odrzucony\n"
 
@@ -3391,6 +3391,11 @@ msgstr ""
 msgid "Secret key is available.\n"
 msgstr "Dostępny jest klucz tajny.\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "Dostępny jest klucz tajny.\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
diff --git a/po/pt.po b/po/pt.po
index e95b887..3caa5ca 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1441,6 +1441,10 @@ msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
 #, c-format
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr ""
+
+#, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
@@ -2758,14 +2762,6 @@ msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: não corresponde à nossa cópia\n"
 
 #, fuzzy, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "chave %08lX: impossível localizar bloco de chaves original: %s\n"
-
-#, fuzzy, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "chave %08lX: impossível ler bloco de chaves original: %s\n"
-
-#, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: \"%s\" 1 novo ID de utilizador\n"
 
@@ -2855,6 +2851,14 @@ msgstr ""
 "de revogação\n"
 
 #, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "chave %08lX: impossível localizar bloco de chaves original: %s\n"
+
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "chave %08lX: impossível ler bloco de chaves original: %s\n"
+
+#, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revogação inválido: %s - rejeitado\n"
 
@@ -3356,6 +3360,11 @@ msgstr ""
 msgid "Secret key is available.\n"
 msgstr "Chave secreta disponível.\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "Chave secreta disponível.\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta é necessária para fazer isto.\n"
 
diff --git a/po/ro.po b/po/ro.po
index d938da7..30a9924 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1446,6 +1446,10 @@ msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "Ce lungime de cheie doriţi? (%u) "
 
 #, c-format
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr ""
+
+#, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rotunjită prin adaos la %u biţi\n"
 
@@ -2798,14 +2802,6 @@ msgid "key %s: doesn't match our copy\n"
 msgstr "cheia %s: nu se potriveşte cu copia noastră\n"
 
 #, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "cheia %s: nu pot găsi keyblock-ul original: %s\n"
-
-#, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "cheia %s: nu pot citi keyblock-ul original: %s\n"
-
-#, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "cheia %s: \"%s\" 1 nou ID utilizator\n"
 
@@ -2894,6 +2890,14 @@ msgstr ""
 "cheia %s: nici o cheie publică - nu pot aplica certificatul de revocare\n"
 
 #, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "cheia %s: nu pot găsi keyblock-ul original: %s\n"
+
+#, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "cheia %s: nu pot citi keyblock-ul original: %s\n"
+
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "cheia %s: certificat de revocare invalid: %s - respins\n"
 
@@ -3358,6 +3362,11 @@ msgstr ""
 msgid "Secret key is available.\n"
 msgstr "Cheia secretă este disponibilă.\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "Cheia secretă este disponibilă.\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "Aveţi nevoie de cheia secretă pentru a face aceasta.\n"
 
diff --git a/po/ru.po b/po/ru.po
index f995349..930af27 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 2.1.0\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2017-08-05 17:17+0000\n"
+"PO-Revision-Date: 2017-11-02 17:41+0100\n"
 "Last-Translator: Ineiev <ineiev at gnu.org>\n"
 "Language-Team: Russian <gnupg-ru at gnupg.org>\n"
 "Language: ru\n"
@@ -1350,6 +1350,11 @@ msgstr "Какой Вам нужен размер ключа для шифров
 msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "Какой Вам нужен размер ключа для аутентификации? (%u) "
 
+#, fuzzy, c-format
+#| msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr "Теперь карта будет перенастроена на генерацию ключа длиной %u бит\n"
+
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "округлен до %u бит\n"
@@ -2585,14 +2590,6 @@ msgid "key %s: doesn't match our copy\n"
 msgstr "ключ %s: не совпадает с нашей копией\n"
 
 #, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "ключ %s: оригинальный блок ключей не найден: %s\n"
-
-#, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "ключ %s: оригинальный блок ключей не читается: %s\n"
-
-#, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "ключ %s: \"%s\" 1 новый идентификатор пользователя\n"
 
@@ -2678,6 +2675,14 @@ msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "ключ %s: нет открытого ключа - не могу применить сертификат отзыва\n"
 
 #, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "ключ %s: оригинальный блок ключей не найден: %s\n"
+
+#, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "ключ %s: оригинальный блок ключей не читается: %s\n"
+
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "ключ %s: недействительный сертификат отзыва: %s - отвергнут\n"
 
@@ -3135,6 +3140,11 @@ msgstr ""
 msgid "Secret key is available.\n"
 msgstr "Секретный ключ доступен.\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "Секретный ключ доступен.\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "Для данного действия нужен секретный ключ.\n"
 
diff --git a/po/sk.po b/po/sk.po
index d8b898c..6880122 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1442,6 +1442,10 @@ msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "Akú veľkosť kľúča si prajete? (1024) "
 
 #, c-format
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr ""
+
+#, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrúhlené na %u bitov\n"
 
@@ -2773,14 +2777,6 @@ msgid "key %s: doesn't match our copy\n"
 msgstr "kľúč %08lX: nezodpovedá našej kópii\n"
 
 #, fuzzy, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "kľúč %08lX: nemôžem nájsť originálny blok kľúča: %s\n"
-
-#, fuzzy, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "kľúč %08lX: nemôžem čítať originálny blok kľúča: %s\n"
-
-#, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "kľúč %08lX: \"%s\" 1 nový identifikátor užívateľa\n"
 
@@ -2869,6 +2865,14 @@ msgstr ""
 "kľúč %08lX: chýba verejný kľúč - nemôžem aplikovať revokačný certifikát\n"
 
 #, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "kľúč %08lX: nemôžem nájsť originálny blok kľúča: %s\n"
+
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "kľúč %08lX: nemôžem čítať originálny blok kľúča: %s\n"
+
+#, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "kľúč %08lX: neplatný revokačný certifikát: %s - zamietnuté\n"
 
@@ -3369,6 +3373,11 @@ msgstr ""
 msgid "Secret key is available.\n"
 msgstr "Tajný kľúč je dostupný.\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "Tajný kľúč je dostupný.\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "Na vykonanie tejto operácie je potrebný tajný kľúč.\n"
 
diff --git a/po/sv.po b/po/sv.po
index ca7ba7e..8d94c9a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg trunk\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2011-01-12 14:53+0100\n"
+"PO-Revision-Date: 2017-11-02 17:41+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -1479,11 +1479,6 @@ msgstr "fel vid hämtning av aktuell nyckelinformation: %s\n"
 msgid "Replace existing key? (y/N) "
 msgstr "Ersätt existerande nyckel? (j/N) "
 
-#, fuzzy
-#| msgid ""
-#| "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"
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1506,6 +1501,13 @@ msgstr "Vilken nyckelstorlek vill du använda för krypteringsnyckeln? (%u) "
 msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "Vilken nyckelstorlek vill du använda för autentiseringsnyckeln? (%u) "
 
+#, fuzzy, c-format
+#| msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr ""
+"Kortet kommer nu att konfigureras om för att generera en nyckel med %u "
+"bitar\n"
+
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "avrundade uppåt till %u bitar\n"
@@ -2875,14 +2877,6 @@ msgid "key %s: doesn't match our copy\n"
 msgstr "nyckel %s: stämmer inte mot vår lokala kopia\n"
 
 #, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "nyckel %s: kan inte hitta det ursprungliga nyckelblocket: %s\n"
-
-#, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "nyckel %s: kan inte läsa det ursprungliga nyckelblocket %s\n"
-
-#, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "nyckel %s: \"%s\" 1 ny användaridentitet\n"
 
@@ -2971,6 +2965,14 @@ msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "nyckel %s: ingen publik nyckel - kan inte verkställa spärrcertifikat\n"
 
 #, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "nyckel %s: kan inte hitta det ursprungliga nyckelblocket: %s\n"
+
+#, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "nyckel %s: kan inte läsa det ursprungliga nyckelblocket %s\n"
+
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - avvisat\n"
 
@@ -3441,6 +3443,11 @@ msgstr ""
 msgid "Secret key is available.\n"
 msgstr "Den hemliga nyckeln finns tillgänglig.\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "Den hemliga nyckeln finns tillgänglig.\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "Den hemliga nyckeln behövs för att göra detta.\n"
 
diff --git a/po/tr.po b/po/tr.po
index c1743f3..cc77eb9 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1461,6 +1461,10 @@ msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
 
 #, c-format
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr ""
+
+#, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u bite yuvarlandı\n"
 
@@ -2802,14 +2806,6 @@ msgid "key %s: doesn't match our copy\n"
 msgstr "anahtar %s: bizim kopyamızla eşleşmiyor\n"
 
 #, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "anahtar %s: özgün anahtar bloku bulunamadı: %s\n"
-
-#, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "anahtar %s: özgün anahtar bloku okunamadı: %s\n"
-
-#, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "anahtar %s: \"%s\" 1 yeni kullanıcı kimliği\n"
 
@@ -2900,6 +2896,14 @@ msgstr ""
 "uygulanamaz\n"
 
 #, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "anahtar %s: özgün anahtar bloku bulunamadı: %s\n"
+
+#, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "anahtar %s: özgün anahtar bloku okunamadı: %s\n"
+
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
@@ -3377,6 +3381,11 @@ msgstr ""
 msgid "Secret key is available.\n"
 msgstr "Gizli anahtar mevcut.\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "Gizli anahtar mevcut.\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
 
diff --git a/po/uk.po b/po/uk.po
index abbe116..9316d81 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 2.1.0\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2017-01-27 14:10+0200\n"
+"PO-Revision-Date: 2017-11-02 17:41+0100\n"
 "Last-Translator: Yuri Chornoivan <yurchor at ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk at kde.org>\n"
 "Language: uk\n"
@@ -1356,6 +1356,12 @@ msgstr "Яким має бути розмір ключа для шифруван
 msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "Якому розміру ключа для розпізнавання ви надаєте перевагу? (%u) "
 
+#, fuzzy, c-format
+#| msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr ""
+"Зараз налаштування картки буде змінено для створення %u-бітового ключа\n"
+
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "округлено до %u бітів\n"
@@ -2626,14 +2632,6 @@ msgid "key %s: doesn't match our copy\n"
 msgstr "ключ %s: не відповідає нашій копії\n"
 
 #, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "ключ %s: не вдалося знайти початковий блок ключів: %s\n"
-
-#, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "ключ %s: не вдалося прочитати початковий блок ключів: %s\n"
-
-#, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "ключ %s: «%s» 1 новий ідентифікатор користувача\n"
 
@@ -2723,6 +2721,14 @@ msgstr ""
 "відкликання\n"
 
 #, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "ключ %s: не вдалося знайти початковий блок ключів: %s\n"
+
+#, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "ключ %s: не вдалося прочитати початковий блок ключів: %s\n"
+
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "ключ %s: некоректний сертифікат відкликання: %s — відкинуто\n"
 
@@ -3182,6 +3188,11 @@ msgstr ""
 msgid "Secret key is available.\n"
 msgstr "Доступний закритий ключ.\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "Доступний закритий ключ.\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "Для цього потрібен закритий ключ.\n"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0cf93cb..4b3954c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1427,6 +1427,10 @@ msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "您想要用多大的密钥尺寸?(%u)"
 
 #, c-format
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr ""
+
+#, c-format
 msgid "rounded up to %u bits\n"
 msgstr "舍入到 %u 位\n"
 
@@ -2739,14 +2743,6 @@ msgid "key %s: doesn't match our copy\n"
 msgstr "密钥 %s:与我们的副本不吻合\n"
 
 #, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "密钥 %s:无法定位原始的密钥区块:%s\n"
-
-#, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "密钥 %s:无法读取原始的密钥区块: %s\n"
-
-#, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "密钥 %s:“%s”一个新的用户标识\n"
 
@@ -2834,6 +2830,14 @@ msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "密钥 %s:没有公钥――无法应用吊销证书\n"
 
 #, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "密钥 %s:无法定位原始的密钥区块:%s\n"
+
+#, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "密钥 %s:无法读取原始的密钥区块: %s\n"
+
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "密钥 %s:无效的吊销证书:%s――已拒绝\n"
 
@@ -3280,6 +3284,11 @@ msgstr "压缩不可用的用户标识并删除所有签名"
 msgid "Secret key is available.\n"
 msgstr "私钥可用。\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "私钥可用。\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "要有私钥才能这么做。\n"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a3f29b6..f997fa1 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 2.1.0\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2014-11-22 20:56+0800\n"
+"PO-Revision-Date: 2017-11-02 17:42+0100\n"
 "Last-Translator: Jedi Lin <Jedi at Jedi.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
 "Language: zh_TW\n"
@@ -1355,6 +1355,11 @@ msgstr "你的加密金鑰想要用多大的金鑰尺寸? (%u) "
 msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "你的認證金鑰想要用多大的金鑰尺寸? (%u) "
 
+#, fuzzy, c-format
+#| msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr "這張卡片將重新加以組態, 以便產生 %u 位元的金鑰\n"
+
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "加大到 %u 位元\n"
@@ -2600,14 +2605,6 @@ msgid "key %s: doesn't match our copy\n"
 msgstr "金鑰 %s: 跟我們的副本不吻合\n"
 
 #, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "金鑰 %s: 無法定址原始的金鑰區塊: %s\n"
-
-#, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
-
-#, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
 
@@ -2693,6 +2690,14 @@ msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
 
 #, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "金鑰 %s: 無法定址原始的金鑰區塊: %s\n"
+
+#, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
+
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
 
@@ -3139,6 +3144,11 @@ msgstr "從金鑰中精簡無法使用的使用者 ID 並移除所有的簽章"
 msgid "Secret key is available.\n"
 msgstr "私鑰可用.\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "私鑰可用.\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "要有私鑰纔能這麼做.\n"
 

commit a124907742ab9c2fa382caa4e52803565cb083a3
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Nov 2 17:38:02 2017 +0100

    po: Update German translation
    
    --

diff --git a/po/de.po b/po/de.po
index 2f82d99..e974ddc 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-09-26 11:51+0200\n"
+"PO-Revision-Date: 2017-11-02 17:36+0100\n"
 "Last-Translator: Werner Koch <wk at gnupg.org>\n"
 "Language-Team: German <de at li.org>\n"
 "Language: de\n"
@@ -1378,6 +1378,10 @@ msgstr ""
 "Welche Schlüssellänge wünschen Sie für den Authentisierungs-Schlüssel? (%u) "
 
 #, c-format
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr "Die Karte wird nun rekonfiguriert für einen Schlüssel des Typs: %s\n"
+
+#, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
@@ -2629,14 +2633,6 @@ msgid "key %s: doesn't match our copy\n"
 msgstr "Schlüssel %s: Stimmt nicht mit unserer Kopie überein\n"
 
 #, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "Schlüssel %s: der originale Schlüsselblock wurde nicht gefunden: %s\n"
-
-#, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "Schlüssel %s: Lesefehler im originalen Schlüsselblock: %s\n"
-
-#, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "Schlüssel %s: \"%s\" 1 neue User-ID\n"
 
@@ -2727,6 +2723,14 @@ msgstr ""
 "angebracht werden\n"
 
 #, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "Schlüssel %s: der originale Schlüsselblock wurde nicht gefunden: %s\n"
+
+#, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "Schlüssel %s: Lesefehler im originalen Schlüsselblock: %s\n"
+
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "Schlüssel %s: Ungültiges Widerrufzertifikat: %s - zurückgewiesen\n"
 
@@ -3191,6 +3195,9 @@ msgstr ""
 msgid "Secret key is available.\n"
 msgstr "Geheimer Schlüssel ist vorhanden.\n"
 
+msgid "Secret subkeys are available.\n"
+msgstr "Geheimer Unterschlüssel ist vorhanden.\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "Hierzu wird der geheime Schlüssel benötigt.\n"
 
@@ -5841,8 +5848,6 @@ msgstr ""
 "WARNUNG: Wir müssen noch eine mit diesem Schlüssel signierte Nachricht "
 "sehen.\n"
 
-#, fuzzy
-#| msgid "Warning: we've only seen a single message signed by this key!\n"
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""

commit acb300543422c660c87ac2f0211a42f792a65cc4
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Nov 2 17:11:03 2017 +0100

    gpg: Introduce magic value 25519 to switch a card to ECC.
    
    * g10/card-util.c (ask_card_keyattr): Handle special value 25519.
    (do_change_keyattr): Allow changing to cv25519/ed25519.
    (generate_card_keys): Ditto.
    (card_generate_subkey): Ditto.
    --
    
    This is kludge to make it easier for gnuk to be switched into ECC
    mode.  This is basically the same change as
    commit ea09b6cded9d31a8ebd91878553c3eaa2b76e817
    but without the string change in show_keysize_warning.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/card-util.c b/g10/card-util.c
index 022e9a6..ef67610 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -1350,40 +1350,61 @@ ask_card_keyattr (int keyno, unsigned int nbits)
       xfree (prompt);
       xfree (answer);
 
-      if (req_nbits != nbits && (req_nbits % 32) )
+      if (req_nbits == 25519)
         {
-          req_nbits = ((req_nbits + 31) / 32) * 32;
-          tty_printf (_("rounded up to %u bits\n"), req_nbits);
-        }
-
-      if (req_nbits == nbits)
-        return 0;  /* Use default.  */
+          if (req_nbits == nbits)
+            return 0;  /* Use default.  */
 
-      if (req_nbits < min_nbits || req_nbits > max_nbits)
-        {
-          tty_printf (_("%s keysizes must be in the range %u-%u\n"),
-                      "RSA", min_nbits, max_nbits);
+          tty_printf (_("The card will now be re-configured"
+                        " to generate a key of type: %s\n"),
+                      keyno==1? "cv25519":"ed25519");
+          show_keysize_warning ();
+          return req_nbits;
         }
       else
         {
-          tty_printf (_("The card will now be re-configured "
-                        "to generate a key of %u bits\n"), req_nbits);
-          show_keysize_warning ();
-          return req_nbits;
+          if (req_nbits != nbits && (req_nbits % 32) )
+            {
+              req_nbits = ((req_nbits + 31) / 32) * 32;
+              tty_printf (_("rounded up to %u bits\n"), req_nbits);
+            }
+
+          if (req_nbits == nbits)
+            return 0;  /* Use default.  */
+
+          if (req_nbits < min_nbits || req_nbits > max_nbits)
+            {
+              tty_printf (_("%s keysizes must be in the range %u-%u\n"),
+                      "RSA", min_nbits, max_nbits);
+            }
+          else
+            {
+              tty_printf (_("The card will now be re-configured"
+                            " to generate a key of %u bits\n"), req_nbits);
+              show_keysize_warning ();
+              return req_nbits;
+            }
         }
     }
 }
 
 
 /* Change the size of key KEYNO (0..2) to NBITS and show an error
-   message if that fails.  */
+ * message if that fails.  Using the magic value 25519 for NBITS
+ * switches to ed25519 or cv25519 depending on the KEYNO.  */
 static gpg_error_t
 do_change_keyattr (int keyno, unsigned int nbits)
 {
   gpg_error_t err;
   char args[100];
 
-  snprintf (args, sizeof args, "--force %d 1 rsa%u", keyno+1, nbits);
+  if (nbits == 25519)
+    snprintf (args, sizeof args, "--force %d %d %s",
+              keyno+1,
+              keyno == 1? PUBKEY_ALGO_ECDH : PUBKEY_ALGO_EDDSA,
+              keyno == 1? "cv25519" : "ed25519");
+  else
+    snprintf (args, sizeof args, "--force %d 1 rsa%u", keyno+1, nbits);
   err = agent_scd_setattr ("KEY-ATTR", args, strlen (args), NULL);
   if (err)
     log_error (_("error changing size of key %d to %u bits: %s\n"),
@@ -1457,9 +1478,15 @@ generate_card_keys (ctrl_t ctrl)
 
       for (keyno = 0; keyno < DIM (info.key_attr); keyno++)
         {
-          if (info.key_attr[keyno].algo == PUBKEY_ALGO_RSA)
+          if (info.key_attr[keyno].algo == PUBKEY_ALGO_RSA
+              || info.key_attr[keyno].algo == PUBKEY_ALGO_ECDH
+              || info.key_attr[keyno].algo == PUBKEY_ALGO_EDDSA)
             {
-              nbits = ask_card_keyattr (keyno, info.key_attr[keyno].nbits);
+              if (info.key_attr[keyno].algo == PUBKEY_ALGO_RSA)
+                nbits = ask_card_keyattr (keyno, info.key_attr[keyno].nbits);
+              else
+                nbits = ask_card_keyattr (keyno, 25519 /* magic */);
+
               if (nbits && do_change_keyattr (keyno, nbits))
                 {
                   /* Error: Better read the default key size again.  */
@@ -1537,12 +1564,18 @@ card_generate_subkey (ctrl_t ctrl, kbnode_t pub_keyblock)
      key size.  */
   if (info.is_v2 && info.extcap.aac)
     {
-      if (info.key_attr[keyno-1].algo == PUBKEY_ALGO_RSA)
+      if (info.key_attr[keyno-1].algo == PUBKEY_ALGO_RSA
+          || info.key_attr[keyno].algo == PUBKEY_ALGO_ECDH
+          || info.key_attr[keyno].algo == PUBKEY_ALGO_EDDSA)
         {
           unsigned int nbits;
 
         ask_again:
-          nbits = ask_card_keyattr (keyno-1, info.key_attr[keyno-1].nbits);
+          if (info.key_attr[keyno].algo == PUBKEY_ALGO_RSA)
+            nbits = ask_card_keyattr (keyno-1, info.key_attr[keyno-1].nbits);
+          else
+            nbits = ask_card_keyattr (keyno-1, 25519);
+
           if (nbits && do_change_keyattr (keyno-1, nbits))
             {
               /* Error: Better read the default key size again.  */

commit de3a740c2e1156e58d2f94faa85c051740c8988e
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Oct 27 14:44:53 2017 +0200

    gpg: Rename two card related functions in card-util.
    
    * g10/card-util.c (ask_card_rsa_keysize): Rename to ask_card_keyattr.
    (do_change_rsa_keysize): Rename to do_change_keyattr.
    --
    
    We want to support other algos than RSA and thus we need a better name
    for the functions.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
    (cherry picked from commit f795f4529d8ab5a05db1cc1960abd34390bfae1b)

diff --git a/g10/card-util.c b/g10/card-util.c
index 62b2a67..022e9a6 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -1328,7 +1328,7 @@ show_keysize_warning (void)
    select the prompt.  Returns 0 to use the default size (i.e. NBITS)
    or the selected size.  */
 static unsigned int
-ask_card_rsa_keysize (int keyno, unsigned int nbits)
+ask_card_keyattr (int keyno, unsigned int nbits)
 {
   unsigned int min_nbits = 1024;
   unsigned int max_nbits = 4096;
@@ -1378,7 +1378,7 @@ ask_card_rsa_keysize (int keyno, unsigned int nbits)
 /* Change the size of key KEYNO (0..2) to NBITS and show an error
    message if that fails.  */
 static gpg_error_t
-do_change_rsa_keysize (int keyno, unsigned int nbits)
+do_change_keyattr (int keyno, unsigned int nbits)
 {
   gpg_error_t err;
   char args[100];
@@ -1459,8 +1459,8 @@ generate_card_keys (ctrl_t ctrl)
         {
           if (info.key_attr[keyno].algo == PUBKEY_ALGO_RSA)
             {
-              nbits = ask_card_rsa_keysize (keyno, info.key_attr[keyno].nbits);
-              if (nbits && do_change_rsa_keysize (keyno, nbits))
+              nbits = ask_card_keyattr (keyno, info.key_attr[keyno].nbits);
+              if (nbits && do_change_keyattr (keyno, nbits))
                 {
                   /* Error: Better read the default key size again.  */
                   agent_release_card_info (&info);
@@ -1542,8 +1542,8 @@ card_generate_subkey (ctrl_t ctrl, kbnode_t pub_keyblock)
           unsigned int nbits;
 
         ask_again:
-          nbits = ask_card_rsa_keysize (keyno-1, info.key_attr[keyno-1].nbits);
-          if (nbits && do_change_rsa_keysize (keyno-1, nbits))
+          nbits = ask_card_keyattr (keyno-1, info.key_attr[keyno-1].nbits);
+          if (nbits && do_change_keyattr (keyno-1, nbits))
             {
               /* Error: Better read the default key size again.  */
               agent_release_card_info (&info);

-----------------------------------------------------------------------

Summary of changes:
 g10/card-util.c | 83 ++++++++++++++++++++++++++++++++++++++++-----------------
 po/ca.po        | 25 +++++++++++------
 po/cs.po        | 28 ++++++++++++-------
 po/da.po        | 33 +++++++++++++----------
 po/de.po        | 27 +++++++++++--------
 po/el.po        | 25 +++++++++++------
 po/eo.po        | 25 +++++++++++------
 po/es.po        | 33 +++++++++++++----------
 po/et.po        | 25 +++++++++++------
 po/fi.po        | 25 +++++++++++------
 po/fr.po        | 29 +++++++++++++-------
 po/gl.po        | 33 ++++++++++++++---------
 po/hu.po        | 25 +++++++++++------
 po/id.po        | 25 +++++++++++------
 po/it.po        | 25 +++++++++++------
 po/ja.po        | 28 ++++++++++++-------
 po/nb.po        | 28 ++++++++++++-------
 po/pl.po        | 33 +++++++++++++----------
 po/pt.po        | 25 +++++++++++------
 po/ro.po        | 25 +++++++++++------
 po/ru.po        | 28 ++++++++++++-------
 po/sk.po        | 25 +++++++++++------
 po/sv.po        | 35 ++++++++++++++----------
 po/tr.po        | 25 +++++++++++------
 po/uk.po        | 29 +++++++++++++-------
 po/zh_CN.po     | 25 +++++++++++------
 po/zh_TW.po     | 28 ++++++++++++-------
 27 files changed, 529 insertions(+), 271 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org




More information about the Gnupg-commits mailing list