[git] GnuPG - branch, master, updated. gnupg-2.1.0-beta442-37-gadad187
by Werner Koch
cvs at cvs.gnupg.org
Fri Jun 27 20:20:04 CEST 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, master has been updated
via adad1872b448593275d8cae06dffe376bee067b5 (commit)
via c67d2701406d776094d871353dd422c802bf535b (commit)
via 1ef7870fc96f6dd8137e9bfabf9b06787f75dffd (commit)
via c2e3eb98884785e6794dc79c1a53d75945f4c1ab (commit)
via a1dff86da8ebaab6e154360f538ca9d43a6c4934 (commit)
via 5e1f9b5e1427688ac340f0829e02bece7f0caf9c (commit)
from 2c4025576105a9deb78e1cfb22c11af4af09c4fa (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit adad1872b448593275d8cae06dffe376bee067b5
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jun 25 20:25:28 2014 +0200
speedo: Fix the w32 installer name
diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi
index 5f8c55c..4d18d91 100644
--- a/build-aux/speedo/w32/inst.nsi
+++ b/build-aux/speedo/w32/inst.nsi
@@ -94,7 +94,7 @@ SetCompressor lzma
Name "${PRETTY_PACKAGE}"
# Set the output filename.
-OutFile "$(NAME)-${VERSION}.exe"
+OutFile "${NAME}-${VERSION}.exe"
#Fixme: Do we need a logo
#Icon "${TOP_SRCDIR}/doc/logo/gnupg-logo-icon.ico"
commit c67d2701406d776094d871353dd422c802bf535b
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jun 25 20:25:28 2014 +0200
po: Auto-update
--
diff --git a/po/ja.po b/po/ja.po
index e0a984e..6cfaf34 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -656,7 +656,7 @@ msgstr "鍵を有効にする"
msgid ""
"Warning: This key is also listed for use with SSH!\n"
-"Deleting the key will may remove your ability toaccess remote machines."
+"Deleting the key will may remove your ability to access remote machines."
msgstr ""
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
@@ -1836,8 +1836,10 @@ msgstr "ハッシュ: "
msgid "Compression: "
msgstr "圧縮: "
-msgid "usage: gpg [options] "
-msgstr "使い方: gpg [オプション] "
+#, fuzzy, c-format
+#| msgid "usage: gpgsm [options] "
+msgid "usage: %s [options] %s\n"
+msgstr "使い方: gpgsm [オプション] "
msgid "conflicting commands\n"
msgstr "対立するコマンド\n"
@@ -4158,6 +4160,11 @@ msgstr "テキストモード"
msgid "unknown"
msgstr "不明の"
+#, fuzzy
+#| msgid "algorithm: %s"
+msgid ", key algorithm "
+msgstr "アルゴリズム: %s"
+
#, c-format
msgid "Can't check signature: %s\n"
msgstr "署名を検査できません: %s\n"
@@ -6023,9 +6030,6 @@ msgstr ""
"S/MIMEプロトコルを用いて、署名、検査、暗号化や復号を行います\n"
"デフォルトの操作は、入力データに依存します\n"
-msgid "usage: gpgsm [options] "
-msgstr "使い方: gpgsm [オプション] "
-
#, c-format
msgid "NOTE: won't be able to encrypt to '%s': %s\n"
msgstr "*注意*:'%s'に対して暗号化できません: %s\n"
@@ -6885,7 +6889,7 @@ msgstr "|FPR|FPRで署名されたOCSPレスポンス"
msgid "|N|do not return more than N items in one query"
msgstr "|N|一つのクエリでNを越えるのアイテムを返さない"
-msgid "|FILE|use the CA certifciates in FILE for HKP over TLS"
+msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
msgid ""
@@ -7799,6 +7803,12 @@ msgstr ""
"形式: gpg-check-pattern [オプション] パターンファイル\n"
"パターンファイルに対して標準入力のパスフレーズを確認する\n"
+#~ msgid "usage: gpg [options] "
+#~ msgstr "使い方: gpg [オプション] "
+
+#~ msgid "usage: gpgsm [options] "
+#~ msgstr "使い方: gpgsm [オプション] "
+
#~ msgid "can't create `%s': %s\n"
#~ msgstr "'%s'が作成できません: %s\n"
diff --git a/po/uk.po b/po/uk.po
index e30452b..164d4b5 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -4258,6 +4258,11 @@ msgstr "текстовий"
msgid "unknown"
msgstr "невідомо"
+#, fuzzy
+#| msgid "algorithm: %s"
+msgid ", key algorithm "
+msgstr "алгоритм: %s"
+
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Не вдалося перевірити підпис: %s\n"
commit 1ef7870fc96f6dd8137e9bfabf9b06787f75dffd
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jun 25 20:25:28 2014 +0200
po: Update some strings of the French (fr) translation.
diff --git a/po/fr.po b/po/fr.po
index 9293376..1f06f43 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 2.1\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2012-08-21 15:44-0400\n"
+"PO-Revision-Date: 2014-06-27 19:51+0200\n"
"Last-Translator: David Prévot <david at tilapin.org>\n"
"Language-Team: French <traduc at traduc.org>\n"
"Language: fr\n"
@@ -182,8 +182,7 @@ msgstr "CDP"
msgid "Reset Code"
msgstr "Code de réinitialisation"
-#, fuzzy, c-format
-#| msgid "%s%%0A%%0AUse the reader's keypad for input."
+#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr "%s%%0A%%0AUtilisez le pavé numérique du lecteur en entrée."
@@ -281,8 +280,7 @@ msgstr ""
msgid "Yes, protection is not needed"
msgstr "Oui, aucune protection n'est nécessaire"
-#, fuzzy, c-format
-#| msgid "Please enter the passphrase to%0Ato protect your new key"
+#, c-format
msgid "Please enter the passphrase to%0Aprotect your new key"
msgstr "Veuillez entrer la phrase de passe%0Apour protéger la nouvelle clef"
@@ -378,21 +376,15 @@ msgstr ""
"Veuillez signaler toutes anomalies sur <@EMAIL@> (en anglais)\n"
"et tout problème de traduction à <traduc at traduc.org>.\n"
-#, fuzzy
-#| msgid "Usage: dirmngr [options] (-h for help)"
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
-msgstr "Utilisation : dirmngr [options] (-h pour l'aide)"
+msgstr "Utilisation : dirmngr @GPG_AGENT@ (-h pour l'aide)"
-#, fuzzy
-#| msgid ""
-#| "Syntax: gpg-agent [options] [command [args]]\n"
-#| "Secret key management for GnuPG\n"
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
-"Syntaxe : gpg-agent [options] [commande [arguments]]\n"
-"Gestionnaire de clefs secrètes pour GnuPG\n"
+"Syntaxe : @GPG_AGENT@ [options] [commande [arguments]]\n"
+"Gestionnaire de clefs secrètes pour @GNUPG@\n"
#, c-format
msgid "invalid debug-level '%s' given\n"
@@ -683,7 +675,7 @@ msgstr "activer la clef"
msgid ""
"Warning: This key is also listed for use with SSH!\n"
-"Deleting the key will may remove your ability toaccess remote machines."
+"Deleting the key will may remove your ability to access remote machines."
msgstr ""
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
@@ -1860,22 +1852,15 @@ msgstr ""
" --list-keys [noms] montrer les clefs\n"
" --fingerprint [noms] montrer les empreintes\n"
-#, fuzzy
-#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
-msgstr "Utilisation : gpg [options] [fichiers] (-h pour l'aide)"
+msgstr "Utilisation : @GPG@ [options] [fichiers] (-h pour l'aide)"
-#, fuzzy
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
"Default operation depends on the input data\n"
msgstr ""
-"Syntaxe : gpg [options] [fichiers]\n"
+"Syntaxe : @GPG@ [options] [fichiers]\n"
"Signer, vérifier, chiffrer ou déchiffrer\n"
"L'opération par défaut dépend des données entrées\n"
@@ -1898,8 +1883,9 @@ msgstr "Hachage : "
msgid "Compression: "
msgstr "Compression : "
-msgid "usage: gpg [options] "
-msgstr "utilisation : gpg [options] "
+#, c-format
+msgid "usage: %s [options] %s\n"
+msgstr "utilisation : %s [options] %s\n"
msgid "conflicting commands\n"
msgstr "commandes en conflit\n"
@@ -4323,6 +4309,11 @@ msgstr "mode texte"
msgid "unknown"
msgstr "inconnu"
+#, fuzzy
+#| msgid "unknown pubkey algorithm"
+msgid ", key algorithm "
+msgstr "algorithme de clef publique inconnu"
+
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Impossible de vérifier la signature : %s\n"
@@ -5721,10 +5712,8 @@ msgstr "refus d'utiliser les commandes d'administration de la carte"
msgid "use variable length input for pinpad"
msgstr ""
-#, fuzzy
-#| msgid "Usage: dirmngr [options] (-h for help)"
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
-msgstr "Utilisation : dirmngr [options] (-h pour l'aide)"
+msgstr "Utilisation : @SCDAEMON@ [options] (-h pour l'aide)"
#, fuzzy
#| msgid ""
@@ -6307,28 +6296,18 @@ msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOM|utiliser l'algorithme de hachage NOM"
-#, fuzzy
-#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
-msgstr "Utilisation : gpg [options] [fichiers] (-h pour l'aide)"
+msgstr "Utilisation : @GPGSM@ [options] [fichiers] (-h pour l'aide)"
-#, fuzzy
-#| msgid ""
-#| "Syntax: gpgsm [options] [files]\n"
-#| "sign, check, encrypt or decrypt using the S/MIME protocol\n"
-#| "default operation depends on the input data\n"
msgid ""
"Syntax: @GPGSM@ [options] [files]\n"
"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
"Default operation depends on the input data\n"
msgstr ""
-"Syntaxe : gpgsm [options] [fichiers]\n"
+"Syntaxe : @GPGSM@ [options] [fichiers]\n"
"Signer, vérifier, chiffrer ou déchiffrer en utilisant le protocole S/MIME\n"
"L'opération par défaut dépend des données entrées\n"
-msgid "usage: gpgsm [options] "
-msgstr "utilisation : gpgsm [options] "
-
#, c-format
msgid "NOTE: won't be able to encrypt to '%s': %s\n"
msgstr "Remarque : ne sera pas capable de chiffrer à « %s » : %s\n"
@@ -7260,7 +7239,7 @@ msgstr "|EMPR|réponse OCSP signée par EMPR"
msgid "|N|do not return more than N items in one query"
msgstr "|N|ne pas renvoyer plus de N éléments dans une requête"
-msgid "|FILE|use the CA certifciates in FILE for HKP over TLS"
+msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
msgstr ""
msgid ""
@@ -7272,21 +7251,15 @@ msgstr ""
"(Consultez le manuel « info » pour obtenir une liste complète des commandes\n"
"et options)\n"
-#, fuzzy
-#| msgid "Usage: dirmngr [options] (-h for help)"
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
-msgstr "Utilisation : dirmngr [options] (-h pour l'aide)"
+msgstr "Utilisation : @DIRMNGR@ [options] (-h pour l'aide)"
-#, fuzzy
-#| msgid ""
-#| "Syntax: dirmngr [options] [command [args]]\n"
-#| "LDAP and OCSP access for GnuPG\n"
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"LDAP and OCSP access for @GNUPG@\n"
msgstr ""
-"Syntaxe : dirmngr [options] [commande [arguments]]\n"
-"Accès LDAP et OCSP pour GnuPG\n"
+"Syntaxe : @DIRMNGR@ [options] [commande [arguments]]\n"
+"Accès LDAP et OCSP pour @GNUPG@\n"
#, c-format
msgid "valid debug levels are: %s\n"
@@ -7809,20 +7782,14 @@ msgstr "|FICHIER|exécuter les commandes du FICHIER au démarrage"
msgid "run /subst on startup"
msgstr "exécuter /subst au démarrage"
-#, fuzzy
-#| msgid "Usage: gpg-connect-agent [options] (-h for help)"
msgid "Usage: @GPG at -connect-agent [options] (-h for help)"
-msgstr "Utilisation : gpg-connect-agent [options] (-h pour l'aide)"
+msgstr "Utilisation : @GPG at -connect-agent [options] (-h pour l'aide)"
-#, fuzzy
-#| msgid ""
-#| "Syntax: gpg-connect-agent [options]\n"
-#| "Connect to a running agent and send commands\n"
msgid ""
"Syntax: @GPG at -connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-"Syntaxe : gpg-connect-agent [options]\n"
+"Syntaxe : @GPG at -connect-agent [options]\n"
"Se connecter à un agent en fonctionnement et envoyer des commandes\n"
#, c-format
@@ -7996,10 +7963,8 @@ msgstr "|COMPOSANT|vérifier les options"
msgid "apply global default values"
msgstr "appliquer les valeurs par défaut globales"
-#, fuzzy
-#| msgid "get the configuration directories for gpgconf"
msgid "get the configuration directories for @GPGCONF@"
-msgstr "aff. répertoires de configuration pour gpgconf"
+msgstr "aff. répertoires de configuration pour @GPGCONF@"
msgid "list global configuration file"
msgstr "afficher le fichier de configuration globale"
@@ -8024,21 +7989,16 @@ msgstr "utiliser comme fichier de sortie"
msgid "activate changes at runtime, if possible"
msgstr "activer modif. pendant l'exécution si possible"
-#, fuzzy
-#| msgid "Usage: dirmngr [options] (-h for help)"
msgid "Usage: @GPGCONF@ [options] (-h for help)"
-msgstr "Utilisation : dirmngr [options] (-h pour l'aide)"
+msgstr "Utilisation : @GPGCONF@ [options] (-h pour l'aide)"
#, fuzzy
-#| msgid ""
-#| "Syntax: gpgconf [options]\n"
-#| "Manage configuration options for tools of the GnuPG system\n"
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
-"Syntaxe : gpgconf [options]\n"
-"Gérer les options de configuration pour les outils du système GnuPG\n"
+"Syntaxe : @GPGCONF@ [options]\n"
+"Gérer les options de configuration pour les outils du système @GNUPG@\n"
msgid "Need one component argument"
msgstr "Un argument de composant nécessaire"
@@ -8194,6 +8154,12 @@ msgstr ""
"Vérifier une phrase de passe donnée sur l'entrée standard par rapport à "
"ficmotif\n"
+#~ msgid "usage: gpg [options] "
+#~ msgstr "utilisation : gpg [options] "
+
+#~ msgid "usage: gpgsm [options] "
+#~ msgstr "utilisation : gpgsm [options] "
+
#, fuzzy
#~| msgid "can't create '%s': %s\n"
#~ msgid "can't create `%s': %s\n"
@@ -8938,9 +8904,6 @@ msgstr ""
#~ msgid "unknown packet type"
#~ msgstr "type de paquet inconnu"
-#~ msgid "unknown pubkey algorithm"
-#~ msgstr "algorithme de clef publique inconnu"
-
#~ msgid "unknown digest algorithm"
#~ msgstr "algorithme de hachage inconnu"
commit c2e3eb98884785e6794dc79c1a53d75945f4c1ab
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jun 25 20:25:28 2014 +0200
po: Update the German (de) translation
diff --git a/g10/mainproc.c b/g10/mainproc.c
index 890c0a4..51392e3 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -1962,7 +1962,7 @@ check_sig_and_print (CTX c, KBNODE node)
sig->sig_class==0x00?_("binary"):
sig->sig_class==0x01?_("textmode"):_("unknown"),
gcry_md_algo_name (sig->digest_algo),
- *pkstrbuf?", key algorithm ":"",
+ *pkstrbuf?_(", key algorithm "):"",
pkstrbuf);
if (rc)
diff --git a/po/de.po b/po/de.po
index 49a03c5..6008229 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-2.1.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2013-11-18 14:05+0100\n"
+"PO-Revision-Date: 2014-06-27 20:13+0200\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
"Language: de\n"
@@ -354,19 +354,17 @@ msgstr "|N|lasse PINs im Cache nach N Sekunden verfallen"
msgid "do not use the PIN cache when signing"
msgstr "benutze PINs im Cache nicht beim Signieren"
-#, fuzzy
-#| msgid "allow clients to mark keys as \"trusted\""
msgid "disallow clients to mark keys as \"trusted\""
-msgstr "erlaube Aufrufern Schlüssel als \"vertrauenswürdig\" zu markieren"
+msgstr "verbiete Aufrufern Schlüssel als \"vertrauenswürdig\" zu markieren"
msgid "allow presetting passphrase"
msgstr "erlaube ein \"preset\" von Passphrases"
msgid "enable ssh support"
-msgstr ""
+msgstr "SSH Unterstützung einschalten"
msgid "enable putty support"
-msgstr ""
+msgstr "PuTTY Unterstützung einschalten"
msgid "|FILE|write environment settings also to FILE"
msgstr "|DATEI|Schreibe die Umgebungsvariablen auf DATEI"
@@ -670,15 +668,16 @@ msgstr "Die Passphrase ändern"
msgid "I'll change it later"
msgstr "Ich werde sie später ändern"
-#, fuzzy
-#| msgid "enable key"
msgid "Delete key"
-msgstr "Schlüssel anschalten"
+msgstr "Schlüssel löschen"
msgid ""
"Warning: This key is also listed for use with SSH!\n"
-"Deleting the key will may remove your ability toaccess remote machines."
+"Deleting the key will may remove your ability to access remote machines."
msgstr ""
+"WARNUNG: Dieser Schlüssel wird auch für SSH benutzt!\n"
+"Das Löschen dieses Schlüssels kann Ihren Zugriff auf entfernte Rechner\n"
+"behindern."
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr "Für DSA muß die Hashlänge ein Vielfaches von 8 Bit sein\n"
@@ -1466,18 +1465,15 @@ msgstr "Diesen Schlüssel aus dem Schlüsselbund löschen? (j/N) "
msgid "This is a secret key! - really delete? (y/N) "
msgstr "Dies ist ein privater Schlüssel! - Wirklich löschen? (j/N) "
-#, fuzzy, c-format
-#| msgid "deleting certificate \"%s\" failed: %s\n"
+#, c-format
msgid "deleting secret %s failed: %s\n"
-msgstr "Fehler beim Löschen des Zertifikats \"%s\": %s\n"
+msgstr "Fehler beim Löschen des privaten %ss: %s\n"
msgid "key"
-msgstr ""
+msgstr "Schlüssel"
-#, fuzzy
-#| msgid "Pubkey: "
msgid "subkey"
-msgstr "Öff. Schlüssel: "
+msgstr "Unterschlüssel"
#, c-format
msgid "deleting keyblock failed: %s\n"
@@ -1733,15 +1729,11 @@ msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen"
msgid "remove keys from the secret keyring"
msgstr "Schlüssel aus dem geh. Schlüsselbund entfernen"
-#, fuzzy
-#| msgid "sign a key"
msgid "quickly sign a key"
-msgstr "Schlüssel signieren"
+msgstr "Schlüssel schnell signieren"
-#, fuzzy
-#| msgid "sign a key locally"
msgid "quickly sign a key locally"
-msgstr "Schlüssel nur für diesen Rechner signieren"
+msgstr "Schlüssel schnell nur für diesen Rechner signieren"
msgid "sign a key"
msgstr "Schlüssel signieren"
@@ -1876,8 +1868,9 @@ msgstr "Hash: "
msgid "Compression: "
msgstr "Komprimierung: "
-msgid "usage: gpg [options] "
-msgstr "Aufruf: gpg [Optionen] "
+#, c-format
+msgid "usage: %s [options] %s\n"
+msgstr "Aufruf: %s [Optionen] %s\n"
msgid "conflicting commands\n"
msgstr "Widersprüchliche Befehle\n"
@@ -3206,25 +3199,19 @@ msgstr "Änderung fehlgeschlagen: %s\n"
msgid "Key not changed so no update needed.\n"
msgstr "Schlüssel ist nicht geändert worden, also ist kein Speichern nötig.\n"
-#, fuzzy, c-format
-#| msgid "invalid fingerprint"
+#, c-format
msgid "\"%s\" is not a fingerprint\n"
-msgstr "ungültiger Fingerabdruck"
+msgstr "\"%s\" ist kein Fingerabdruck\n"
-#, fuzzy, c-format
-#| msgid "failed to get the fingerprint\n"
+#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
-msgstr "Kann den Fingerprint nicht ermitteln\n"
+msgstr "\"%s\" ist nicht der Fingerabdruck des Hauptschlüssels\n"
-#, fuzzy
-#| msgid "No such user ID.\n"
msgid "No matching user IDs."
-msgstr "Keine solche User-ID vorhanden.\n"
+msgstr "Keine passende User-ID"
-#, fuzzy
-#| msgid "Nothing to sign with key %s\n"
msgid "Nothing to sign.\n"
-msgstr "Nichts zu beglaubigen für Schlüssel %s\n"
+msgstr "Nichts zu beglaubigen\n"
msgid "Digest: "
msgstr "Digest: "
@@ -3655,25 +3642,21 @@ msgstr " (%d) DSA (Leistungsfähigkeit selber einstellbar)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (Leistungsfähigkeit selber einstellbar)\n"
-#, fuzzy, c-format
-#| msgid " (%d) %s\n"
+#, c-format
msgid " (%d) ECC\n"
-msgstr " (%d) signieren\n"
+msgstr " (%d) ECC\n"
-#, fuzzy, c-format
-#| msgid " (%d) ECDSA (sign only)\n"
+#, c-format
msgid " (%d) ECC (sign only)\n"
-msgstr " (%d) ECDSA (nur signieren/beglaubigen)\n"
+msgstr " (%d) ECC (nur signieren)\n"
-#, fuzzy, c-format
-#| msgid " (%d) ECDSA (set your own capabilities)\n"
+#, c-format
msgid " (%d) ECC (set your own capabilities)\n"
-msgstr " (%d) ECDSA (Leistungsfähigkeit selber einstellbar)\n"
+msgstr " (%d) ECC (Leistungsfähigkeit selber einstellbar)\n"
-#, fuzzy, c-format
-#| msgid " (%d) ECDH (encrypt only)\n"
+#, c-format
msgid " (%d) ECC (encrypt only)\n"
-msgstr " (%d) ECDH (nur verschlüsseln)\n"
+msgstr " (%d) ECC (nur verschlüsseln)\n"
#, c-format
msgid " (%d) Existing key\n"
@@ -4273,10 +4256,9 @@ msgstr "Diese Signatur ist seit %s verfallen.\n"
msgid "Signature expires %s\n"
msgstr "Diese Signatur verfällt am %s.\n"
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
+#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
-msgstr "%s Signatur, Hashmethode \"%s\"\n"
+msgstr "%s Signatur, Hashmethode %s%s%s\n"
msgid "binary"
msgstr "Binäre"
@@ -4287,6 +4269,9 @@ msgstr "Textmodus"
msgid "unknown"
msgstr "unbekannt"
+msgid ", key algorithm "
+msgstr ", Schlüsselverfahren "
+
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Signatur kann nicht geprüft werden: %s\n"
@@ -4473,58 +4458,37 @@ msgstr "%u-Bit %s Schlüssel, ID %s, erzeugt %s"
msgid " (subkey on main key ID %s)"
msgstr " (Unterschlüssel aus Hauptschlüssel-ID %s)"
-#, fuzzy
-#| msgid ""
-#| "Please enter the passphrase to unlock the secret key for the OpenPGP "
-#| "certificate:"
msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr ""
"Sie benötigen eine Passphrase, um den geheimen OpenPGP Schlüssel zu "
"entsperren:"
-#, fuzzy
-#| msgid ""
-#| "Please enter the passphrase to import the secret key for the OpenPGP "
-#| "certificate:"
msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr ""
"Sie benötigen eine Passphrase, um den geheimen OpenPGP Schlüssel zu "
"importieren:"
-#, fuzzy
-#| msgid ""
-#| "Please enter the passphrase to import the secret key for the OpenPGP "
-#| "certificate:"
msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
msgstr ""
-"Sie benötigen eine Passphrase, um den geheimen OpenPGP Schlüssel zu "
-"importieren:"
+"Sie benötigen eine Passphrase, um den geheimen OpenPGP Unterschlüssel zu "
+"exportieren:"
-#, fuzzy
-#| msgid ""
-#| "Please enter the passphrase to import the secret key for the OpenPGP "
-#| "certificate:"
msgid "Please enter the passphrase to export the OpenPGP secret key:"
msgstr ""
"Sie benötigen eine Passphrase, um den geheimen OpenPGP Schlüssel zu "
-"importieren:"
+"exportieren:"
-#, fuzzy
-#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
-msgstr "Möchten Sie die ausgewählten Schlüssel wirklich entfernen? (j/N) "
+msgstr ""
+"Möchten Sie den ausgewählten geheimen OpenPGP Unterschlüssel wirklich "
+"dauerhaft entfernen? (j/N) "
-#, fuzzy
-#| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to permanently delete the OpenPGP secret key:"
-msgstr "Möchten Sie die ausgewählten Schlüssel wirklich entfernen? (j/N) "
+msgstr ""
+"Möchten Sie den ausgewählten geheimen OpenPGP Schlüssel wirklich dauerhaft "
+"entfernen? (j/N) "
-#, fuzzy, c-format
-#| msgid ""
-#| "%s\n"
-#| "\"%.*s\"\n"
-#| "%u-bit %s key, ID %s,\n"
-#| "created %s%s.\n"
+#, c-format
msgid ""
"%s\n"
"\"%.*s\"\n"
@@ -4536,6 +4500,7 @@ msgstr ""
"\"%.*s\"\n"
"%u-Bit %s Schlüssel, ID %s,\n"
"erzeugt %s%s.\n"
+"%s"
# translated by wk
msgid ""
@@ -5010,10 +4975,9 @@ msgstr "Hinweis: Signaturschlüssel %s ist am %s verfallen\n"
msgid "NOTE: signature key %s has been revoked\n"
msgstr "Hinweis: Signaturschlüssel %s wurde widerrufen\n"
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
+#, c-format
msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "%s Signatur, Hashmethode \"%s\"\n"
+msgstr "Hinweis: %s basierte Signaturen werden zurückgewiesen.\n"
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
@@ -6230,9 +6194,6 @@ msgstr ""
"Syntax: @GPGSM@ [Optionen] [Dateien]\n"
"Signieren, prüfen, ver- und entschlüsseln mittels S/MIME Protokoll\n"
-msgid "usage: gpgsm [options] "
-msgstr "Aufruf: gpgsm [Optionen] "
-
#, c-format
msgid "NOTE: won't be able to encrypt to '%s': %s\n"
msgstr "Hinweis: Verschlüsselung für `%s' wird nicht möglich sein: %s\n"
@@ -7129,8 +7090,8 @@ msgstr "|FPR|OCSP Antwort ist durch FPR signiert"
msgid "|N|do not return more than N items in one query"
msgstr "|N|Nicht mehr als N Angaben in einer Anfrage zurückgeben"
-msgid "|FILE|use the CA certifciates in FILE for HKP over TLS"
-msgstr ""
+msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
+msgstr "|DATEI|Benutze die CA Zertifikate in DATEI für HKP über TLS"
msgid ""
"@\n"
@@ -7635,10 +7596,8 @@ msgstr "Druckdaten hexkodiert ausgeben"
msgid "decode received data lines"
msgstr "Dekodiere empfangene Datenzeilen"
-#, fuzzy
-#| msgid "can't connect to the dirmngr: %s\n"
msgid "connect to the dirmngr"
-msgstr "Verbindung zum Dirmngr nicht möglich: %s\n"
+msgstr "Mit dem Dirmngr verbinden"
msgid "|NAME|connect to Assuan socket NAME"
msgstr "|NAME|Verbinde mit dem Assuan-Socket NAME"
@@ -7811,10 +7770,8 @@ msgstr "Directory Manager"
msgid "PIN and Passphrase Entry"
msgstr "Falsche PIN oder Passphrase!"
-#, fuzzy
-#| msgid "Component not found"
msgid "Component not suitable for launching"
-msgstr "Komponente nicht gefunden"
+msgstr "Komponente unterstützt kein direktes starten"
#, c-format
msgid "External verification of component %s failed"
@@ -7841,10 +7798,8 @@ msgstr "|KOMPONENTE|Prüfe die Optionen"
msgid "apply global default values"
msgstr "Wende die gobalen Voreinstellungen an"
-#, fuzzy
-#| msgid "get the configuration directories for gpgconf"
msgid "get the configuration directories for @GPGCONF@"
-msgstr "Hole die Einstellungsverzeichnisse von gpgconf"
+msgstr "Hole die Einstellungsverzeichnisse von @GPGCONF@"
msgid "list global configuration file"
msgstr "Zeige die globale Konfigurationsdatei an"
@@ -7855,10 +7810,8 @@ msgstr "Prüfe die globale Konfigurationsdatei"
msgid "reload all or a given component"
msgstr "\"reload\" an alle oder eine Komponente senden"
-#, fuzzy
-#| msgid "kill a given component"
msgid "launch a given component"
-msgstr "\"kill\" an eine Komponente senden"
+msgstr "Die angegebene Komponente starten"
msgid "kill a given component"
msgstr "\"kill\" an eine Komponente senden"
@@ -8032,6 +7985,12 @@ msgstr ""
"Syntax: gpg-check-pattern [optionen] Musterdatei\n"
"Die von stdin gelesene Passphrase gegen die Musterdatei prüfen\n"
+#~ msgid "usage: gpg [options] "
+#~ msgstr "Aufruf: gpg [Optionen] "
+
+#~ msgid "usage: gpgsm [options] "
+#~ msgstr "Aufruf: gpgsm [Optionen] "
+
#~ msgid "enable ssh-agent emulation"
#~ msgstr "Die ssh-agent-Emulation anschalten"
commit a1dff86da8ebaab6e154360f538ca9d43a6c4934
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jun 25 20:25:28 2014 +0200
agent: Adjust for changed npth_eselect under W32.
* agent/gpg-agent.c (handle_connections) [W32]: Make events_set an
unsigned int to match the changed prototype.
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 096d057..3febaf8 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -2120,7 +2120,7 @@ handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t listen_fd_ssh)
struct timespec timeout;
#ifdef HAVE_W32_SYSTEM
HANDLE events[2];
- int events_set;
+ unsigned int events_set;
#endif
ret = npth_attr_init(&tattr);
@@ -2219,7 +2219,6 @@ handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t listen_fd_ssh)
handle_signal (signo);
}
#else
- events_set = 0;
ret = npth_eselect (nfd+1, &read_fdset, NULL, NULL, &timeout,
events, &events_set);
saved_errno = errno;
commit 5e1f9b5e1427688ac340f0829e02bece7f0caf9c
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jun 25 20:25:28 2014 +0200
dirmngr: Use the homedir based socket also under W32.
* common/homedir.c (dirmngr_user_socket_name): Use same code for all
platforms.
diff --git a/common/homedir.c b/common/homedir.c
index c50809f..7939841 100644
--- a/common/homedir.c
+++ b/common/homedir.c
@@ -605,15 +605,11 @@ dirmngr_sys_socket_name (void)
const char *
dirmngr_user_socket_name (void)
{
-#ifdef HAVE_W32_SYSTEM
- return NULL; /* We support only a system service. */
-#else /*!HAVE_W32_SYSTEM*/
static char *name;
if (!name)
name = make_absfilename (default_homedir (), DIRMNGR_SOCK_NAME, NULL);
return name;
-#endif /*!HAVE_W32_SYSTEM*/
}
-----------------------------------------------------------------------
Summary of changes:
agent/gpg-agent.c | 3 +-
build-aux/speedo/w32/inst.nsi | 2 +-
common/homedir.c | 4 -
g10/mainproc.c | 2 +-
po/de.po | 165 ++++++++++++++++-------------------------
po/fr.po | 109 +++++++++------------------
po/ja.po | 24 ++++--
po/uk.po | 5 ++
8 files changed, 123 insertions(+), 191 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list