aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2019-11-25 19:24:48 +0000
committerWerner Koch <[email protected]>2019-11-25 19:24:48 +0000
commit253fadbf88a351c7fc8914086c18911491a86428 (patch)
tree5fbe43ec4d7e16327e2f5f680d41c2cb026ff4cd
parentspeedo: Tell makensis the used charset of the script. (diff)
downloadgnupg-253fadbf88a351c7fc8914086c18911491a86428.tar.gz
gnupg-253fadbf88a351c7fc8914086c18911491a86428.zip
po: auto-update
--
-rw-r--r--po/ca.po74
-rw-r--r--po/cs.po80
-rw-r--r--po/da.po80
-rw-r--r--po/de.po4
-rw-r--r--po/el.po80
-rw-r--r--po/eo.po79
-rw-r--r--po/es.po80
-rw-r--r--po/et.po80
-rw-r--r--po/fi.po81
-rw-r--r--po/fr.po80
-rw-r--r--po/gl.po80
-rw-r--r--po/hu.po80
-rw-r--r--po/id.po80
-rw-r--r--po/it.po80
-rw-r--r--po/ja.po85
-rw-r--r--po/nb.po80
-rw-r--r--po/pl.po80
-rw-r--r--po/pt.po79
-rw-r--r--po/ro.po81
-rw-r--r--po/ru.po80
-rw-r--r--po/sk.po80
-rw-r--r--po/sv.po80
-rw-r--r--po/tr.po82
-rw-r--r--po/uk.po80
-rw-r--r--po/zh_CN.po96
-rw-r--r--po/zh_TW.po80
26 files changed, 1247 insertions, 774 deletions
diff --git a/po/ca.po b/po/ca.po
index abcdef3c3..e6bd38dd5 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -114,6 +114,7 @@ msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#. Do not translate the "SETERROR" keyword.
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
@@ -1401,14 +1402,11 @@ msgstr "La vostra selecció? "
msgid "[not set]"
msgstr "[no establert]"
-msgid "male"
-msgstr "home"
-
-msgid "female"
-msgstr "dóna"
+msgid "Mr."
+msgstr ""
-msgid "unspecified"
-msgstr "no especificat"
+msgid "Ms."
+msgstr ""
# Gènere? Nombre? Passat, futur? ivb
# Probablement és una clau, femení. jm
@@ -1470,7 +1468,7 @@ msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
msgid "Error: invalid characters in preference string.\n"
msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
-msgid "Sex ((M)ale, (F)emale or space): "
+msgid "Salutation (M = Mr., F = Ms., or space): "
msgstr ""
#, fuzzy
@@ -1654,7 +1652,7 @@ msgstr "canvia la data de caducitat"
msgid "change the language preferences"
msgstr "canvia la confiança"
-msgid "change card holder's sex"
+msgid "change card holder's salutation"
msgstr ""
#, fuzzy
@@ -4200,14 +4198,14 @@ msgid "Authenticate"
msgstr ""
#. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation. If this is not possible use single digits. The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
-#.
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
+#. * translation. If this is not possible use single digits. The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. * s = Toggle signing capability
+#. * e = Toggle encryption capability
+#. * a = Toggle authentication capability
+#. * q = Finish
#.
msgid "SsEeAaQq"
msgstr ""
@@ -4289,6 +4287,10 @@ msgstr " (%d) RSA (només xifrar)\n"
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (només xifrar)\n"
+#, fuzzy, c-format
+msgid " (%d) Existing key from card\n"
+msgstr " (%d) RSA (només xifrar)\n"
+
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Notació de signatura: "
@@ -4301,6 +4303,18 @@ msgid "No key with this keygrip\n"
msgstr "No hi ha cap ID amb l'índex %d\n"
#, fuzzy, c-format
+msgid "error reading the card: %s\n"
+msgstr "%s: error en llegir el registre lliure: %s\n"
+
+#, fuzzy, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "error en la creació de la contrasenya: %s\n"
+
+#, fuzzy
+msgid "Available keys:\n"
+msgstr "desactiva una clau"
+
+#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "arrodonida fins a %u bits\n"
@@ -5056,6 +5070,11 @@ msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "signatura %s, algorisme de resum %s\n"
#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
+msgstr "signatura %s, algorisme de resum %s\n"
+
+#, fuzzy, c-format
msgid "(reported error: %s)\n"
msgstr "error de lectura: %s\n"
@@ -7257,18 +7276,6 @@ msgstr " (%d) RSA (només xifrar)\n"
msgid " (%d) Existing key from card\n"
msgstr ""
-#, fuzzy, c-format
-msgid "error reading the card: %s\n"
-msgstr "%s: error en llegir el registre lliure: %s\n"
-
-#, fuzzy, c-format
-msgid "Serial number of the card: %s\n"
-msgstr "error en la creació de la contrasenya: %s\n"
-
-#, fuzzy
-msgid "Available keys:\n"
-msgstr "desactiva una clau"
-
#, c-format
msgid "Possible actions for a %s key:\n"
msgstr ""
@@ -9380,6 +9387,15 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "male"
+#~ msgstr "home"
+
+#~ msgid "female"
+#~ msgstr "dóna"
+
+#~ msgid "unspecified"
+#~ msgstr "no especificat"
+
#~ msgid "no keyserver known (use option --keyserver)\n"
#~ msgstr "no es coneix cap servidor de claus (useu l'opció \"--keyserver\")\n"
diff --git a/po/cs.po b/po/cs.po
index 532b977d5..cfa1b860a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -124,6 +124,7 @@ msgstr "neshodují se – zkuste to znovu"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#. Do not translate the "SETERROR" keyword.
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (pokus %d z %d)"
@@ -1296,14 +1297,11 @@ msgstr "Váš výběr? "
msgid "[not set]"
msgstr "[není nastaveno]"
-msgid "male"
-msgstr "muž"
-
-msgid "female"
-msgstr "žena"
+msgid "Mr."
+msgstr ""
-msgid "unspecified"
-msgstr "neuvedeno"
+msgid "Ms."
+msgstr ""
msgid "not forced"
msgstr "není vyžadováno"
@@ -1356,8 +1354,8 @@ msgstr "Chyba: neplatná délka řetězce s předvolbami.\n"
msgid "Error: invalid characters in preference string.\n"
msgstr "Chyba: neplatný znak v řetězci s předvolbami\n"
-msgid "Sex ((M)ale, (F)emale or space): "
-msgstr "Zadejte pohlaví: M – mužské, F – ženské, nebo stiskněte mezerník: "
+msgid "Salutation (M = Mr., F = Ms., or space): "
+msgstr ""
msgid "Error: invalid response.\n"
msgstr "Chyba: neplatná odpověď.\n"
@@ -1531,7 +1529,9 @@ msgstr "změnit login name"
msgid "change the language preferences"
msgstr "změnit jazykové předvolby"
-msgid "change card holder's sex"
+#, fuzzy
+#| msgid "change card holder's sex"
+msgid "change card holder's salutation"
msgstr "změní pohlaví držitele karty"
msgid "change a CA fingerprint"
@@ -3861,14 +3861,14 @@ msgid "Authenticate"
msgstr "Autentizace"
#. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation. If this is not possible use single digits. The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
-#.
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
+#. * translation. If this is not possible use single digits. The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. * s = Toggle signing capability
+#. * e = Toggle encryption capability
+#. * a = Toggle authentication capability
+#. * q = Finish
#.
msgid "SsEeAaQq"
msgstr "SsEeAaQq"
@@ -3948,6 +3948,11 @@ msgstr " (%d) ECC (pouze pro šifrování)\n"
msgid " (%d) Existing key\n"
msgstr " (%d) Existující klíč\n"
+#, fuzzy, c-format
+#| msgid " (%d) Existing key from card\n"
+msgid " (%d) Existing key from card\n"
+msgstr " (%d) Klíč existující na kartě\n"
+
msgid "Enter the keygrip: "
msgstr "Vložte keygrip: "
@@ -3958,6 +3963,17 @@ msgid "No key with this keygrip\n"
msgstr "Klíč s takovým keygripem neexistuje\n"
#, c-format
+msgid "error reading the card: %s\n"
+msgstr "chyba při čtení z karty: %s\n"
+
+#, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "Sériové číslo karty: %s\n"
+
+msgid "Available keys:\n"
+msgstr "Dostupné klíče:\n"
+
+#, c-format
msgid "rounded to %u bits\n"
msgstr "zaokrouhleno na %u bitů\n"
@@ -4687,6 +4703,11 @@ msgstr "VAROVÁNÍ: vyžádaný algoritmus %s není doporučen\n"
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "Poznámka: podpisy používající algoritmus %s jsou zamítány\n"
+#, fuzzy, c-format
+#| msgid "Note: signatures using the %s algorithm are rejected\n"
+msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
+msgstr "Poznámka: podpisy používající algoritmus %s jsou zamítány\n"
+
#, c-format
msgid "(reported error: %s)\n"
msgstr "(nahlášená chyba: %s)\n"
@@ -6837,17 +6858,6 @@ msgid " (%d) Existing key from card\n"
msgstr " (%d) Klíč existující na kartě\n"
#, c-format
-msgid "error reading the card: %s\n"
-msgstr "chyba při čtení z karty: %s\n"
-
-#, c-format
-msgid "Serial number of the card: %s\n"
-msgstr "Sériové číslo karty: %s\n"
-
-msgid "Available keys:\n"
-msgstr "Dostupné klíče:\n"
-
-#, c-format
msgid "Possible actions for a %s key:\n"
msgstr "Možné způsoby užití %s klíče:\n"
@@ -8882,6 +8892,18 @@ msgstr ""
"Syntaxe: gpg-check-pattern [volby] soubor_se_vzorem\n"
"Prověří heslo zadané na vstupu proti souboru se vzory\n"
+#~ msgid "male"
+#~ msgstr "muž"
+
+#~ msgid "female"
+#~ msgstr "žena"
+
+#~ msgid "unspecified"
+#~ msgstr "neuvedeno"
+
+#~ msgid "Sex ((M)ale, (F)emale or space): "
+#~ msgstr "Zadejte pohlaví: M – mužské, F – ženské, nebo stiskněte mezerník: "
+
#~ msgid "no keyserver known (use option --keyserver)\n"
#~ msgstr "žádný server klíčů není znám (použijte volbu --keyserver)\n"
diff --git a/po/da.po b/po/da.po
index 8b0407262..2a4e57eea 100644
--- a/po/da.po
+++ b/po/da.po
@@ -115,6 +115,7 @@ msgstr "matcher ikke - prøv igen"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#. Do not translate the "SETERROR" keyword.
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (forsøg %d af %d)"
@@ -1388,14 +1389,11 @@ msgstr "Dit valg? "
msgid "[not set]"
msgstr "[ikke indstillet]"
-msgid "male"
-msgstr "mand"
-
-msgid "female"
-msgstr "kvinde"
+msgid "Mr."
+msgstr ""
-msgid "unspecified"
-msgstr "ikke angivet"
+msgid "Ms."
+msgstr ""
msgid "not forced"
msgstr "ikke tvunget"
@@ -1450,8 +1448,8 @@ msgstr "Fejl: ugyldig længde for præferencestreng.\n"
msgid "Error: invalid characters in preference string.\n"
msgstr "Fejl: ugyldige tegn i præferencestreng.\n"
-msgid "Sex ((M)ale, (F)emale or space): "
-msgstr "Køn ((M)and, Kvinde(F) eller mellemrum): "
+msgid "Salutation (M = Mr., F = Ms., or space): "
+msgstr ""
msgid "Error: invalid response.\n"
msgstr "Fejl: ugyldigt svar.\n"
@@ -1646,7 +1644,9 @@ msgstr "ændr logindnavnet"
msgid "change the language preferences"
msgstr "ændr sprogpræferencerne"
-msgid "change card holder's sex"
+#, fuzzy
+#| msgid "change card holder's sex"
+msgid "change card holder's salutation"
msgstr "ændr kortholders køn"
msgid "change a CA fingerprint"
@@ -4139,14 +4139,14 @@ msgid "Authenticate"
msgstr "Godkend"
#. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation. If this is not possible use single digits. The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
-#.
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
+#. * translation. If this is not possible use single digits. The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. * s = Toggle signing capability
+#. * e = Toggle encryption capability
+#. * a = Toggle authentication capability
+#. * q = Finish
#.
msgid "SsEeAaQq"
msgstr "UuKkGfAa"
@@ -4231,6 +4231,11 @@ msgstr " (%d) RSA (kun krypter)\n"
msgid " (%d) Existing key\n"
msgstr " (%d) Eksisterende nøgle\n"
+#, fuzzy, c-format
+#| msgid " (%d) Existing key from card\n"
+msgid " (%d) Existing key from card\n"
+msgstr " (%d) Eksisterende nøgle fra kort\n"
+
# key grip
# chiefly ( US ) See also grip the person in charge of moving and setting up camera
# tracks and scenery in a film or television studio
@@ -4243,6 +4248,17 @@ msgstr "Ikke et gyldigt nøglegreb (forventer 40 hex cifre)\n"
msgid "No key with this keygrip\n"
msgstr "Ingen nøgle med dette nøglegreb\n"
+#, c-format
+msgid "error reading the card: %s\n"
+msgstr "fejl ved læsning af kort: %s\n"
+
+#, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "Serielnummer for kortet: %s\n"
+
+msgid "Available keys:\n"
+msgstr "Tilgængelige nøgler:\n"
+
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
@@ -4989,6 +5005,11 @@ msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "%s underskrift, sammendragsalgoritme %s\n"
#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
+msgstr "%s underskrift, sammendragsalgoritme %s\n"
+
+#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "(reported error: %s)\n"
msgstr "læsefejl i »%s«: %s\n"
@@ -7205,17 +7226,6 @@ msgid " (%d) Existing key from card\n"
msgstr " (%d) Eksisterende nøgle fra kort\n"
#, c-format
-msgid "error reading the card: %s\n"
-msgstr "fejl ved læsning af kort: %s\n"
-
-#, c-format
-msgid "Serial number of the card: %s\n"
-msgstr "Serielnummer for kortet: %s\n"
-
-msgid "Available keys:\n"
-msgstr "Tilgængelige nøgler:\n"
-
-#, c-format
msgid "Possible actions for a %s key:\n"
msgstr "Mulige handlinger for en %s-nøgle:\n"
@@ -9503,6 +9513,18 @@ msgstr ""
"Syntaks: gpg-check-pattern [tilvalg] mønsterfil\n"
"Kontroller en adgangsfrase angivet på stdin mod mønsterfilen\n"
+#~ msgid "male"
+#~ msgstr "mand"
+
+#~ msgid "female"
+#~ msgstr "kvinde"
+
+#~ msgid "unspecified"
+#~ msgstr "ikke angivet"
+
+#~ msgid "Sex ((M)ale, (F)emale or space): "
+#~ msgstr "Køn ((M)and, Kvinde(F) eller mellemrum): "
+
#~ msgid "no keyserver known (use option --keyserver)\n"
#~ msgstr "ingen kendt nøgleserver (brug tilvalget --keyserver)\n"
diff --git a/po/de.po b/po/de.po
index 7fa0f00e2..f7bd36755 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4749,7 +4749,9 @@ msgstr "Hinweis: %s basierte Signaturen werden zurückgewiesen.\n"
#, c-format
msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
-msgstr "Hinweis: Beglaubigungen von Dritten basierend auf dem %s Algorithmus werden zurückgewiesen.\n"
+msgstr ""
+"Hinweis: Beglaubigungen von Dritten basierend auf dem %s Algorithmus werden "
+"zurückgewiesen.\n"
#, c-format
msgid "(reported error: %s)\n"
diff --git a/po/el.po b/po/el.po
index 775ccb260..7303b0677 100644
--- a/po/el.po
+++ b/po/el.po
@@ -95,6 +95,7 @@ msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#. Do not translate the "SETERROR" keyword.
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
@@ -1334,17 +1335,11 @@ msgstr "Η επιλογή σας; "
msgid "[not set]"
msgstr ""
-#, fuzzy
-msgid "male"
-msgstr "enable"
-
-#, fuzzy
-msgid "female"
-msgstr "enable"
+msgid "Mr."
+msgstr ""
-#, fuzzy
-msgid "unspecified"
-msgstr "Δεν έχει οριστεί αιτία"
+msgid "Ms."
+msgstr ""
#, fuzzy
msgid "not forced"
@@ -1403,7 +1398,7 @@ msgstr "μη έγκυρος χαρακτήρας στο \"κορδόνι\" τη�
msgid "Error: invalid characters in preference string.\n"
msgstr "μη έγκυρος χαρακτήρας στο \"κορδόνι\" της επιλογής\n"
-msgid "Sex ((M)ale, (F)emale or space): "
+msgid "Salutation (M = Mr., F = Ms., or space): "
msgstr ""
#, fuzzy
@@ -1586,7 +1581,7 @@ msgstr "αλλαγή της ημερομηνίας λήξης"
msgid "change the language preferences"
msgstr "αλλαγή της εμπιστοσύνης ιδιοκτήτη"
-msgid "change card holder's sex"
+msgid "change card holder's salutation"
msgstr ""
#, fuzzy
@@ -4103,14 +4098,14 @@ msgid "Authenticate"
msgstr ""
#. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation. If this is not possible use single digits. The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
-#.
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
+#. * translation. If this is not possible use single digits. The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. * s = Toggle signing capability
+#. * e = Toggle encryption capability
+#. * a = Toggle authentication capability
+#. * q = Finish
#.
msgid "SsEeAaQq"
msgstr ""
@@ -4192,6 +4187,10 @@ msgstr " (%d) RSA (για κρυπτογράφηση μόνο)\n"
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (για κρυπτογράφηση μόνο)\n"
+#, fuzzy, c-format
+msgid " (%d) Existing key from card\n"
+msgstr " (%d) RSA (για κρυπτογράφηση μόνο)\n"
+
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Σημείωση υπογραφής: "
@@ -4204,6 +4203,18 @@ msgid "No key with this keygrip\n"
msgstr "Δεν υπάρχει user ID με δείκτη %d\n"
#, fuzzy, c-format
+msgid "error reading the card: %s\n"
+msgstr "%s: σφάλμα στην ανάγνωση της εγγραφής free : %s\n"
+
+#, fuzzy, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
+
+#, fuzzy
+msgid "Available keys:\n"
+msgstr "απενεργοποιεί ένα κλειδί"
+
+#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "στρογγυλοποιήθηκε έως τα %u bits\n"
@@ -4953,6 +4964,11 @@ msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "%s υπογραφή, αλγόριθμος περίληψης %s\n"
#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
+msgstr "%s υπογραφή, αλγόριθμος περίληψης %s\n"
+
+#, fuzzy, c-format
msgid "(reported error: %s)\n"
msgstr "σφάλμα ανάγνωσης: %s\n"
@@ -7108,18 +7124,6 @@ msgstr " (%d) RSA (για κρυπτογράφηση μόνο)\n"
msgid " (%d) Existing key from card\n"
msgstr ""
-#, fuzzy, c-format
-msgid "error reading the card: %s\n"
-msgstr "%s: σφάλμα στην ανάγνωση της εγγραφής free : %s\n"
-
-#, fuzzy, c-format
-msgid "Serial number of the card: %s\n"
-msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
-
-#, fuzzy
-msgid "Available keys:\n"
-msgstr "απενεργοποιεί ένα κλειδί"
-
#, c-format
msgid "Possible actions for a %s key:\n"
msgstr ""
@@ -9214,6 +9218,18 @@ msgid ""
msgstr ""
#, fuzzy
+#~ msgid "male"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "female"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "unspecified"
+#~ msgstr "Δεν έχει οριστεί αιτία"
+
+#, fuzzy
#~ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
#~ msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
diff --git a/po/eo.po b/po/eo.po
index afe624f15..61cba2f21 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -95,6 +95,7 @@ msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#. Do not translate the "SETERROR" keyword.
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
@@ -1334,17 +1335,11 @@ msgstr "Via elekto? "
msgid "[not set]"
msgstr ""
-#, fuzzy
-msgid "male"
-msgstr "en"
-
-#, fuzzy
-msgid "female"
-msgstr "en"
+msgid "Mr."
+msgstr ""
-#, fuzzy
-msgid "unspecified"
-msgstr "Nenia kialo specifita"
+msgid "Ms."
+msgstr ""
#, fuzzy
msgid "not forced"
@@ -1403,7 +1398,7 @@ msgstr "nevalida signo en signoĉeno\n"
msgid "Error: invalid characters in preference string.\n"
msgstr "nevalida signo en signoĉeno\n"
-msgid "Sex ((M)ale, (F)emale or space): "
+msgid "Salutation (M = Mr., F = Ms., or space): "
msgstr ""
#, fuzzy
@@ -1586,7 +1581,7 @@ msgstr "ŝanĝi la daton de eksvalidiĝo"
msgid "change the language preferences"
msgstr "ŝanĝi la posedantofidon"
-msgid "change card holder's sex"
+msgid "change card holder's salutation"
msgstr ""
#, fuzzy
@@ -4064,14 +4059,14 @@ msgid "Authenticate"
msgstr ""
#. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation. If this is not possible use single digits. The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
-#.
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
+#. * translation. If this is not possible use single digits. The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. * s = Toggle signing capability
+#. * e = Toggle encryption capability
+#. * a = Toggle authentication capability
+#. * q = Finish
#.
msgid "SsEeAaQq"
msgstr ""
@@ -4153,6 +4148,10 @@ msgstr " (%d) RSA (nur ĉifri)\n"
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (nur ĉifri)\n"
+#, fuzzy, c-format
+msgid " (%d) Existing key from card\n"
+msgstr " (%d) RSA (nur ĉifri)\n"
+
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Subskribo-notacio: "
@@ -4165,6 +4164,18 @@ msgid "No key with this keygrip\n"
msgstr "Mankas uzantidentigilo kun indekso %d\n"
#, fuzzy, c-format
+msgid "error reading the card: %s\n"
+msgstr "%s: eraro dum legado de libera registro: %s\n"
+
+#, fuzzy, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "eraro dum kreado de pasfrazo: %s\n"
+
+#, fuzzy
+msgid "Available keys:\n"
+msgstr "malŝalti ŝlosilon"
+
+#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "rondigita ĝis %u bitoj\n"
@@ -4907,6 +4918,10 @@ msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "%s-subskribo de: %s\n"
#, fuzzy, c-format
+msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
+msgstr "%s-subskribo de: %s\n"
+
+#, fuzzy, c-format
msgid "(reported error: %s)\n"
msgstr "kiraso: %s\n"
@@ -7032,18 +7047,6 @@ msgstr " (%d) RSA (nur ĉifri)\n"
msgid " (%d) Existing key from card\n"
msgstr ""
-#, fuzzy, c-format
-msgid "error reading the card: %s\n"
-msgstr "%s: eraro dum legado de libera registro: %s\n"
-
-#, fuzzy, c-format
-msgid "Serial number of the card: %s\n"
-msgstr "eraro dum kreado de pasfrazo: %s\n"
-
-#, fuzzy
-msgid "Available keys:\n"
-msgstr "malŝalti ŝlosilon"
-
#, c-format
msgid "Possible actions for a %s key:\n"
msgstr ""
@@ -9129,6 +9132,18 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#, fuzzy
+#~ msgid "male"
+#~ msgstr "en"
+
+#, fuzzy
+#~ msgid "female"
+#~ msgstr "en"
+
+#, fuzzy
+#~ msgid "unspecified"
+#~ msgstr "Nenia kialo specifita"
+
#~ msgid "no keyserver known (use option --keyserver)\n"
#~ msgstr "neniu ŝlosilservilo konata (uzu la opcion --keyserver)\n"
diff --git a/po/es.po b/po/es.po
index b73819e4e..5d8881a5c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -105,6 +105,7 @@ msgstr "no coincide - reinténtelo"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#. Do not translate the "SETERROR" keyword.
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (intento %d de %d)"
@@ -1299,14 +1300,11 @@ msgstr "Su elección: "
msgid "[not set]"
msgstr "[no establecido]"
-msgid "male"
-msgstr "hombre"
-
-msgid "female"
-msgstr "mujer"
+msgid "Mr."
+msgstr ""
-msgid "unspecified"
-msgstr "no especificado"
+msgid "Ms."
+msgstr ""
msgid "not forced"
msgstr "no forzado"
@@ -1359,8 +1357,8 @@ msgstr "Error: longitud de la cadena de preferencias inválida.\n"
msgid "Error: invalid characters in preference string.\n"
msgstr "Error: caracteres inválidos en cadena de preferencias.\n"
-msgid "Sex ((M)ale, (F)emale or space): "
-msgstr "Sexo ((H)ombre, (M)mujer o espacio): "
+msgid "Salutation (M = Mr., F = Ms., or space): "
+msgstr ""
msgid "Error: invalid response.\n"
msgstr "Error: respuesta no válida.\n"
@@ -1534,7 +1532,9 @@ msgstr "cambiar nombre de usuario"
msgid "change the language preferences"
msgstr "cambiar preferencias de idioma"
-msgid "change card holder's sex"
+#, fuzzy
+#| msgid "change card holder's sex"
+msgid "change card holder's salutation"
msgstr "cambiar sexo del titular de la tarjeta"
msgid "change a CA fingerprint"
@@ -3860,14 +3860,14 @@ msgid "Authenticate"
msgstr "Autentificación"
#. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation. If this is not possible use single digits. The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
-#.
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
+#. * translation. If this is not possible use single digits. The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. * s = Toggle signing capability
+#. * e = Toggle encryption capability
+#. * a = Toggle authentication capability
+#. * q = Finish
#.
msgid "SsEeAaQq"
msgstr "FfCcAaSs"
@@ -3947,6 +3947,11 @@ msgstr " (%d) ECC (sólo cifrar)\n"
msgid " (%d) Existing key\n"
msgstr " (%d) Clave existente\n"
+#, fuzzy, c-format
+#| msgid " (%d) Existing key from card\n"
+msgid " (%d) Existing key from card\n"
+msgstr " (%d) Clave existente de la tarjeta\n"
+
msgid "Enter the keygrip: "
msgstr "Introduzca keygrip: "
@@ -3957,6 +3962,17 @@ msgid "No key with this keygrip\n"
msgstr "No hay claves con ese keygrip\n"
#, c-format
+msgid "error reading the card: %s\n"
+msgstr "error al leer la tarjeta: %s\n"
+
+#, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "Número de serie de la tarjeta: %s\n"
+
+msgid "Available keys:\n"
+msgstr "Claves disponibles:\n"
+
+#, c-format
msgid "rounded to %u bits\n"
msgstr "redondeados a %u bits\n"
@@ -4672,6 +4688,11 @@ msgstr "AVISO: el algoritmo de resumen %s está obsoleto\n"
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "Atención: las firmas que usan el algoritmo %s son rechazadas\n"
+#, fuzzy, c-format
+#| msgid "Note: signatures using the %s algorithm are rejected\n"
+msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
+msgstr "Atención: las firmas que usan el algoritmo %s son rechazadas\n"
+
#, c-format
msgid "(reported error: %s)\n"
msgstr "(error reportado: %s)\n"
@@ -6819,17 +6840,6 @@ msgid " (%d) Existing key from card\n"
msgstr " (%d) Clave existente de la tarjeta\n"
#, c-format
-msgid "error reading the card: %s\n"
-msgstr "error al leer la tarjeta: %s\n"
-
-#, c-format
-msgid "Serial number of the card: %s\n"
-msgstr "Número de serie de la tarjeta: %s\n"
-
-msgid "Available keys:\n"
-msgstr "Claves disponibles:\n"
-
-#, c-format
msgid "Possible actions for a %s key:\n"
msgstr "Posibles acciones para una clave %s:\n"
@@ -8891,6 +8901,18 @@ msgstr ""
"Compara frase contraseña dada en entrada estándar con un fichero de "
"patrones\n"
+#~ msgid "male"
+#~ msgstr "hombre"
+
+#~ msgid "female"
+#~ msgstr "mujer"
+
+#~ msgid "unspecified"
+#~ msgstr "no especificado"
+
+#~ msgid "Sex ((M)ale, (F)emale or space): "
+#~ msgstr "Sexo ((H)ombre, (M)mujer o espacio): "
+
#~ msgid "no keyserver known (use option --keyserver)\n"
#~ msgstr "no hay servidores de claves conocidos (use opción --keyserver)\n"
diff --git a/po/et.po b/po/et.po
index ea5ca921f..5753a7373 100644
--- a/po/et.po
+++ b/po/et.po
@@ -92,6 +92,7 @@ msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#. Do not translate the "SETERROR" keyword.
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
@@ -1330,17 +1331,11 @@ msgstr "Teie valik? "
msgid "[not set]"
msgstr ""
-#, fuzzy
-msgid "male"
-msgstr "enable"
-
-#, fuzzy
-msgid "female"
-msgstr "enable"
+msgid "Mr."
+msgstr ""
-#, fuzzy
-msgid "unspecified"
-msgstr "Põhjus puudub"
+msgid "Ms."
+msgstr ""
#, fuzzy
msgid "not forced"
@@ -1399,7 +1394,7 @@ msgstr "lubamatu sümbol eelistuste sõnes\n"
msgid "Error: invalid characters in preference string.\n"
msgstr "lubamatu sümbol eelistuste sõnes\n"
-msgid "Sex ((M)ale, (F)emale or space): "
+msgid "Salutation (M = Mr., F = Ms., or space): "
msgstr ""
#, fuzzy
@@ -1582,7 +1577,7 @@ msgstr "muuda aegumise kuupäeva"
msgid "change the language preferences"
msgstr "muuda omaniku usaldust"
-msgid "change card holder's sex"
+msgid "change card holder's salutation"
msgstr ""
#, fuzzy
@@ -4063,14 +4058,14 @@ msgid "Authenticate"
msgstr ""
#. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation. If this is not possible use single digits. The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
-#.
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
+#. * translation. If this is not possible use single digits. The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. * s = Toggle signing capability
+#. * e = Toggle encryption capability
+#. * a = Toggle authentication capability
+#. * q = Finish
#.
msgid "SsEeAaQq"
msgstr ""
@@ -4152,6 +4147,10 @@ msgstr " (%d) RSA (ainult krüpteerimiseks)\n"
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (ainult krüpteerimiseks)\n"
+#, fuzzy, c-format
+msgid " (%d) Existing key from card\n"
+msgstr " (%d) RSA (ainult krüpteerimiseks)\n"
+
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Allkirja noteerimine: "
@@ -4164,6 +4163,18 @@ msgid "No key with this keygrip\n"
msgstr "Kasutaja ID numbriga %d puudub\n"
#, fuzzy, c-format
+msgid "error reading the card: %s\n"
+msgstr "%s: viga vaba kirje lugemisel: %s\n"
+
+#, fuzzy, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#, fuzzy
+msgid "Available keys:\n"
+msgstr "blokeeri võti"
+
+#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "ümardatud üles %u bitini\n"
@@ -4898,6 +4909,11 @@ msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
+msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
+
+#, fuzzy, c-format
msgid "(reported error: %s)\n"
msgstr "viga lugemisel: %s\n"
@@ -7028,18 +7044,6 @@ msgstr " (%d) RSA (ainult krüpteerimiseks)\n"
msgid " (%d) Existing key from card\n"
msgstr ""
-#, fuzzy, c-format
-msgid "error reading the card: %s\n"
-msgstr "%s: viga vaba kirje lugemisel: %s\n"
-
-#, fuzzy, c-format
-msgid "Serial number of the card: %s\n"
-msgstr "viga parooli loomisel: %s\n"
-
-#, fuzzy
-msgid "Available keys:\n"
-msgstr "blokeeri võti"
-
#, c-format
msgid "Possible actions for a %s key:\n"
msgstr ""
@@ -9130,6 +9134,18 @@ msgid ""
msgstr ""
#, fuzzy
+#~ msgid "male"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "female"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "unspecified"
+#~ msgstr "Põhjus puudub"
+
+#, fuzzy
#~ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
#~ msgstr "viga parooli loomisel: %s\n"
diff --git a/po/fi.po b/po/fi.po
index 90be315bd..9823b8ad8 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -108,6 +108,7 @@ msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#. Do not translate the "SETERROR" keyword.
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
@@ -1349,17 +1350,11 @@ msgstr "Valintasi? "
msgid "[not set]"
msgstr ""
-#, fuzzy
-msgid "male"
-msgstr "enable"
-
-#, fuzzy
-msgid "female"
-msgstr "enable"
+msgid "Mr."
+msgstr ""
-#, fuzzy
-msgid "unspecified"
-msgstr "Ei eriteltyä syytä"
+msgid "Ms."
+msgstr ""
#, fuzzy
msgid "not forced"
@@ -1418,7 +1413,7 @@ msgstr "Valinnassa on luvaton merkki\n"
msgid "Error: invalid characters in preference string.\n"
msgstr "Valinnassa on luvaton merkki\n"
-msgid "Sex ((M)ale, (F)emale or space): "
+msgid "Salutation (M = Mr., F = Ms., or space): "
msgstr ""
#, fuzzy
@@ -1601,7 +1596,7 @@ msgstr "muuta voimassoloaikaa"
msgid "change the language preferences"
msgstr "muuta luottamusastetta"
-msgid "change card holder's sex"
+msgid "change card holder's salutation"
msgstr ""
#, fuzzy
@@ -4088,14 +4083,14 @@ msgid "Authenticate"
msgstr ""
#. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation. If this is not possible use single digits. The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
-#.
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
+#. * translation. If this is not possible use single digits. The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. * s = Toggle signing capability
+#. * e = Toggle encryption capability
+#. * a = Toggle authentication capability
+#. * q = Finish
#.
msgid "SsEeAaQq"
msgstr ""
@@ -4177,6 +4172,10 @@ msgstr " (%d) RSA (vain salaus)\n"
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (vain salaus)\n"
+#, fuzzy, c-format
+msgid " (%d) Existing key from card\n"
+msgstr " (%d) RSA (vain salaus)\n"
+
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Allekirjoitusnotaatio: "
@@ -4189,6 +4188,18 @@ msgid "No key with this keygrip\n"
msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
#, fuzzy, c-format
+msgid "error reading the card: %s\n"
+msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
+
+#, fuzzy, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "virhe luotaessa salasanaa: %s\n"
+
+#, fuzzy
+msgid "Available keys:\n"
+msgstr "poista avain käytöstä"
+
+#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "pyöristetty %u bittiin\n"
@@ -4936,6 +4947,12 @@ msgstr ""
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
+# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
+#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
+msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
+
#, fuzzy, c-format
msgid "(reported error: %s)\n"
msgstr "lukuvirhe: %s\n"
@@ -7087,18 +7104,6 @@ msgstr " (%d) RSA (vain salaus)\n"
msgid " (%d) Existing key from card\n"
msgstr ""
-#, fuzzy, c-format
-msgid "error reading the card: %s\n"
-msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
-
-#, fuzzy, c-format
-msgid "Serial number of the card: %s\n"
-msgstr "virhe luotaessa salasanaa: %s\n"
-
-#, fuzzy
-msgid "Available keys:\n"
-msgstr "poista avain käytöstä"
-
#, c-format
msgid "Possible actions for a %s key:\n"
msgstr ""
@@ -9192,6 +9197,18 @@ msgid ""
msgstr ""
#, fuzzy
+#~ msgid "male"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "female"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "unspecified"
+#~ msgstr "Ei eriteltyä syytä"
+
+#, fuzzy
#~ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
#~ msgstr "virhe luotaessa salasanaa: %s\n"
diff --git a/po/fr.po b/po/fr.po
index 3fea7e9d8..b0ae0b9de 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -107,6 +107,7 @@ msgstr "ne correspond pas — veuillez réessayer"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#. Do not translate the "SETERROR" keyword.
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (essai %d sur %d)"
@@ -1322,14 +1323,11 @@ msgstr "Quel est votre choix ? "
msgid "[not set]"
msgstr "[non positionné]"
-msgid "male"
-msgstr "masculin"
-
-msgid "female"
-msgstr "féminin"
+msgid "Mr."
+msgstr ""
-msgid "unspecified"
-msgstr "non indiqué"
+msgid "Ms."
+msgstr ""
msgid "not forced"
msgstr "non forcé"
@@ -1382,8 +1380,8 @@ msgstr "Erreur : taille incorrecte de la chaîne de préférences.\n"
msgid "Error: invalid characters in preference string.\n"
msgstr "Erreur : caractères incorrects dans la chaîne de préférences.\n"
-msgid "Sex ((M)ale, (F)emale or space): "
-msgstr "Sexe ((M)asculin, (F)éminin ou espace) : "
+msgid "Salutation (M = Mr., F = Ms., or space): "
+msgstr ""
msgid "Error: invalid response.\n"
msgstr "Erreur : réponse incorrecte.\n"
@@ -1576,7 +1574,9 @@ msgstr "modifier l'identifiant de connexion"
msgid "change the language preferences"
msgstr "modifier les préférences de langue"
-msgid "change card holder's sex"
+#, fuzzy
+#| msgid "change card holder's sex"
+msgid "change card holder's salutation"
msgstr "modifier le sexe du détenteur de la carte"
msgid "change a CA fingerprint"
@@ -4026,14 +4026,14 @@ msgid "Authenticate"
msgstr "Authentifier"
#. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation. If this is not possible use single digits. The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
-#.
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
+#. * translation. If this is not possible use single digits. The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. * s = Toggle signing capability
+#. * e = Toggle encryption capability
+#. * a = Toggle authentication capability
+#. * q = Finish
#.
msgid "SsEeAaQq"
msgstr "SsCcAaQq"
@@ -4113,6 +4113,11 @@ msgstr " (%d) ECC (chiffrement seul)\n"
msgid " (%d) Existing key\n"
msgstr " (%d) Clef existante\n"
+#, fuzzy, c-format
+#| msgid " (%d) Existing key from card\n"
+msgid " (%d) Existing key from card\n"
+msgstr " (%d) Clef existante sur la carte\n"
+
msgid "Enter the keygrip: "
msgstr "Entrez le keygrip : "
@@ -4123,6 +4128,17 @@ msgid "No key with this keygrip\n"
msgstr "Pas de clef avec ce keygrip\n"
#, c-format
+msgid "error reading the card: %s\n"
+msgstr "erreur de lecture de la carte : %s\n"
+
+#, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "Numéro de série de la carte : %s\n"
+
+msgid "Available keys:\n"
+msgstr "Clefs disponibles :\n"
+
+#, c-format
msgid "rounded to %u bits\n"
msgstr "arrondie à %u bits\n"
@@ -4870,6 +4886,11 @@ msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "Remarque : les signatures utilisant l’algorithme %s sont rejetées\n"
#, fuzzy, c-format
+#| msgid "Note: signatures using the %s algorithm are rejected\n"
+msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
+msgstr "Remarque : les signatures utilisant l’algorithme %s sont rejetées\n"
+
+#, fuzzy, c-format
#| msgid "%s:%u: read error: %s\n"
msgid "(reported error: %s)\n"
msgstr "%s : %u : erreur de lecture : %s\n"
@@ -7126,17 +7147,6 @@ msgid " (%d) Existing key from card\n"
msgstr " (%d) Clef existante sur la carte\n"
#, c-format
-msgid "error reading the card: %s\n"
-msgstr "erreur de lecture de la carte : %s\n"
-
-#, c-format
-msgid "Serial number of the card: %s\n"
-msgstr "Numéro de série de la carte : %s\n"
-
-msgid "Available keys:\n"
-msgstr "Clefs disponibles :\n"
-
-#, c-format
msgid "Possible actions for a %s key:\n"
msgstr "Actions possibles pour une clef %s :\n"
@@ -9264,6 +9274,18 @@ msgstr ""
"Vérifier une phrase secrète donnée sur l'entrée standard par rapport à "
"ficmotif\n"
+#~ msgid "male"
+#~ msgstr "masculin"
+
+#~ msgid "female"
+#~ msgstr "féminin"
+
+#~ msgid "unspecified"
+#~ msgstr "non indiqué"
+
+#~ msgid "Sex ((M)ale, (F)emale or space): "
+#~ msgstr "Sexe ((M)asculin, (F)éminin ou espace) : "
+
#~ msgid "no keyserver known (use option --keyserver)\n"
#~ msgstr "pas de serveur de clefs connu (utilisez l'option --keyserver)\n"
diff --git a/po/gl.po b/po/gl.po
index d55566912..43b4881c4 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -93,6 +93,7 @@ msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#. Do not translate the "SETERROR" keyword.
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
@@ -1339,17 +1340,11 @@ msgstr "¿A súa selección? "
msgid "[not set]"
msgstr ""
-#, fuzzy
-msgid "male"
-msgstr "enable"
-
-#, fuzzy
-msgid "female"
-msgstr "enable"
+msgid "Mr."
+msgstr ""
-#, fuzzy
-msgid "unspecified"
-msgstr "Non se especificou un motivo"
+msgid "Ms."
+msgstr ""
#, fuzzy
msgid "not forced"
@@ -1408,7 +1403,7 @@ msgstr "caracter non válido na cadea de preferencias\n"
msgid "Error: invalid characters in preference string.\n"
msgstr "caracter non válido na cadea de preferencias\n"
-msgid "Sex ((M)ale, (F)emale or space): "
+msgid "Salutation (M = Mr., F = Ms., or space): "
msgstr ""
#, fuzzy
@@ -1591,7 +1586,7 @@ msgstr "cambia-la fecha de expiración"
msgid "change the language preferences"
msgstr "cambia-la confianza sobre o dono"
-msgid "change card holder's sex"
+msgid "change card holder's salutation"
msgstr ""
#, fuzzy
@@ -4098,14 +4093,14 @@ msgid "Authenticate"
msgstr ""
#. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation. If this is not possible use single digits. The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
-#.
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
+#. * translation. If this is not possible use single digits. The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. * s = Toggle signing capability
+#. * e = Toggle encryption capability
+#. * a = Toggle authentication capability
+#. * q = Finish
#.
msgid "SsEeAaQq"
msgstr ""
@@ -4187,6 +4182,10 @@ msgstr " (%d) RSA (só cifrar)\n"
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (só cifrar)\n"
+#, fuzzy, c-format
+msgid " (%d) Existing key from card\n"
+msgstr " (%d) RSA (só cifrar)\n"
+
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Notación de sinaturas: "
@@ -4199,6 +4198,18 @@ msgid "No key with this keygrip\n"
msgstr "Non hai ID de usuario con índice %d\n"
#, fuzzy, c-format
+msgid "error reading the card: %s\n"
+msgstr "%s: erro ao ler un rexistro libre: %s\n"
+
+#, fuzzy, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "erro ao crea-lo contrasinal: %s\n"
+
+#, fuzzy
+msgid "Available keys:\n"
+msgstr "deshabilitar unha chave"
+
+#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "redondeado a %u bits\n"
@@ -4945,6 +4956,11 @@ msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "Sinatura %s, algoritmo de resumo %s\n"
#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
+msgstr "Sinatura %s, algoritmo de resumo %s\n"
+
+#, fuzzy, c-format
msgid "(reported error: %s)\n"
msgstr "erro de lectura: %s\n"
@@ -7099,18 +7115,6 @@ msgstr " (%d) RSA (só cifrar)\n"
msgid " (%d) Existing key from card\n"
msgstr ""
-#, fuzzy, c-format
-msgid "error reading the card: %s\n"
-msgstr "%s: erro ao ler un rexistro libre: %s\n"
-
-#, fuzzy, c-format
-msgid "Serial number of the card: %s\n"
-msgstr "erro ao crea-lo contrasinal: %s\n"
-
-#, fuzzy
-msgid "Available keys:\n"
-msgstr "deshabilitar unha chave"
-
#, c-format
msgid "Possible actions for a %s key:\n"
msgstr ""
@@ -9210,6 +9214,18 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#, fuzzy
+#~ msgid "male"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "female"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "unspecified"
+#~ msgstr "Non se especificou un motivo"
+
#~ msgid "no keyserver known (use option --keyserver)\n"
#~ msgstr ""
#~ "non hai un servidor de chaves coñecido (empregue a opción --keyserver)\n"
diff --git a/po/hu.po b/po/hu.po
index 8cbb4b11c..e3cc928f7 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -92,6 +92,7 @@ msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#. Do not translate the "SETERROR" keyword.
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
@@ -1330,17 +1331,11 @@ msgstr "Mit választ? "
msgid "[not set]"
msgstr ""
-#, fuzzy
-msgid "male"
-msgstr "enable"
-
-#, fuzzy
-msgid "female"
-msgstr "enable"
+msgid "Mr."
+msgstr ""
-#, fuzzy
-msgid "unspecified"
-msgstr "Nincs megadva ok."
+msgid "Ms."
+msgstr ""
#, fuzzy
msgid "not forced"
@@ -1399,7 +1394,7 @@ msgstr "Érvénytelen karakter a preferenciák között!\n"
msgid "Error: invalid characters in preference string.\n"
msgstr "Érvénytelen karakter a preferenciák között!\n"
-msgid "Sex ((M)ale, (F)emale or space): "
+msgid "Salutation (M = Mr., F = Ms., or space): "
msgstr ""
#, fuzzy
@@ -1582,7 +1577,7 @@ msgstr "lejárat megváltoztatása"
msgid "change the language preferences"
msgstr "kulcstulajdonos megbízhatóságának beállítása"
-msgid "change card holder's sex"
+msgid "change card holder's salutation"
msgstr ""
#, fuzzy
@@ -4065,14 +4060,14 @@ msgid "Authenticate"
msgstr ""
#. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation. If this is not possible use single digits. The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
-#.
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
+#. * translation. If this is not possible use single digits. The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. * s = Toggle signing capability
+#. * e = Toggle encryption capability
+#. * a = Toggle authentication capability
+#. * q = Finish
#.
msgid "SsEeAaQq"
msgstr ""
@@ -4154,6 +4149,10 @@ msgstr " (%d) RSA (csak titkosítás)\n"
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (csak titkosítás)\n"
+#, fuzzy, c-format
+msgid " (%d) Existing key from card\n"
+msgstr " (%d) RSA (csak titkosítás)\n"
+
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Aláírás-jelölés: "
@@ -4166,6 +4165,18 @@ msgid "No key with this keygrip\n"
msgstr "Nincs %d indexű felhasználóazonosító!\n"
#, fuzzy, c-format
+msgid "error reading the card: %s\n"
+msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n"
+
+#, fuzzy, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "Hiba a jelszó létrehozásakor: %s.\n"
+
+#, fuzzy
+msgid "Available keys:\n"
+msgstr "kulcs tiltása"
+
+#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "Felkerekítve %u bitre.\n"
@@ -4915,6 +4926,11 @@ msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
+msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
+
+#, fuzzy, c-format
msgid "(reported error: %s)\n"
msgstr "Olvasási hiba: %s.\n"
@@ -7058,18 +7074,6 @@ msgstr " (%d) RSA (csak titkosítás)\n"
msgid " (%d) Existing key from card\n"
msgstr ""
-#, fuzzy, c-format
-msgid "error reading the card: %s\n"
-msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n"
-
-#, fuzzy, c-format
-msgid "Serial number of the card: %s\n"
-msgstr "Hiba a jelszó létrehozásakor: %s.\n"
-
-#, fuzzy
-msgid "Available keys:\n"
-msgstr "kulcs tiltása"
-
#, c-format
msgid "Possible actions for a %s key:\n"
msgstr ""
@@ -9160,6 +9164,18 @@ msgid ""
msgstr ""
#, fuzzy
+#~ msgid "male"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "female"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "unspecified"
+#~ msgstr "Nincs megadva ok."
+
+#, fuzzy
#~ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
#~ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
diff --git a/po/id.po b/po/id.po
index da18bfe32..545154750 100644
--- a/po/id.po
+++ b/po/id.po
@@ -97,6 +97,7 @@ msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#. Do not translate the "SETERROR" keyword.
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
@@ -1336,17 +1337,11 @@ msgstr "Pilihan anda? "
msgid "[not set]"
msgstr ""
-#, fuzzy
-msgid "male"
-msgstr "enable"
-
-#, fuzzy
-msgid "female"
-msgstr "enable"
+msgid "Mr."
+msgstr ""
-#, fuzzy
-msgid "unspecified"
-msgstr "Tidak ada alasan diberikan"
+msgid "Ms."
+msgstr ""
#, fuzzy
msgid "not forced"
@@ -1405,7 +1400,7 @@ msgstr "Karakter tidak valid dalam string preferensi\n"
msgid "Error: invalid characters in preference string.\n"
msgstr "Karakter tidak valid dalam string preferensi\n"
-msgid "Sex ((M)ale, (F)emale or space): "
+msgid "Salutation (M = Mr., F = Ms., or space): "
msgstr ""
#, fuzzy
@@ -1588,7 +1583,7 @@ msgstr "ubah tanggal kadaluarsa"
msgid "change the language preferences"
msgstr "ubah ownertrust"
-msgid "change card holder's sex"
+msgid "change card holder's salutation"
msgstr ""
#, fuzzy
@@ -4074,14 +4069,14 @@ msgid "Authenticate"
msgstr ""
#. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation. If this is not possible use single digits. The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
-#.
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
+#. * translation. If this is not possible use single digits. The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. * s = Toggle signing capability
+#. * e = Toggle encryption capability
+#. * a = Toggle authentication capability
+#. * q = Finish
#.
msgid "SsEeAaQq"
msgstr ""
@@ -4163,6 +4158,10 @@ msgstr " (%d) RSA (hanya enkripsi)\n"
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (hanya enkripsi)\n"
+#, fuzzy, c-format
+msgid " (%d) Existing key from card\n"
+msgstr " (%d) RSA (hanya enkripsi)\n"
+
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Notasi signature: "
@@ -4175,6 +4174,18 @@ msgid "No key with this keygrip\n"
msgstr "Tidak ada ID user dengan index %d\n"
#, fuzzy, c-format
+msgid "error reading the card: %s\n"
+msgstr "%s: kesalahan membaca record bebas: %s\n"
+
+#, fuzzy, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "kesalahan penciptaan passphrase: %s\n"
+
+#, fuzzy
+msgid "Available keys:\n"
+msgstr "tiadakan kunci"
+
+#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "dibulatkan hingga %u bit\n"
@@ -4912,6 +4923,11 @@ msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "%s signature, algoritma digest %s\n"
#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
+msgstr "%s signature, algoritma digest %s\n"
+
+#, fuzzy, c-format
msgid "(reported error: %s)\n"
msgstr "kesalahan pembacaan: %s\n"
@@ -7050,18 +7066,6 @@ msgstr " (%d) RSA (hanya enkripsi)\n"
msgid " (%d) Existing key from card\n"
msgstr ""
-#, fuzzy, c-format
-msgid "error reading the card: %s\n"
-msgstr "%s: kesalahan membaca record bebas: %s\n"
-
-#, fuzzy, c-format
-msgid "Serial number of the card: %s\n"
-msgstr "kesalahan penciptaan passphrase: %s\n"
-
-#, fuzzy
-msgid "Available keys:\n"
-msgstr "tiadakan kunci"
-
#, c-format
msgid "Possible actions for a %s key:\n"
msgstr ""
@@ -9153,6 +9157,18 @@ msgid ""
msgstr ""
#, fuzzy
+#~ msgid "male"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "female"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "unspecified"
+#~ msgstr "Tidak ada alasan diberikan"
+
+#, fuzzy
#~ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
#~ msgstr "kesalahan penciptaan passphrase: %s\n"
diff --git a/po/it.po b/po/it.po
index eb3553115..67d471cea 100644
--- a/po/it.po
+++ b/po/it.po
@@ -92,6 +92,7 @@ msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#. Do not translate the "SETERROR" keyword.
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
@@ -1333,17 +1334,11 @@ msgstr "Cosa scegli? "
msgid "[not set]"
msgstr ""
-#, fuzzy
-msgid "male"
-msgstr "abilita"
-
-#, fuzzy
-msgid "female"
-msgstr "abilita"
+msgid "Mr."
+msgstr ""
-#, fuzzy
-msgid "unspecified"
-msgstr "Nessuna ragione specificata"
+msgid "Ms."
+msgstr ""
# ??? (Md)
#, fuzzy
@@ -1403,7 +1398,7 @@ msgstr "carattere non valido nella stringa delle preferenze\n"
msgid "Error: invalid characters in preference string.\n"
msgstr "carattere non valido nella stringa delle preferenze\n"
-msgid "Sex ((M)ale, (F)emale or space): "
+msgid "Salutation (M = Mr., F = Ms., or space): "
msgstr ""
#, fuzzy
@@ -1586,7 +1581,7 @@ msgstr "cambia la data di scadenza"
msgid "change the language preferences"
msgstr "cambia il valore di fiducia"
-msgid "change card holder's sex"
+msgid "change card holder's salutation"
msgstr ""
#, fuzzy
@@ -4089,14 +4084,14 @@ msgid "Authenticate"
msgstr ""
#. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation. If this is not possible use single digits. The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
-#.
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
+#. * translation. If this is not possible use single digits. The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. * s = Toggle signing capability
+#. * e = Toggle encryption capability
+#. * a = Toggle authentication capability
+#. * q = Finish
#.
msgid "SsEeAaQq"
msgstr ""
@@ -4178,6 +4173,10 @@ msgstr " (%d) RSA (cifra solo)\n"
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (cifra solo)\n"
+#, fuzzy, c-format
+msgid " (%d) Existing key from card\n"
+msgstr " (%d) RSA (cifra solo)\n"
+
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Annotazione della firma: "
@@ -4190,6 +4189,18 @@ msgid "No key with this keygrip\n"
msgstr "Nessun user ID con l'indice %d\n"
#, fuzzy, c-format
+msgid "error reading the card: %s\n"
+msgstr "%s: errore durante la lettura del record libero: %s\n"
+
+#, fuzzy, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "errore nella creazione della passhprase: %s\n"
+
+#, fuzzy
+msgid "Available keys:\n"
+msgstr "disabilita una chiave"
+
+#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "arrotondate a %u bit\n"
@@ -4930,6 +4941,11 @@ msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "Firma %s, algoritmo di digest %s\n"
#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
+msgstr "Firma %s, algoritmo di digest %s\n"
+
+#, fuzzy, c-format
msgid "(reported error: %s)\n"
msgstr "errore di lettura: %s\n"
@@ -7089,18 +7105,6 @@ msgstr " (%d) RSA (cifra solo)\n"
msgid " (%d) Existing key from card\n"
msgstr ""
-#, fuzzy, c-format
-msgid "error reading the card: %s\n"
-msgstr "%s: errore durante la lettura del record libero: %s\n"
-
-#, fuzzy, c-format
-msgid "Serial number of the card: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
-
-#, fuzzy
-msgid "Available keys:\n"
-msgstr "disabilita una chiave"
-
#, c-format
msgid "Possible actions for a %s key:\n"
msgstr ""
@@ -9194,6 +9198,18 @@ msgid ""
msgstr ""
#, fuzzy
+#~ msgid "male"
+#~ msgstr "abilita"
+
+#, fuzzy
+#~ msgid "female"
+#~ msgstr "abilita"
+
+#, fuzzy
+#~ msgid "unspecified"
+#~ msgstr "Nessuna ragione specificata"
+
+#, fuzzy
#~ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
#~ msgstr "errore nella creazione della passhprase: %s\n"
diff --git a/po/ja.po b/po/ja.po
index 1f9515b68..db4d998f6 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -96,6 +96,7 @@ msgstr "一致しません - もう一度"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#. Do not translate the "SETERROR" keyword.
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (現在 %d / 最大 %d)"
@@ -1260,14 +1261,11 @@ msgstr "あなたの選択は? "
msgid "[not set]"
msgstr "[未設定]"
-msgid "male"
-msgstr "男"
-
-msgid "female"
-msgstr "女"
+msgid "Mr."
+msgstr ""
-msgid "unspecified"
-msgstr "無指定"
+msgid "Ms."
+msgstr ""
msgid "not forced"
msgstr "強制なし"
@@ -1320,8 +1318,8 @@ msgstr "エラー: 優先指定の文字列の長さが無効です。\n"
msgid "Error: invalid characters in preference string.\n"
msgstr "エラー: 優先指定の文字列に無効な文字があります。\n"
-msgid "Sex ((M)ale, (F)emale or space): "
-msgstr "性別 ((M)男、(F)女、または空白): "
+msgid "Salutation (M = Mr., F = Ms., or space): "
+msgstr ""
msgid "Error: invalid response.\n"
msgstr "エラー: 無効な応答。\n"
@@ -1494,7 +1492,9 @@ msgstr "ログイン名の変更"
msgid "change the language preferences"
msgstr "言語の優先指定の変更"
-msgid "change card holder's sex"
+#, fuzzy
+#| msgid "change card holder's sex"
+msgid "change card holder's salutation"
msgstr "カード所有者の性別の変更"
msgid "change a CA fingerprint"
@@ -1603,6 +1603,7 @@ msgstr "更新に失敗しました: %s\n"
msgid "deleting keyblock failed: %s\n"
msgstr "鍵ブロックの削除に失敗しました: %s\n"
+#, c-format
msgid "ownertrust information cleared\n"
msgstr "所有者信用情報をクリアしました\n"
@@ -3779,14 +3780,14 @@ msgid "Authenticate"
msgstr "Authenticate"
#. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation. If this is not possible use single digits. The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
-#.
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
+#. * translation. If this is not possible use single digits. The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. * s = Toggle signing capability
+#. * e = Toggle encryption capability
+#. * a = Toggle authentication capability
+#. * q = Finish
#.
msgid "SsEeAaQq"
msgstr "SsEeAaQq"
@@ -3866,6 +3867,11 @@ msgstr " (%d) ECC (暗号化のみ)\n"
msgid " (%d) Existing key\n"
msgstr " (%d) 既存の鍵\n"
+#, fuzzy, c-format
+#| msgid " (%d) Existing key from card\n"
+msgid " (%d) Existing key from card\n"
+msgstr " (%d) カードに存在する鍵\n"
+
msgid "Enter the keygrip: "
msgstr "keygripを入力: "
@@ -3876,6 +3882,17 @@ msgid "No key with this keygrip\n"
msgstr "このkeygripの鍵はありません\n"
#, c-format
+msgid "error reading the card: %s\n"
+msgstr "カードの読み込みエラー: %s\n"
+
+#, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "カードのシリアル番号: %s\n"
+
+msgid "Available keys:\n"
+msgstr "利用可能な鍵:\n"
+
+#, c-format
msgid "rounded to %u bits\n"
msgstr "%uビットに切り上げます\n"
@@ -4572,6 +4589,11 @@ msgstr "*警告*: ダイジェスト・アルゴリズム %s は廃止されて�
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "注意: アルゴリズム %s を用いた署名は拒否されました\n"
+#, fuzzy, c-format
+#| msgid "Note: signatures using the %s algorithm are rejected\n"
+msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
+msgstr "注意: アルゴリズム %s を用いた署名は拒否されました\n"
+
#, c-format
msgid "(reported error: %s)\n"
msgstr "(報告されたエラー: %s)\n"
@@ -6620,17 +6642,6 @@ msgid " (%d) Existing key from card\n"
msgstr " (%d) カードに存在する鍵\n"
#, c-format
-msgid "error reading the card: %s\n"
-msgstr "カードの読み込みエラー: %s\n"
-
-#, c-format
-msgid "Serial number of the card: %s\n"
-msgstr "カードのシリアル番号: %s\n"
-
-msgid "Available keys:\n"
-msgstr "利用可能な鍵:\n"
-
-#, c-format
msgid "Possible actions for a %s key:\n"
msgstr "%s鍵に可能な操作:\n"
@@ -8567,15 +8578,19 @@ msgstr "'%s'の読み込みエラー: %s\n"
msgid "error closing %s: %s\n"
msgstr "'%s'でクローズのエラー: %s\n"
+#, c-format
msgid "no --program option provided\n"
msgstr "--programオプションが指定されていません\n"
+#, c-format
msgid "only --decrypt and --encrypt are supported\n"
msgstr "--decryptと--encryptだけがサポートされています\n"
+#, c-format
msgid "no --keyfile option provided\n"
msgstr "--keyfileオプションが与えられていません\n"
+#, c-format
msgid "cannot allocate args vector\n"
msgstr "引数ベクタが確保できません\n"
@@ -8645,6 +8660,18 @@ msgstr ""
"形式: gpg-check-pattern [オプション] パターンファイル\n"
"パターンファイルに対して標準入力のパスフレーズを確認する\n"
+#~ msgid "male"
+#~ msgstr "男"
+
+#~ msgid "female"
+#~ msgstr "女"
+
+#~ msgid "unspecified"
+#~ msgstr "無指定"
+
+#~ msgid "Sex ((M)ale, (F)emale or space): "
+#~ msgstr "性別 ((M)男、(F)女、または空白): "
+
#~ msgid "no keyserver known (use option --keyserver)\n"
#~ msgstr "既知の鍵サーバがありません (オプション--keyserverを使いましょう)\n"
diff --git a/po/nb.po b/po/nb.po
index c46d8a6aa..08c21a281 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -100,6 +100,7 @@ msgstr "feil. Prøv igjen"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#. Do not translate the "SETERROR" keyword.
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (forsøk %d av %d)"
@@ -1268,14 +1269,11 @@ msgstr "Ditt valg? "
msgid "[not set]"
msgstr "[ikke valgt]"
-msgid "male"
-msgstr "mann"
-
-msgid "female"
-msgstr "dame"
+msgid "Mr."
+msgstr ""
-msgid "unspecified"
-msgstr "uspesifisert"
+msgid "Ms."
+msgstr ""
msgid "not forced"
msgstr "ikke tvunget"
@@ -1328,8 +1326,8 @@ msgstr "Feil: oppsettsstreng har ugyldig lengde.\n"
msgid "Error: invalid characters in preference string.\n"
msgstr "Feil: oppsettsstreng inneholder ugyldige tegn.\n"
-msgid "Sex ((M)ale, (F)emale or space): "
-msgstr "Kjønn ((M)askulint, (F)eminint eller mellomrom): "
+msgid "Salutation (M = Mr., F = Ms., or space): "
+msgstr ""
msgid "Error: invalid response.\n"
msgstr "Feil: ugyldig svar.\n"
@@ -1512,7 +1510,9 @@ msgstr "endre brukernavn"
msgid "change the language preferences"
msgstr "endre språkoppsett"
-msgid "change card holder's sex"
+#, fuzzy
+#| msgid "change card holder's sex"
+msgid "change card holder's salutation"
msgstr "endre kortholders kjønn"
msgid "change a CA fingerprint"
@@ -3842,14 +3842,14 @@ msgstr "Autentisere"
# A og a for autentisering
# Q og q for avslutte
#. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation. If this is not possible use single digits. The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
-#.
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
+#. * translation. If this is not possible use single digits. The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. * s = Toggle signing capability
+#. * e = Toggle encryption capability
+#. * a = Toggle authentication capability
+#. * q = Finish
#.
msgid "SsEeAaQq"
msgstr "SsKkAaQq"
@@ -3929,6 +3929,11 @@ msgstr " (%d) ECC (kun kryptering)\n"
msgid " (%d) Existing key\n"
msgstr " (%d) Nøkkel\n"
+#, fuzzy, c-format
+#| msgid " (%d) Existing key from card\n"
+msgid " (%d) Existing key from card\n"
+msgstr " (%d) Nøkkel fra kort\n"
+
msgid "Enter the keygrip: "
msgstr "Skriv inn nøkkelgrep: "
@@ -3939,6 +3944,17 @@ msgid "No key with this keygrip\n"
msgstr "Ingen nøkkel med dette nøkkelgrepet\n"
#, c-format
+msgid "error reading the card: %s\n"
+msgstr "feil under lesing av kort: %s\n"
+
+#, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "Kortets serienummer: %s\n"
+
+msgid "Available keys:\n"
+msgstr "Tilgjengelige nøkler:\n"
+
+#, c-format
msgid "rounded to %u bits\n"
msgstr "rundet av til %u bit\n"
@@ -4651,6 +4667,11 @@ msgstr "ADVARSEL: kontrollsum-algoritmen «%s» er utgått\n"
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "Merk: signaturer som bruker algoritmen %s blir avvist\n"
+#, fuzzy, c-format
+#| msgid "Note: signatures using the %s algorithm are rejected\n"
+msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
+msgstr "Merk: signaturer som bruker algoritmen %s blir avvist\n"
+
#, c-format
msgid "(reported error: %s)\n"
msgstr "(rapportert feil: %s)\n"
@@ -6757,17 +6778,6 @@ msgid " (%d) Existing key from card\n"
msgstr " (%d) Nøkkel fra kort\n"
#, c-format
-msgid "error reading the card: %s\n"
-msgstr "feil under lesing av kort: %s\n"
-
-#, c-format
-msgid "Serial number of the card: %s\n"
-msgstr "Kortets serienummer: %s\n"
-
-msgid "Available keys:\n"
-msgstr "Tilgjengelige nøkler:\n"
-
-#, c-format
msgid "Possible actions for a %s key:\n"
msgstr "Mulige handlinger for %s-nøkler:\n"
@@ -8793,6 +8803,18 @@ msgstr ""
"Syntaks: gpg-check-pattern [valg] mønsterfil\n"
"Kontroller passordfrase oppgitt på standard innkanal mot valgt mønsterfil\n"
+#~ msgid "male"
+#~ msgstr "mann"
+
+#~ msgid "female"
+#~ msgstr "dame"
+
+#~ msgid "unspecified"
+#~ msgstr "uspesifisert"
+
+#~ msgid "Sex ((M)ale, (F)emale or space): "
+#~ msgstr "Kjønn ((M)askulint, (F)eminint eller mellomrom): "
+
#~ msgid "no keyserver known (use option --keyserver)\n"
#~ msgstr "ingen kjent nøkkeltjener (bruk valget «--keyserver»)\n"
diff --git a/po/pl.po b/po/pl.po
index 043d3fad9..8a1b1945b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -94,6 +94,7 @@ msgstr "nie pasują - proszę spróbować jeszcze raz"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#. Do not translate the "SETERROR" keyword.
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (próba %d z %d)"
@@ -1260,14 +1261,11 @@ msgstr "Twój wybór? "
msgid "[not set]"
msgstr "[nie ustawiono]"
-msgid "male"
-msgstr "mężczyzna"
-
-msgid "female"
-msgstr "kobieta"
+msgid "Mr."
+msgstr ""
-msgid "unspecified"
-msgstr "nie podano"
+msgid "Ms."
+msgstr ""
msgid "not forced"
msgstr "nie wymuszono"
@@ -1320,8 +1318,8 @@ msgstr "Błąd: niewłaściwa długość tekstu preferencji.\n"
msgid "Error: invalid characters in preference string.\n"
msgstr "Błąd: niewłaściwe znaki w tekście preferencji.\n"
-msgid "Sex ((M)ale, (F)emale or space): "
-msgstr "Płeć (M - mężczyzna, F - kobieta lub spacja): "
+msgid "Salutation (M = Mr., F = Ms., or space): "
+msgstr ""
msgid "Error: invalid response.\n"
msgstr "Błąd: niewłaściwa odpowiedź.\n"
@@ -1493,7 +1491,9 @@ msgstr "zmiana nazwy logowania"
msgid "change the language preferences"
msgstr "zmiana preferowanych języków"
-msgid "change card holder's sex"
+#, fuzzy
+#| msgid "change card holder's sex"
+msgid "change card holder's salutation"
msgstr "zmiana płci posiadacza karty"
msgid "change a CA fingerprint"
@@ -3859,14 +3859,14 @@ msgid "Authenticate"
msgstr "Uwierzytelnianie"
#. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation. If this is not possible use single digits. The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
-#.
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
+#. * translation. If this is not possible use single digits. The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. * s = Toggle signing capability
+#. * e = Toggle encryption capability
+#. * a = Toggle authentication capability
+#. * q = Finish
#.
msgid "SsEeAaQq"
msgstr "PpSsUuZz"
@@ -3946,6 +3946,11 @@ msgstr " (%d) ECC (tylko do szyfrowania)\n"
msgid " (%d) Existing key\n"
msgstr " (%d) Istniejący klucz\n"
+#, fuzzy, c-format
+#| msgid " (%d) Existing key from card\n"
+msgid " (%d) Existing key from card\n"
+msgstr " (%d) Istniejący klucz z karty\n"
+
msgid "Enter the keygrip: "
msgstr "Uchwyt klucza: "
@@ -3956,6 +3961,17 @@ msgid "No key with this keygrip\n"
msgstr "Brak klucza o tym uchwycie\n"
#, c-format
+msgid "error reading the card: %s\n"
+msgstr "błąd odczytu karty: %s\n"
+
+#, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "Numer seryjny karty: %s\n"
+
+msgid "Available keys:\n"
+msgstr "Dostępne klucze:\n"
+
+#, c-format
msgid "rounded to %u bits\n"
msgstr "zaokrąglono do %u bitów\n"
@@ -4694,6 +4710,11 @@ msgstr "OSTRZEŻENIE: algorytm skrótu %s jest odradzany\n"
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "Uwaga: podpisy wykorzystujące algorytm %s są odrzucane\n"
+#, fuzzy, c-format
+#| msgid "Note: signatures using the %s algorithm are rejected\n"
+msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
+msgstr "Uwaga: podpisy wykorzystujące algorytm %s są odrzucane\n"
+
#, c-format
msgid "(reported error: %s)\n"
msgstr "(zgłoszony błąd: %s)\n"
@@ -6871,17 +6892,6 @@ msgid " (%d) Existing key from card\n"
msgstr " (%d) Istniejący klucz z karty\n"
#, c-format
-msgid "error reading the card: %s\n"
-msgstr "błąd odczytu karty: %s\n"
-
-#, c-format
-msgid "Serial number of the card: %s\n"
-msgstr "Numer seryjny karty: %s\n"
-
-msgid "Available keys:\n"
-msgstr "Dostępne klucze:\n"
-
-#, c-format
msgid "Possible actions for a %s key:\n"
msgstr "Możliwe akcje dla klucza %s:\n"
@@ -8925,3 +8935,15 @@ msgid ""
msgstr ""
"Składnia: gpg-check-pattern [opcje] plik-wzorców\n"
"Sprawdzanie hasła ze standardowego wejścia względem pliku wzorców\n"
+
+#~ msgid "male"
+#~ msgstr "mężczyzna"
+
+#~ msgid "female"
+#~ msgstr "kobieta"
+
+#~ msgid "unspecified"
+#~ msgstr "nie podano"
+
+#~ msgid "Sex ((M)ale, (F)emale or space): "
+#~ msgstr "Płeć (M - mężczyzna, F - kobieta lub spacja): "
diff --git a/po/pt.po b/po/pt.po
index 68f94032b..6a1548c1b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -95,6 +95,7 @@ msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#. Do not translate the "SETERROR" keyword.
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
@@ -1335,17 +1336,11 @@ msgstr "Opção? "
msgid "[not set]"
msgstr ""
-#, fuzzy
-msgid "male"
-msgstr "enable"
-
-#, fuzzy
-msgid "female"
-msgstr "enable"
+msgid "Mr."
+msgstr ""
-#, fuzzy
-msgid "unspecified"
-msgstr "Nenhum motivo especificado"
+msgid "Ms."
+msgstr ""
#, fuzzy
msgid "not forced"
@@ -1404,7 +1399,7 @@ msgstr "caracter inválido na cadeia de caractéres da preferência\n"
msgid "Error: invalid characters in preference string.\n"
msgstr "caracter inválido na cadeia de caractéres da preferência\n"
-msgid "Sex ((M)ale, (F)emale or space): "
+msgid "Salutation (M = Mr., F = Ms., or space): "
msgstr ""
#, fuzzy
@@ -1587,7 +1582,7 @@ msgstr "muda a data de validade"
msgid "change the language preferences"
msgstr "muda os valores de confiança"
-msgid "change card holder's sex"
+msgid "change card holder's salutation"
msgstr ""
#, fuzzy
@@ -4071,14 +4066,14 @@ msgid "Authenticate"
msgstr ""
#. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation. If this is not possible use single digits. The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
-#.
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
+#. * translation. If this is not possible use single digits. The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. * s = Toggle signing capability
+#. * e = Toggle encryption capability
+#. * a = Toggle authentication capability
+#. * q = Finish
#.
msgid "SsEeAaQq"
msgstr ""
@@ -4160,6 +4155,10 @@ msgstr " (%d) RSA (apenas cifragem)\n"
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (apenas cifragem)\n"
+#, fuzzy, c-format
+msgid " (%d) Existing key from card\n"
+msgstr " (%d) RSA (apenas cifragem)\n"
+
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Notação de assinatura: "
@@ -4172,6 +4171,18 @@ msgid "No key with this keygrip\n"
msgstr "Nenhum ID de utilizador com índice %d\n"
#, fuzzy, c-format
+msgid "error reading the card: %s\n"
+msgstr "%s: erro ao ler registo livre: %s\n"
+
+#, fuzzy, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "erro na criação da frase secreta: %s\n"
+
+#, fuzzy
+msgid "Available keys:\n"
+msgstr "desactiva uma chave"
+
+#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "arredondado para %u bits\n"
@@ -4918,6 +4929,10 @@ msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "assinatura %s de: \"%s\"\n"
#, fuzzy, c-format
+msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
+msgstr "assinatura %s de: \"%s\"\n"
+
+#, fuzzy, c-format
msgid "(reported error: %s)\n"
msgstr "armadura: %s\n"
@@ -7049,18 +7064,6 @@ msgstr " (%d) RSA (apenas cifragem)\n"
msgid " (%d) Existing key from card\n"
msgstr ""
-#, fuzzy, c-format
-msgid "error reading the card: %s\n"
-msgstr "%s: erro ao ler registo livre: %s\n"
-
-#, fuzzy, c-format
-msgid "Serial number of the card: %s\n"
-msgstr "erro na criação da frase secreta: %s\n"
-
-#, fuzzy
-msgid "Available keys:\n"
-msgstr "desactiva uma chave"
-
#, c-format
msgid "Possible actions for a %s key:\n"
msgstr ""
@@ -9155,6 +9158,18 @@ msgid ""
msgstr ""
#, fuzzy
+#~ msgid "male"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "female"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "unspecified"
+#~ msgstr "Nenhum motivo especificado"
+
+#, fuzzy
#~ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
#~ msgstr "erro na criação da frase secreta: %s\n"
diff --git a/po/ro.po b/po/ro.po
index 8c292a8b3..4857e719c 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -99,6 +99,7 @@ msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#. Do not translate the "SETERROR" keyword.
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
@@ -1357,14 +1358,11 @@ msgstr "Selecţia d-voastră? "
msgid "[not set]"
msgstr "[nesetat(ă)]"
-msgid "male"
-msgstr "masculin"
-
-msgid "female"
-msgstr "feminin"
+msgid "Mr."
+msgstr ""
-msgid "unspecified"
-msgstr "nespecificat(ă)"
+msgid "Ms."
+msgstr ""
msgid "not forced"
msgstr "neforţat(ă)"
@@ -1418,8 +1416,8 @@ msgstr "Eroare: lungime invalidă pentru şir preferinţe.\n"
msgid "Error: invalid characters in preference string.\n"
msgstr "Eroare: caractere invalide în şir preferinţe.\n"
-msgid "Sex ((M)ale, (F)emale or space): "
-msgstr "Sex ((M)asculin, (F)eminin sau spaţiu): "
+msgid "Salutation (M = Mr., F = Ms., or space): "
+msgstr ""
msgid "Error: invalid response.\n"
msgstr "Eroare: răspuns invalid.\n"
@@ -1602,7 +1600,9 @@ msgstr "schimbă numele de login"
msgid "change the language preferences"
msgstr "schimbă preferinţele de limbă"
-msgid "change card holder's sex"
+#, fuzzy
+#| msgid "change card holder's sex"
+msgid "change card holder's salutation"
msgstr "schimbă sexul purtătorului cardului"
msgid "change a CA fingerprint"
@@ -4110,14 +4110,14 @@ msgid "Authenticate"
msgstr "Autentifică"
#. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation. If this is not possible use single digits. The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
-#.
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
+#. * translation. If this is not possible use single digits. The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. * s = Toggle signing capability
+#. * e = Toggle encryption capability
+#. * a = Toggle authentication capability
+#. * q = Finish
#.
msgid "SsEeAaQq"
msgstr "SsCcAaTt"
@@ -4200,6 +4200,10 @@ msgstr " (%d) RSA (numai cifrare)\n"
msgid " (%d) Existing key\n"
msgstr " (2) Cheie de cifrare\n"
+#, fuzzy, c-format
+msgid " (%d) Existing key from card\n"
+msgstr " (2) Cheie de cifrare\n"
+
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Notare semnătură: "
@@ -4212,6 +4216,18 @@ msgid "No key with this keygrip\n"
msgstr "Nici o subcheie cu indicele %d\n"
#, fuzzy, c-format
+msgid "error reading the card: %s\n"
+msgstr "%s: eroare citire înregistrare liberă: %s\n"
+
+#, fuzzy, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "eroare la obţinerea numărului serial: %s\n"
+
+#, fuzzy
+msgid "Available keys:\n"
+msgstr "deactivează cheia"
+
+#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "rotunjită prin adaos la %u biţi\n"
@@ -4955,6 +4971,11 @@ msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "semnătură %s, algoritm rezumat %s\n"
#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
+msgstr "semnătură %s, algoritm rezumat %s\n"
+
+#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "(reported error: %s)\n"
msgstr "eroare citire în `%s': %s\n"
@@ -7137,18 +7158,6 @@ msgid " (%d) Existing key from card\n"
msgstr ""
#, fuzzy, c-format
-msgid "error reading the card: %s\n"
-msgstr "%s: eroare citire înregistrare liberă: %s\n"
-
-#, fuzzy, c-format
-msgid "Serial number of the card: %s\n"
-msgstr "eroare la obţinerea numărului serial: %s\n"
-
-#, fuzzy
-msgid "Available keys:\n"
-msgstr "deactivează cheia"
-
-#, fuzzy, c-format
msgid "Possible actions for a %s key:\n"
msgstr "Acţiuni posibile pentru o cheie %s: "
@@ -9270,6 +9279,18 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "male"
+#~ msgstr "masculin"
+
+#~ msgid "female"
+#~ msgstr "feminin"
+
+#~ msgid "unspecified"
+#~ msgstr "nespecificat(ă)"
+
+#~ msgid "Sex ((M)ale, (F)emale or space): "
+#~ msgstr "Sex ((M)asculin, (F)eminin sau spaţiu): "
+
#~ msgid "no keyserver known (use option --keyserver)\n"
#~ msgstr "nici un server de chei cunoscut (folosiţi opţiunea --keyserver)\n"
diff --git a/po/ru.po b/po/ru.po
index 560736213..27f82fac7 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -97,6 +97,7 @@ msgstr "не подходит - попробуйте еще раз"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#. Do not translate the "SETERROR" keyword.
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (попытка %d из %d)"
@@ -1270,14 +1271,11 @@ msgstr "Ваш выбор? "
msgid "[not set]"
msgstr "[не установлено]"
-msgid "male"
-msgstr "мужской"
-
-msgid "female"
-msgstr "женский"
+msgid "Mr."
+msgstr ""
-msgid "unspecified"
-msgstr "не указан"
+msgid "Ms."
+msgstr ""
msgid "not forced"
msgstr "не требуется"
@@ -1330,8 +1328,8 @@ msgstr "Ошибка: недопустимая длина строки пред�
msgid "Error: invalid characters in preference string.\n"
msgstr "Ошибка: недопустимые символы в строке предпочтений.\n"
-msgid "Sex ((M)ale, (F)emale or space): "
-msgstr "Пол ((M) мужской, (F) женский или пробел): "
+msgid "Salutation (M = Mr., F = Ms., or space): "
+msgstr ""
msgid "Error: invalid response.\n"
msgstr "Ошибка: недопустимый ответ.\n"
@@ -1503,7 +1501,9 @@ msgstr "изменить имя учетной записи"
msgid "change the language preferences"
msgstr "изменить языковые предпочтения"
-msgid "change card holder's sex"
+#, fuzzy
+#| msgid "change card holder's sex"
+msgid "change card holder's salutation"
msgstr "изменить пол держателя карты"
msgid "change a CA fingerprint"
@@ -3856,14 +3856,14 @@ msgid "Authenticate"
msgstr "Удостоверить личность"
#. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation. If this is not possible use single digits. The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
-#.
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
+#. * translation. If this is not possible use single digits. The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. * s = Toggle signing capability
+#. * e = Toggle encryption capability
+#. * a = Toggle authentication capability
+#. * q = Finish
#.
msgid "SsEeAaQq"
msgstr "11223300"
@@ -3943,6 +3943,11 @@ msgstr " (%d) ECC (только для шифрования)\n"
msgid " (%d) Existing key\n"
msgstr " (%d) Имеющийся ключ\n"
+#, fuzzy, c-format
+#| msgid " (%d) Existing key from card\n"
+msgid " (%d) Existing key from card\n"
+msgstr " (%d) Имеющийся на карте ключ\n"
+
msgid "Enter the keygrip: "
msgstr "Введите код ключа:"
@@ -3953,6 +3958,17 @@ msgid "No key with this keygrip\n"
msgstr "Нет ключа с таким кодом\n"
#, c-format
+msgid "error reading the card: %s\n"
+msgstr "ошибка чтения карты: %s\n"
+
+#, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "Серийный номер карты: %s\n"
+
+msgid "Available keys:\n"
+msgstr "Доступные ключи:\n"
+
+#, c-format
msgid "rounded to %u bits\n"
msgstr "округлен до %u бит\n"
@@ -4679,6 +4695,11 @@ msgstr "Внимание: хеш-функция %s не рекомендуетс
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "Замечание: подписи с хеш-функцией %s игнорируются\n"
+#, fuzzy, c-format
+#| msgid "Note: signatures using the %s algorithm are rejected\n"
+msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
+msgstr "Замечание: подписи с хеш-функцией %s игнорируются\n"
+
#, c-format
msgid "(reported error: %s)\n"
msgstr "(сообщенная ошибка: %s)\n"
@@ -6833,17 +6854,6 @@ msgid " (%d) Existing key from card\n"
msgstr " (%d) Имеющийся на карте ключ\n"
#, c-format
-msgid "error reading the card: %s\n"
-msgstr "ошибка чтения карты: %s\n"
-
-#, c-format
-msgid "Serial number of the card: %s\n"
-msgstr "Серийный номер карты: %s\n"
-
-msgid "Available keys:\n"
-msgstr "Доступные ключи:\n"
-
-#, c-format
msgid "Possible actions for a %s key:\n"
msgstr "Возможные действия для ключа %s:\n"
@@ -8905,6 +8915,18 @@ msgstr ""
"Синтаксис: gpg-check-pattern [параметры] файл_образцов\n"
"Проверить фразу-пароль, поступающую из stdin, по файлу образцов\n"
+#~ msgid "male"
+#~ msgstr "мужской"
+
+#~ msgid "female"
+#~ msgstr "женский"
+
+#~ msgid "unspecified"
+#~ msgstr "не указан"
+
+#~ msgid "Sex ((M)ale, (F)emale or space): "
+#~ msgstr "Пол ((M) мужской, (F) женский или пробел): "
+
#~ msgid "no keyserver known (use option --keyserver)\n"
#~ msgstr "не заданы серверы ключей (используйте --keyserver)\n"
diff --git a/po/sk.po b/po/sk.po
index d8a6bb4f5..4fedcdc93 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -95,6 +95,7 @@ msgstr ""
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#. Do not translate the "SETERROR" keyword.
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
@@ -1336,17 +1337,11 @@ msgstr "Váš výber? "
msgid "[not set]"
msgstr ""
-#, fuzzy
-msgid "male"
-msgstr "enable"
-
-#, fuzzy
-msgid "female"
-msgstr "enable"
+msgid "Mr."
+msgstr ""
-#, fuzzy
-msgid "unspecified"
-msgstr "Dôvod nebol špecifikovaný"
+msgid "Ms."
+msgstr ""
#, fuzzy
msgid "not forced"
@@ -1405,7 +1400,7 @@ msgstr "neplatný znak v reťazci s predvoľbami\n"
msgid "Error: invalid characters in preference string.\n"
msgstr "neplatný znak v reťazci s predvoľbami\n"
-msgid "Sex ((M)ale, (F)emale or space): "
+msgid "Salutation (M = Mr., F = Ms., or space): "
msgstr ""
#, fuzzy
@@ -1588,7 +1583,7 @@ msgstr "zmeniť dobu platnosti"
msgid "change the language preferences"
msgstr "zmeniť dôveryhodnosť vlastníka kľúča"
-msgid "change card holder's sex"
+msgid "change card holder's salutation"
msgstr ""
#, fuzzy
@@ -4085,14 +4080,14 @@ msgid "Authenticate"
msgstr ""
#. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation. If this is not possible use single digits. The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
-#.
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
+#. * translation. If this is not possible use single digits. The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. * s = Toggle signing capability
+#. * e = Toggle encryption capability
+#. * a = Toggle authentication capability
+#. * q = Finish
#.
msgid "SsEeAaQq"
msgstr ""
@@ -4174,6 +4169,10 @@ msgstr " (%d) RSA (len na šifrovanie)\n"
msgid " (%d) Existing key\n"
msgstr " (%d) RSA (len na šifrovanie)\n"
+#, fuzzy, c-format
+msgid " (%d) Existing key from card\n"
+msgstr " (%d) RSA (len na šifrovanie)\n"
+
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Podpisová notácia: "
@@ -4186,6 +4185,18 @@ msgid "No key with this keygrip\n"
msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
#, fuzzy, c-format
+msgid "error reading the card: %s\n"
+msgstr "%s: chyba pri čítaní voľného záznamu: %s\n"
+
+#, fuzzy, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "chyba pri vytváraní hesla: %s\n"
+
+#, fuzzy
+msgid "Available keys:\n"
+msgstr "nastaviť kľúč ako neplatný (disable)"
+
+#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "zaokrúhlené na %u bitov\n"
@@ -4931,6 +4942,11 @@ msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "%s podpis, hashovací algoritmus %s\n"
#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
+msgstr "%s podpis, hashovací algoritmus %s\n"
+
+#, fuzzy, c-format
msgid "(reported error: %s)\n"
msgstr "chyba pri čítaní: %s\n"
@@ -7077,18 +7093,6 @@ msgstr " (%d) RSA (len na šifrovanie)\n"
msgid " (%d) Existing key from card\n"
msgstr ""
-#, fuzzy, c-format
-msgid "error reading the card: %s\n"
-msgstr "%s: chyba pri čítaní voľného záznamu: %s\n"
-
-#, fuzzy, c-format
-msgid "Serial number of the card: %s\n"
-msgstr "chyba pri vytváraní hesla: %s\n"
-
-#, fuzzy
-msgid "Available keys:\n"
-msgstr "nastaviť kľúč ako neplatný (disable)"
-
#, c-format
msgid "Possible actions for a %s key:\n"
msgstr ""
@@ -9184,6 +9188,18 @@ msgid ""
msgstr ""
#, fuzzy
+#~ msgid "male"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "female"
+#~ msgstr "enable"
+
+#, fuzzy
+#~ msgid "unspecified"
+#~ msgstr "Dôvod nebol špecifikovaný"
+
+#, fuzzy
#~ msgid "error creating 'ultimately_trusted_keys' TOFU table: %s\n"
#~ msgstr "chyba pri vytváraní hesla: %s\n"
diff --git a/po/sv.po b/po/sv.po
index f8e4d8f2b..9b9caa08b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -124,6 +124,7 @@ msgstr "stämmer inte överens - försök igen"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#. Do not translate the "SETERROR" keyword.
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (försök %d av %d)"
@@ -1415,14 +1416,11 @@ msgstr "Vad väljer du? "
msgid "[not set]"
msgstr "[inte inställt]"
-msgid "male"
-msgstr "man"
-
-msgid "female"
-msgstr "kvinna"
+msgid "Mr."
+msgstr ""
-msgid "unspecified"
-msgstr "ej angiven"
+msgid "Ms."
+msgstr ""
msgid "not forced"
msgstr "inte tvingad"
@@ -1477,8 +1475,8 @@ msgstr "Fel: ogiltig längd på inställningssträngen\n"
msgid "Error: invalid characters in preference string.\n"
msgstr "Fel: ogiltiga tecken i inställningssträngen.\n"
-msgid "Sex ((M)ale, (F)emale or space): "
-msgstr "Kön ((M)an, Kvinna(F) eller blanksteg): "
+msgid "Salutation (M = Mr., F = Ms., or space): "
+msgstr ""
msgid "Error: invalid response.\n"
msgstr "Fel: ogiltigt svar.\n"
@@ -1677,7 +1675,9 @@ msgstr "ändra inloggningsnamnet"
msgid "change the language preferences"
msgstr "ändra språkinställningarna"
-msgid "change card holder's sex"
+#, fuzzy
+#| msgid "change card holder's sex"
+msgid "change card holder's salutation"
msgstr "ändra kortinnehavarens kön"
msgid "change a CA fingerprint"
@@ -4213,14 +4213,14 @@ msgstr "Autentisera"
# A = Authentisera
# Q = Avsluta
#. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation. If this is not possible use single digits. The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
-#.
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
+#. * translation. If this is not possible use single digits. The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. * s = Toggle signing capability
+#. * e = Toggle encryption capability
+#. * a = Toggle authentication capability
+#. * q = Finish
#.
msgid "SsEeAaQq"
msgstr "SsKkAaQq"
@@ -4305,6 +4305,11 @@ msgstr " (%d) RSA (endast kryptering)\n"
msgid " (%d) Existing key\n"
msgstr " (%d) Befintlig nyckel\n"
+#, fuzzy, c-format
+#| msgid " (%d) Existing key from card\n"
+msgid " (%d) Existing key from card\n"
+msgstr " (%d) Befintlig nyckel från kort\n"
+
msgid "Enter the keygrip: "
msgstr "Ange nyckelhashen: "
@@ -4314,6 +4319,17 @@ msgstr "Inte en giltig nyckelhash (förväntade 40 hexadecimala siffror)\n"
msgid "No key with this keygrip\n"
msgstr "Ingen nyckel med denna nyckelhash\n"
+#, c-format
+msgid "error reading the card: %s\n"
+msgstr "fel vid läsning av kortet: %s\n"
+
+#, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "Serienummer för kortet: %s\n"
+
+msgid "Available keys:\n"
+msgstr "Tillgängliga nycklar:\n"
+
#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
@@ -5076,6 +5092,11 @@ msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "%s signatur, sammandragsalgoritm %s\n"
#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
+msgstr "%s signatur, sammandragsalgoritm %s\n"
+
+#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "(reported error: %s)\n"
msgstr "läsfel i \"%s\": %s\n"
@@ -7339,17 +7360,6 @@ msgid " (%d) Existing key from card\n"
msgstr " (%d) Befintlig nyckel från kort\n"
#, c-format
-msgid "error reading the card: %s\n"
-msgstr "fel vid läsning av kortet: %s\n"
-
-#, c-format
-msgid "Serial number of the card: %s\n"
-msgstr "Serienummer för kortet: %s\n"
-
-msgid "Available keys:\n"
-msgstr "Tillgängliga nycklar:\n"
-
-#, c-format
msgid "Possible actions for a %s key:\n"
msgstr "Möjliga åtgärder för en %s-nyckel:\n"
@@ -9647,6 +9657,18 @@ msgstr ""
"Syntax: gpg-check-pattern [flaggor] mönsterfil\n"
"Kontrollera en lösenfras angiven på standard in mot mönsterfilen\n"
+#~ msgid "male"
+#~ msgstr "man"
+
+#~ msgid "female"
+#~ msgstr "kvinna"
+
+#~ msgid "unspecified"
+#~ msgstr "ej angiven"
+
+#~ msgid "Sex ((M)ale, (F)emale or space): "
+#~ msgstr "Kön ((M)an, Kvinna(F) eller blanksteg): "
+
#~ msgid "no keyserver known (use option --keyserver)\n"
#~ msgstr "ingen nyckelserver är känd (använd flaggan --keyserver)\n"
diff --git a/po/tr.po b/po/tr.po
index 971b047e0..789134478 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -98,6 +98,7 @@ msgstr "aynı değiller - tekrar deneyin"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#. Do not translate the "SETERROR" keyword.
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (%d/%d dene)"
@@ -1382,14 +1383,11 @@ msgstr "Seçiminiz? "
msgid "[not set]"
msgstr "[belirtilmedi]"
-msgid "male"
-msgstr "erkek"
-
-msgid "female"
-msgstr "dişi"
+msgid "Mr."
+msgstr ""
-msgid "unspecified"
-msgstr "belirtilmemiş"
+msgid "Ms."
+msgstr ""
msgid "not forced"
msgstr "zorlanmadı"
@@ -1443,8 +1441,8 @@ msgstr "Hata: tercih dizgesinin uzunluğu geçersiz.\n"
msgid "Error: invalid characters in preference string.\n"
msgstr "Hata: tercih dizgesindeki karakterler geçersiz.\n"
-msgid "Sex ((M)ale, (F)emale or space): "
-msgstr "Cinsiyet ((E)rkek, (D)işi veya boşluk): "
+msgid "Salutation (M = Mr., F = Ms., or space): "
+msgstr ""
msgid "Error: invalid response.\n"
msgstr "Hata: yanıt geçersiz.\n"
@@ -1629,7 +1627,9 @@ msgstr "oturum açma ismini değiştirir"
msgid "change the language preferences"
msgstr "dil tercihlerini değiştirir"
-msgid "change card holder's sex"
+#, fuzzy
+#| msgid "change card holder's sex"
+msgid "change card holder's salutation"
msgstr "kart sahibinin cinsiyetini değiştirir"
msgid "change a CA fingerprint"
@@ -4163,14 +4163,14 @@ msgid "Authenticate"
msgstr "Kimlik kanıtla"
#. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation. If this is not possible use single digits. The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
-#.
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
+#. * translation. If this is not possible use single digits. The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. * s = Toggle signing capability
+#. * e = Toggle encryption capability
+#. * a = Toggle authentication capability
+#. * q = Finish
#.
msgid "SsEeAaQq"
msgstr "OoŞşKkçÇ"
@@ -4254,6 +4254,11 @@ msgstr " (%d) RSA (sadece şifrelemek için)\n"
msgid " (%d) Existing key\n"
msgstr " (%d) Mevcut anahtar\n"
+#, fuzzy, c-format
+#| msgid " (%d) Existing key from card\n"
+msgid " (%d) Existing key from card\n"
+msgstr " (%d) Karttaki mevcut anahtar\n"
+
#, fuzzy
msgid "Enter the keygrip: "
msgstr "Simgelemi giriniz: "
@@ -4266,6 +4271,18 @@ msgid "No key with this keygrip\n"
msgstr "%d indisli bir yardımcı anahtar yok\n"
#, fuzzy, c-format
+msgid "error reading the card: %s\n"
+msgstr "%s: serbest kaydı okuma hatası: %s\n"
+
+#, fuzzy, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "kartın seri numarası alınırken hata: %s\n"
+
+#, fuzzy
+msgid "Available keys:\n"
+msgstr "anahtarı iptal eder"
+
+#, fuzzy, c-format
#| msgid "rounded up to %u bits\n"
msgid "rounded to %u bits\n"
msgstr "%u bite yuvarlandı\n"
@@ -5016,6 +5033,11 @@ msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "%s imzası, %s özet algoritması\n"
#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
+msgstr "%s imzası, %s özet algoritması\n"
+
+#, fuzzy, c-format
#| msgid "read error in `%s': %s\n"
msgid "(reported error: %s)\n"
msgstr "`%s' için okuma hatası: %s\n"
@@ -7243,18 +7265,6 @@ msgstr " (%d) Mevcut anahtar\n"
msgid " (%d) Existing key from card\n"
msgstr " (%d) Karttaki mevcut anahtar\n"
-#, fuzzy, c-format
-msgid "error reading the card: %s\n"
-msgstr "%s: serbest kaydı okuma hatası: %s\n"
-
-#, fuzzy, c-format
-msgid "Serial number of the card: %s\n"
-msgstr "kartın seri numarası alınırken hata: %s\n"
-
-#, fuzzy
-msgid "Available keys:\n"
-msgstr "anahtarı iptal eder"
-
#, c-format
msgid "Possible actions for a %s key:\n"
msgstr "bir %s anahtarı için olası eylemler:\n"
@@ -9549,6 +9559,18 @@ msgstr ""
"Standart girdiden verilen anahtar parolasını örüntü dosyasıyla "
"karşılaştırır\n"
+#~ msgid "male"
+#~ msgstr "erkek"
+
+#~ msgid "female"
+#~ msgstr "dişi"
+
+#~ msgid "unspecified"
+#~ msgstr "belirtilmemiş"
+
+#~ msgid "Sex ((M)ale, (F)emale or space): "
+#~ msgstr "Cinsiyet ((E)rkek, (D)işi veya boşluk): "
+
#~ msgid "no keyserver known (use option --keyserver)\n"
#~ msgstr ""
#~ "bilinen bir anahtar sunucusu yok (--keyserver seçeneğini kullanın)\n"
diff --git a/po/uk.po b/po/uk.po
index edc32ce69..27f2fd708 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -97,6 +97,7 @@ msgstr "паролі не збігаються, повторіть спробу"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#. Do not translate the "SETERROR" keyword.
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (спроба %d з %d)"
@@ -1279,14 +1280,11 @@ msgstr "Ваш вибір? "
msgid "[not set]"
msgstr "[не встановлено]"
-msgid "male"
-msgstr "чоловіча"
-
-msgid "female"
-msgstr "жіноча"
+msgid "Mr."
+msgstr ""
-msgid "unspecified"
-msgstr "не вказано"
+msgid "Ms."
+msgstr ""
msgid "not forced"
msgstr "не увімкнено"
@@ -1340,8 +1338,8 @@ msgstr "Помилка: некоректна довжина рядка осно�
msgid "Error: invalid characters in preference string.\n"
msgstr "Помилка: некоректні символи у рядку основної мови.\n"
-msgid "Sex ((M)ale, (F)emale or space): "
-msgstr "Стать (чоловіча (M), жіноча (F) або пробіл): "
+msgid "Salutation (M = Mr., F = Ms., or space): "
+msgstr ""
msgid "Error: invalid response.\n"
msgstr "Помилка: некоректна відповідь.\n"
@@ -1529,7 +1527,9 @@ msgstr "змінити ім’я користувача"
msgid "change the language preferences"
msgstr "змінити основну мову"
-msgid "change card holder's sex"
+#, fuzzy
+#| msgid "change card holder's sex"
+msgid "change card holder's salutation"
msgstr "змінити поле статі власника картки"
msgid "change a CA fingerprint"
@@ -3931,14 +3931,14 @@ msgid "Authenticate"
msgstr "Пройти розпізнавання"
#. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation. If this is not possible use single digits. The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
-#.
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
+#. * translation. If this is not possible use single digits. The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. * s = Toggle signing capability
+#. * e = Toggle encryption capability
+#. * a = Toggle authentication capability
+#. * q = Finish
#.
msgid "SsEeAaQq"
msgstr "SsEeAaQq"
@@ -4019,6 +4019,11 @@ msgstr " (%d) ECC (лише шифрування)\n"
msgid " (%d) Existing key\n"
msgstr " (%d) Вже записаний ключ\n"
+#, fuzzy, c-format
+#| msgid " (%d) Existing key from card\n"
+msgid " (%d) Existing key from card\n"
+msgstr " (%d) Вже записаний ключ з картки\n"
+
msgid "Enter the keygrip: "
msgstr "Вкажіть keygrip: "
@@ -4029,6 +4034,17 @@ msgid "No key with this keygrip\n"
msgstr "Немає ключів з таким значенням keygrip\n"
#, c-format
+msgid "error reading the card: %s\n"
+msgstr "помилка читання картки: %s\n"
+
+#, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "Серійний номер картки: %s\n"
+
+msgid "Available keys:\n"
+msgstr "Доступні ключі:\n"
+
+#, c-format
msgid "rounded to %u bits\n"
msgstr "округлено до %u бітів\n"
@@ -4766,6 +4782,11 @@ msgstr "УВАГА: алгоритм обчислення контрольних
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "Зауваження: підписи за допомогою алгоритму %s відкинуто\n"
+#, fuzzy, c-format
+#| msgid "Note: signatures using the %s algorithm are rejected\n"
+msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
+msgstr "Зауваження: підписи за допомогою алгоритму %s відкинуто\n"
+
#, c-format
msgid "(reported error: %s)\n"
msgstr "(повідомлена помилка: %s)\n"
@@ -6974,17 +6995,6 @@ msgid " (%d) Existing key from card\n"
msgstr " (%d) Вже записаний ключ з картки\n"
#, c-format
-msgid "error reading the card: %s\n"
-msgstr "помилка читання картки: %s\n"
-
-#, c-format
-msgid "Serial number of the card: %s\n"
-msgstr "Серійний номер картки: %s\n"
-
-msgid "Available keys:\n"
-msgstr "Доступні ключі:\n"
-
-#, c-format
msgid "Possible actions for a %s key:\n"
msgstr "Можливі дії для ключа %s:\n"
@@ -9034,6 +9044,18 @@ msgstr ""
"Синтаксис: gpg-check-pattern [параметри] файл_шаблонів\n"
"Перевірити пароль, вказаний у stdin, за допомогою файла_шаблонів\n"
+#~ msgid "male"
+#~ msgstr "чоловіча"
+
+#~ msgid "female"
+#~ msgstr "жіноча"
+
+#~ msgid "unspecified"
+#~ msgstr "не вказано"
+
+#~ msgid "Sex ((M)ale, (F)emale or space): "
+#~ msgstr "Стать (чоловіча (M), жіноча (F) або пробіл): "
+
#~ msgid "no keyserver known (use option --keyserver)\n"
#~ msgstr ""
#~ "не вказано жодного сервера ключів (скористайтеся параметром --keyserver)\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a37ccabe3..58e36a007 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -92,6 +92,7 @@ msgstr "不匹配 - 请重试"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#. Do not translate the "SETERROR" keyword.
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
@@ -1248,16 +1249,13 @@ msgstr "您的选择是? "
msgid "[not set]"
msgstr "[未设定]"
-msgid "male"
-msgstr ""
-
-msgid "female"
-msgstr ""
+msgid "Mr."
+msgstr "先生"
#, fuzzy
-#| msgid "No reason specified"
-msgid "unspecified"
-msgstr "未指定原因"
+#| msgid "Mrs."
+msgid "Ms."
+msgstr "女士"
msgid "not forced"
msgstr "非强制"
@@ -1310,8 +1308,10 @@ msgstr "错误:偏好字符串长度无效。\n"
msgid "Error: invalid characters in preference string.\n"
msgstr "错误:偏好字符串中存在无效字符。\n"
-msgid "Sex ((M)ale, (F)emale or space): "
-msgstr ""
+#, fuzzy
+#| msgid "Salutation (M = Mr., F = Mrs., or space): "
+msgid "Salutation (M = Mr., F = Ms., or space): "
+msgstr "称呼(M = 先生,F = 女士,或者留空): "
msgid "Error: invalid response.\n"
msgstr "错误:无效的响应。\n"
@@ -1490,10 +1490,8 @@ msgstr "更改登录名"
msgid "change the language preferences"
msgstr "更改语言偏好"
-#, fuzzy
-#| msgid "change card holder's name"
-msgid "change card holder's sex"
-msgstr "更改卡持有人的姓名"
+msgid "change card holder's salutation"
+msgstr "变更卡片持有人的称呼"
msgid "change a CA fingerprint"
msgstr "更改一个 CA 指纹"
@@ -3759,14 +3757,14 @@ msgid "Authenticate"
msgstr "身份验证(Authenticate)"
#. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation. If this is not possible use single digits. The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
-#.
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
+#. * translation. If this is not possible use single digits. The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. * s = Toggle signing capability
+#. * e = Toggle encryption capability
+#. * a = Toggle authentication capability
+#. * q = Finish
#.
msgid "SsEeAaQq"
msgstr "SsEeAaQq"
@@ -3846,6 +3844,11 @@ msgstr " (%d) ECC(仅用于加密)\n"
msgid " (%d) Existing key\n"
msgstr " (%d) 现存的密钥\n"
+#, fuzzy, c-format
+#| msgid " (%d) Existing key from card\n"
+msgid " (%d) Existing key from card\n"
+msgstr " (%d) 卡片上现存的密钥\n"
+
msgid "Enter the keygrip: "
msgstr "输入 keygrip: "
@@ -3856,6 +3859,17 @@ msgid "No key with this keygrip\n"
msgstr "没有此 keygrip 关联的密钥\n"
#, c-format
+msgid "error reading the card: %s\n"
+msgstr "读取卡片时出现错误:%s\n"
+
+#, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "卡片的序列号:%s\n"
+
+msgid "Available keys:\n"
+msgstr "可用的密钥:\n"
+
+#, c-format
msgid "rounded to %u bits\n"
msgstr "舍入到 %u 位\n"
@@ -4551,6 +4565,11 @@ msgstr "警告:散列算法 %s 已被弃用\n"
msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "注意:使用 %s 算法的签名已被拒绝\n"
+#, fuzzy, c-format
+#| msgid "Note: signatures using the %s algorithm are rejected\n"
+msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
+msgstr "注意:使用 %s 算法的签名已被拒绝\n"
+
#, c-format
msgid "(reported error: %s)\n"
msgstr "(已报告错误:%s)\n"
@@ -6570,17 +6589,6 @@ msgid " (%d) Existing key from card\n"
msgstr " (%d) 卡片上现存的密钥\n"
#, c-format
-msgid "error reading the card: %s\n"
-msgstr "读取卡片时出现错误:%s\n"
-
-#, c-format
-msgid "Serial number of the card: %s\n"
-msgstr "卡片的序列号:%s\n"
-
-msgid "Available keys:\n"
-msgstr "可用的密钥:\n"
-
-#, c-format
msgid "Possible actions for a %s key:\n"
msgstr "%s 密钥可能的操作:\n"
@@ -8597,6 +8605,16 @@ msgstr ""
"语法:gpg-check-pattern [选项] patternfile\n"
"按照 patternfile 检查一个由标准输入(stdin)给定的密码\n"
+#, fuzzy
+#~| msgid "No reason specified"
+#~ msgid "unspecified"
+#~ msgstr "未指定原因"
+
+#, fuzzy
+#~| msgid "change card holder's name"
+#~ msgid "change card holder's sex"
+#~ msgstr "更改卡持有人的姓名"
+
#~ msgid "no keyserver known (use option --keyserver)\n"
#~ msgstr "无已知的公钥服务器(使用 --keyserver 选项)\n"
@@ -8635,21 +8653,9 @@ msgstr ""
#~ msgid "connection to the dirmngr established\n"
#~ msgstr "与 dirmngr 的连接已建立\n"
-#~ msgid "Mr."
-#~ msgstr "先生"
-
-#~ msgid "Mrs."
-#~ msgstr "女士"
-
-#~ msgid "Salutation (M = Mr., F = Mrs., or space): "
-#~ msgstr "称呼(M = 先生,F = 女士,或者留空): "
-
#~ msgid "error for setup UIF: %s\n"
#~ msgstr "设置 KDF 时出现错误: %s\n"
-#~ msgid "change card holder's salutation"
-#~ msgstr "变更卡片持有人的称呼"
-
#~ msgid "change the User Interaction Flag"
#~ msgstr "变更用户交互选项"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 22c8d341b..5120ee363 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -105,6 +105,7 @@ msgstr "前後不一致 - 請再試一次"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#. Do not translate the "SETERROR" keyword.
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (第 %d 次嘗試, 最多 %d 次)"
@@ -1277,14 +1278,11 @@ msgstr "你要選哪一個? "
msgid "[not set]"
msgstr "[未設定]"
-msgid "male"
-msgstr "男性"
-
-msgid "female"
-msgstr "女性"
+msgid "Mr."
+msgstr ""
-msgid "unspecified"
-msgstr "未特定"
+msgid "Ms."
+msgstr ""
msgid "not forced"
msgstr "不強迫使用"
@@ -1337,8 +1335,8 @@ msgstr "錯誤: 無效的偏好設定字串長度\n"
msgid "Error: invalid characters in preference string.\n"
msgstr "錯誤: 偏好設定字串中含有無效的字符\n"
-msgid "Sex ((M)ale, (F)emale or space): "
-msgstr "性別 ((M)男性, (F)女性或留空): "
+msgid "Salutation (M = Mr., F = Ms., or space): "
+msgstr ""
msgid "Error: invalid response.\n"
msgstr "錯誤: 無效的回應.\n"
@@ -1525,7 +1523,9 @@ msgstr "變更登入名稱"
msgid "change the language preferences"
msgstr "變更介面語言偏好設定"
-msgid "change card holder's sex"
+#, fuzzy
+#| msgid "change card holder's sex"
+msgid "change card holder's salutation"
msgstr "變更卡片持有者的性別"
msgid "change a CA fingerprint"
@@ -3875,14 +3875,14 @@ msgid "Authenticate"
msgstr "鑑定"
#. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation. If this is not possible use single digits. The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
-#.
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
+#. * translation. If this is not possible use single digits. The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. * s = Toggle signing capability
+#. * e = Toggle encryption capability
+#. * a = Toggle authentication capability
+#. * q = Finish
#.
msgid "SsEeAaQq"
msgstr "SsEeAaQq"
@@ -3962,6 +3962,11 @@ msgstr " (%d) ECC (僅能用於加密)\n"
msgid " (%d) Existing key\n"
msgstr " (%d) 現有的金鑰\n"
+#, fuzzy, c-format
+#| msgid " (%d) Existing key from card\n"
+msgid " (%d) Existing key from card\n"
+msgstr " (%d) 卡片上現存的金鑰\n"
+
msgid "Enter the keygrip: "
msgstr "請輸入金鑰鑰柄: "
@@ -3972,6 +3977,17 @@ msgid "No key with this keygrip\n"
msgstr "沒有金鑰有此金鑰鑰柄\n"
#, c-format
+msgid "error reading the card: %s\n"
+msgstr "讀取卡片時出錯: %s\n"
+
+#, c-format
+msgid "Serial number of the card: %s\n"
+msgstr "卡片序號: %s\n"
+
+msgid "Available keys:\n"
+msgstr "可用金鑰:\n"
+
+#, c-format
msgid "rounded to %u bits\n"
msgstr "加大到 %u 位元\n"
@@ -4678,6 +4694,11 @@ msgid "Note: signatures using the %s algorithm are rejected\n"
msgstr "請注意: 採用 %s 演算法的簽章已遭駁回\n"
#, fuzzy, c-format
+#| msgid "Note: signatures using the %s algorithm are rejected\n"
+msgid "Note: third-party key signatures using the %s algorithm are rejected\n"
+msgstr "請注意: 採用 %s 演算法的簽章已遭駁回\n"
+
+#, fuzzy, c-format
#| msgid "%s:%u: read error: %s\n"
msgid "(reported error: %s)\n"
msgstr "%s:%u: 讀取錯誤: %s\n"
@@ -6770,17 +6791,6 @@ msgid " (%d) Existing key from card\n"
msgstr " (%d) 卡片上現存的金鑰\n"
#, c-format
-msgid "error reading the card: %s\n"
-msgstr "讀取卡片時出錯: %s\n"
-
-#, c-format
-msgid "Serial number of the card: %s\n"
-msgstr "卡片序號: %s\n"
-
-msgid "Available keys:\n"
-msgstr "可用金鑰:\n"
-
-#, c-format
msgid "Possible actions for a %s key:\n"
msgstr "%s 金鑰可能的動作:\n"
@@ -8808,6 +8818,18 @@ msgstr ""
"語法: gpg-check-pattern [選項] 樣式檔案\n"
"用樣式檔案來檢查由標準輸入給定的密語\n"
+#~ msgid "male"
+#~ msgstr "男性"
+
+#~ msgid "female"
+#~ msgstr "女性"
+
+#~ msgid "unspecified"
+#~ msgstr "未特定"
+
+#~ msgid "Sex ((M)ale, (F)emale or space): "
+#~ msgstr "性別 ((M)男性, (F)女性或留空): "
+
#~ msgid "no keyserver known (use option --keyserver)\n"
#~ msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"