[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-88-g6b5f59c
by Werner Koch
cvs at cvs.gnupg.org
Fri Aug 24 11:40:27 CEST 2012
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 6b5f59c87f6c9bfda3f644035b331b3b13a562f3 (commit)
via ba591e2f14c0d85ba15346ffd04b9e7d72ec89dc (commit)
via 94e663885b35ff01f2bb848b6719043ff7fc612a (commit)
via bf95408fc33709d154cd41566d33af3ec3c48886 (commit)
via 1da04bfb3f5714a0fa6d0b779d0d2ae4e9544b8f (commit)
via 8156a38674421deef6c2eb3e91e0186fe7fe4b26 (commit)
from 4ea37fe4b2980b52a1e13f902f178581a57725dc (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 6b5f59c87f6c9bfda3f644035b331b3b13a562f3
Author: Werner Koch <wk at gnupg.org>
Date: Fri Aug 24 10:20:16 2012 +0200
Update German translation
--
Actually only updates due to typo fixes in the English source.
diff --git a/po/de.po b/po/de.po
index f96003d..190120f 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: 2012-05-08 15:17+0200\n"
+"PO-Revision-Date: 2012-08-24 10:19+0200\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
"MIME-Version: 1.0\n"
@@ -66,6 +66,9 @@ msgstr ""
"Bitte geben Sie Ihre Passphrase ein, so daß der geheime Schlüssel benutzt "
"werden kann."
+#. 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.
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr "SETERROR %s (Versuch %d von %d)"
@@ -283,7 +286,7 @@ msgid "Yes, protection is not needed"
msgstr "Ja, ein Schutz ist nicht notwendig"
#, c-format
-msgid "Please enter the passphrase to%0Ato protect your new key"
+msgid "Please enter the passphrase to%0Aprotect your new key"
msgstr "Bitte geben Sie die Passphrase ein,%0Aum Ihren Schlüssel zu schützen."
msgid "Please enter the new passphrase"
@@ -1813,8 +1816,8 @@ msgstr "Aufruf: gpg [Optionen] [Dateien] (-h für Hilfe)"
msgid ""
"Syntax: gpg [options] [files]\n"
-"sign, check, encrypt or decrypt\n"
-"default operation depends on the input data\n"
+"Sign, check, encrypt or decrypt\n"
+"Default operation depends on the input data\n"
msgstr ""
"Aufruf: gpg [Optionen] [Dateien]\n"
"Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
@@ -1882,7 +1885,9 @@ msgstr ""
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
-msgstr "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses der Konfigurationsdatei '%s'\n"
+msgstr ""
+"WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses der "
+"Konfigurationsdatei '%s'\n"
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
@@ -1898,7 +1903,9 @@ msgstr ""
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
-msgstr "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der Konfigurationsdatei '%s'\n"
+msgstr ""
+"WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
+"Konfigurationsdatei '%s'\n"
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
@@ -3045,8 +3052,10 @@ msgid ""
" a 't' for trust signatures (tsign), an 'nr' for non-revocable signatures\n"
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
-"* Dem 'sign'-Befehl darf ein 'l' für nicht exportfähige Signaturen vorangestellt werden (\"lsign\"),\n"
-" ein 't' für 'Trust'-Signatur (\"tsign\"), ein 'nr' für unwiderrufbare Signaturen\n"
+"* Dem 'sign'-Befehl darf ein 'l' für nicht exportfähige Signaturen "
+"vorangestellt werden (\"lsign\"),\n"
+" ein 't' für 'Trust'-Signatur (\"tsign\"), ein 'nr' für unwiderrufbare "
+"Signaturen\n"
" (\"nrsign\"), oder jede Kombination davon (\"ltsign\", \"tnrsign\", etc.).\n"
msgid "Key is revoked."
@@ -4476,6 +4485,16 @@ msgstr "Grund für Widerruf: "
msgid "revocation comment: "
msgstr "Widerruf-Bemerkung: "
+#. TRANSLATORS: These are the allowed answers in lower and
+#. uppercase. Below you will find the matching strings which
+#. should be translated accordingly and the letter changed to
+#. match the one in the answer string.
+#.
+#. i = please show me more information
+#. m = back to the main menu
+#. s = skip this key
+#. q = quit
+#.
msgid "iImMqQsS"
msgstr "iImMqQsS"
@@ -4830,7 +4849,7 @@ msgid "%s key %s uses an unsafe (%zu bit) hash\n"
msgstr "%s-Schlüssel %s verwendet ein unsicheres (%zu-Bit) Hashverfahren\n"
#, c-format
-msgid "%s key %s requires a %zu bit or larger hash (hash is %s\n"
+msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
"%s-Schlüssel %s benötigt einen mindestens %zu Bit langen Hash (Hash ist %s)\n"
@@ -5160,6 +5179,14 @@ msgstr ""
msgid "using %s trust model\n"
msgstr "verwende Vertrauensmodell %s\n"
+#. TRANSLATORS: these strings are similar to those in
+#. trust_value_to_string(), but are a fixed length. This is needed to
+#. make attractive information listings where columns line up
+#. properly. The value "10" should be the length of the strings you
+#. choose to translate to. This is the length in printable columns.
+#. It gets passed to atoi() so everything after the number is
+#. essentially a comment and need not be translated. Either key and
+#. uid are both NULL, or neither are NULL.
msgid "10 translator see trustdb.c:uid_trust_string_fixed"
msgstr "10"
@@ -5282,7 +5309,7 @@ msgstr "Aufruf: kbxutil [Optionen] [Dateien] (-h für Hilfe)"
msgid ""
"Syntax: kbxutil [options] [files]\n"
-"list, export, import Keybox data\n"
+"List, export, import Keybox data\n"
msgstr ""
"Syntax: kbxutil [Optionen] [Dateien]\n"
"Anlisten exportieren und Importieren von KeyBox Dateien\n"
@@ -5420,6 +5447,9 @@ msgstr "Bitte geben Sie den Rückstellcode für diese Karte ein"
msgid "Reset Code is too short; minimum length is %d\n"
msgstr "Der Rückstellcode ist zu kurz; die Mindestlänge beträgt %d\n"
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string. We need this elsewhere
+#. to get some infos on the string.
msgid "|RN|New Reset Code"
msgstr "|RN|Neuer Rückstellcode"
@@ -5616,8 +5646,8 @@ msgstr "Anzahl der übereinstimmenden Zertifikate: %d\n"
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "Schlüsselsuche im Cache des Dirmngr schlug fehl: %s\n"
-msgid "failed to allocated keyDB handle\n"
-msgstr "Ein keyDB Handle konnte nicht bereitgestellt werden\n"
+msgid "failed to allocate keyDB handle\n"
+msgstr "Kann keinen KeyDB Handler bereitstellen\n"
msgid "certificate has been revoked"
msgstr "Das Zertifikat wurde widerrufen"
@@ -5800,18 +5830,18 @@ msgstr ""
msgid "error getting key usage information: %s\n"
msgstr "Fehler beim Holen der Schlüsselbenutzungsinformationen: %s\n"
-msgid "certificate should have not been used for certification\n"
+msgid "certificate should not have been used for certification\n"
msgstr "Das Zertifikat hätte nicht zum Zertifizieren benutzt werden sollen\n"
-msgid "certificate should have not been used for OCSP response signing\n"
+msgid "certificate should not have been used for OCSP response signing\n"
msgstr ""
"Das Zertifikat hätte nicht zum Signieren von OCSP Antworten benutzt werden "
"sollen\n"
-msgid "certificate should have not been used for encryption\n"
+msgid "certificate should not have been used for encryption\n"
msgstr "Das Zertifikat hätte nicht zum Verschlüsseln benutzt werden sollen\n"
-msgid "certificate should have not been used for signing\n"
+msgid "certificate should not have been used for signing\n"
msgstr "Das Zertifikat hätte nicht zum Signieren benutzt werden sollen\n"
msgid "certificate is not usable for encryption\n"
@@ -6118,8 +6148,8 @@ msgstr "Aufruf: gpgsm [Optionen] [Dateien] (-h für Hilfe)"
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"
+"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"Default operation depends on the input data\n"
msgstr ""
"Syntax: gpgsm [Optionen] [Dateien]\n"
"Signieren, prüfen, ver- und entschlüsseln mittels S/MIME Protokoll\n"
@@ -6171,9 +6201,6 @@ msgstr "Fehler beim Speichern des Zertifikats\n"
msgid "basic certificate checks failed - not imported\n"
msgstr "Grundlegende Zertifikatprüfungen fehlgeschlagen - nicht importiert\n"
-msgid "failed to allocate keyDB handle\n"
-msgstr "Kann keinen KeyDB Handler bereitstellen\n"
-
#, c-format
msgid "error getting stored flags: %s\n"
msgstr "Fehler beim Holen der gespeicherten Flags: %s\n"
@@ -6769,7 +6796,7 @@ msgstr ""
msgid " ERROR: The CRL will not be used\n"
msgstr " FEHLER: Die CRL wird nicht benutzt\n"
-msgid " ERROR: This cached CRL may has been tampered with!\n"
+msgid " ERROR: This cached CRL may have been tampered with!\n"
msgstr ""
" FEHLER: Diese zwischengespeicherte CRL ist möglicherweise abgeändert "
"worden!\n"
@@ -6864,7 +6891,7 @@ msgstr "CRL in den Dirmngr laden"
msgid "special mode for use by Squid"
msgstr "Sondermodus für Squid"
-msgid "certificates are expected in PEM format"
+msgid "expect certificates in PEM format"
msgstr "Zertifikate werden im PEM Format erwartet"
msgid "force the use of the default OCSP responder"
@@ -7150,8 +7177,8 @@ msgstr "Gebrauch: dirmngr_ldap [Optionen] [URL] (-h für Hilfe)\n"
msgid ""
"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr.\n"
-"Interface and options may change without notice.\n"
+"Internal LDAP helper for Dirmngr\n"
+"Interface and options may change without notice\n"
msgstr ""
"Gebrauch: dirmngr_ldap [Optionen] [URL] (-h für Hilfe)\n"
"Internes LDAP-Hilfsprogramm für Dirmngr.\n"
@@ -7526,7 +7553,7 @@ msgstr "Der Zertifikatkette ist gültig\n"
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA benötigt eine 160 Bit Hashmethode\n"
-msgid "certificate should have not been used for CRL signing\n"
+msgid "certificate should not have been used for CRL signing\n"
msgstr ""
"Das Zertifikat hätte nicht zum Signieren einer CRL benutzt werden sollen\n"
@@ -7922,6 +7949,9 @@ msgstr ""
"Syntax: gpg-check-pattern [optionen] Musterdatei\n"
"Die von stdin gelesene Passphrase gegen die Musterdatei prüfen\n"
+#~ msgid "failed to allocated keyDB handle\n"
+#~ msgstr "Ein keyDB Handle konnte nicht bereitgestellt werden\n"
+
#~ msgid "the IDEA cipher plugin is not present\n"
#~ msgstr "das IDEA-Verschlüsselungs-Plugin ist nicht vorhanden\n"
commit ba591e2f14c0d85ba15346ffd04b9e7d72ec89dc
Author: David Prévot <taffit at debian.org>
Date: Wed Aug 22 12:54:38 2012 -0400
Fix typos spotted during translations
* agent/genkey.c: s/to to/to/
* sm/*.c: s/failed to allocated/failed to allocate/
* sm/certlist.c, ./dirmngr/validate.c: s/should have not/should not have/
* g10/seskey.c: missing closing parenthesis
* dirmngr/crlcache.c: s/may has/may have/
Consistency fix:
* g10/gpg.c, kbx/kbxutil.c, sm/gpgsm.c: uppercase after Syntax
* dirmngr/dirmngr_ldap: no period in Syntax
* dirmngr/dirmngr-client.c: infinitive for option description:
s/certificates are expected/expect certificates/
diff --git a/agent/genkey.c b/agent/genkey.c
index 20b9230..c040f13 100644
--- a/agent/genkey.c
+++ b/agent/genkey.c
@@ -404,7 +404,7 @@ agent_genkey (ctrl_t ctrl, const char *cache_nonce,
else
rc = agent_ask_new_passphrase (ctrl,
_("Please enter the passphrase to%0A"
- "to protect your new key"),
+ "protect your new key"),
&passphrase);
if (rc)
return rc;
diff --git a/dirmngr/crlcache.c b/dirmngr/crlcache.c
index a4d8e80..8505f9c 100644
--- a/dirmngr/crlcache.c
+++ b/dirmngr/crlcache.c
@@ -2301,7 +2301,7 @@ list_one_crl_entry (crl_cache_t cache, crl_cache_entry_t e, estream_t fp)
return gpg_error (GPG_ERR_GENERAL);
if (!e->dbfile_checked)
- es_fprintf (fp, _(" ERROR: This cached CRL may has been tampered with!\n"));
+ es_fprintf (fp, _(" ERROR: This cached CRL may have been tampered with!\n"));
es_putc ('\n', fp);
diff --git a/dirmngr/dirmngr-client.c b/dirmngr/dirmngr-client.c
index 65d5a84..21f7743 100644
--- a/dirmngr/dirmngr-client.c
+++ b/dirmngr/dirmngr-client.c
@@ -76,7 +76,7 @@ static ARGPARSE_OPTS opts[] = {
{ oUrl, "url", 0, N_("expect an URL for --lookup")},
{ oLoadCRL, "load-crl", 0, N_("load a CRL into the dirmngr")},
{ oSquidMode,"squid-mode",0, N_("special mode for use by Squid")},
- { oPEM, "pem", 0, N_("certificates are expected in PEM format")},
+ { oPEM, "pem", 0, N_("expect certificates in PEM format")},
{ oForceDefaultResponder, "force-default-responder", 0,
N_("force the use of the default OCSP responder")},
{ 0, NULL, 0, NULL }
diff --git a/dirmngr/dirmngr_ldap.c b/dirmngr/dirmngr_ldap.c
index e17d262..1b513ea 100644
--- a/dirmngr/dirmngr_ldap.c
+++ b/dirmngr/dirmngr_ldap.c
@@ -203,8 +203,8 @@ my_strusage (int level)
break;
case 41: p =
_("Syntax: dirmngr_ldap [options] [URL]\n"
- "Internal LDAP helper for Dirmngr.\n"
- "Interface and options may change without notice.\n");
+ "Internal LDAP helper for Dirmngr\n"
+ "Interface and options may change without notice\n");
break;
default: p = NULL;
diff --git a/dirmngr/validate.c b/dirmngr/validate.c
index 3ef676a..024708b 100644
--- a/dirmngr/validate.c
+++ b/dirmngr/validate.c
@@ -1096,7 +1096,7 @@ cert_usage_p (ksba_cert_t cert, int mode)
{
if ((use & (KSBA_KEYUSAGE_KEY_CERT_SIGN)))
return 0;
- log_info (_("certificate should have not "
+ log_info (_("certificate should not have "
"been used for certification\n"));
return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
}
@@ -1108,7 +1108,7 @@ cert_usage_p (ksba_cert_t cert, int mode)
|| (use & (KSBA_KEYUSAGE_KEY_CERT_SIGN
|KSBA_KEYUSAGE_CRL_SIGN))))
return 0;
- log_info (_("certificate should have not "
+ log_info (_("certificate should not have "
"been used for OCSP response signing\n"));
return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
}
@@ -1117,7 +1117,7 @@ cert_usage_p (ksba_cert_t cert, int mode)
{
if ((use & (KSBA_KEYUSAGE_CRL_SIGN)))
return 0;
- log_info (_("certificate should have not "
+ log_info (_("certificate should not have "
"been used for CRL signing\n"));
return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
}
@@ -1128,9 +1128,9 @@ cert_usage_p (ksba_cert_t cert, int mode)
)
return 0;
- log_info (mode==3? _("certificate should have not been used "
+ log_info (mode==3? _("certificate should not have been used "
"for encryption\n"):
- mode==2? _("certificate should have not been used for signing\n"):
+ mode==2? _("certificate should not have been used for signing\n"):
mode==1? _("certificate is not usable for encryption\n"):
_("certificate is not usable for signing\n"));
return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
diff --git a/g10/gpg.c b/g10/gpg.c
index c8dbbfe..b614a94 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -845,8 +845,8 @@ my_strusage( int level )
break;
case 41: p =
_("Syntax: gpg [options] [files]\n"
- "sign, check, encrypt or decrypt\n"
- "default operation depends on the input data\n");
+ "Sign, check, encrypt or decrypt\n"
+ "Default operation depends on the input data\n");
break;
case 31: p = "\nHome: "; break;
diff --git a/g10/seskey.c b/g10/seskey.c
index 93a809d..ac6e6d6 100644
--- a/g10/seskey.c
+++ b/g10/seskey.c
@@ -310,7 +310,7 @@ encode_md_value (PKT_public_key *pk, gcry_md_hd_t md, int hash_algo)
if (mdlen < qbits/8)
{
log_error (_("%s key %s requires a %zu bit or larger hash "
- "(hash is %s\n"),
+ "(hash is %s)\n"),
gcry_pk_algo_name (pkalgo),
keystr_from_pk(pk), qbits,
gcry_md_algo_name (hash_algo));
diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c
index c9d5681..62e3dbe 100644
--- a/kbx/kbxutil.c
+++ b/kbx/kbxutil.c
@@ -118,7 +118,7 @@ my_strusage( int level )
break;
case 41: p =
_("Syntax: kbxutil [options] [files]\n"
- "list, export, import Keybox data\n");
+ "List, export, import Keybox data\n");
break;
diff --git a/sm/certchain.c b/sm/certchain.c
index 18744b1..b51291d 100644
--- a/sm/certchain.c
+++ b/sm/certchain.c
@@ -756,7 +756,7 @@ gpgsm_walk_cert_chain (ctrl_t ctrl, ksba_cert_t start, ksba_cert_t *r_next)
*r_next = NULL;
if (!kh)
{
- log_error (_("failed to allocated keyDB handle\n"));
+ log_error (_("failed to allocate keyDB handle\n"));
rc = gpg_error (GPG_ERR_GENERAL);
goto leave;
}
@@ -1250,7 +1250,7 @@ do_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t checktime_arg,
kh = keydb_new (0);
if (!kh)
{
- log_error (_("failed to allocated keyDB handle\n"));
+ log_error (_("failed to allocate keyDB handle\n"));
rc = gpg_error (GPG_ERR_GENERAL);
goto leave;
}
@@ -1890,7 +1890,7 @@ gpgsm_basic_cert_check (ctrl_t ctrl, ksba_cert_t cert)
kh = keydb_new (0);
if (!kh)
{
- log_error (_("failed to allocated keyDB handle\n"));
+ log_error (_("failed to allocate keyDB handle\n"));
rc = gpg_error (GPG_ERR_GENERAL);
goto leave;
}
diff --git a/sm/certlist.c b/sm/certlist.c
index 241364a..9adcabf 100644
--- a/sm/certlist.c
+++ b/sm/certlist.c
@@ -139,7 +139,7 @@ cert_usage_p (ksba_cert_t cert, int mode)
{
if ((use & (KSBA_KEYUSAGE_KEY_CERT_SIGN)))
return 0;
- log_info (_("certificate should have not "
+ log_info (_("certificate should not have "
"been used for certification\n"));
return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
}
@@ -151,7 +151,7 @@ cert_usage_p (ksba_cert_t cert, int mode)
|| (use & (KSBA_KEYUSAGE_KEY_CERT_SIGN
|KSBA_KEYUSAGE_CRL_SIGN))))
return 0;
- log_info (_("certificate should have not "
+ log_info (_("certificate should not have "
"been used for OCSP response signing\n"));
return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
}
@@ -162,8 +162,8 @@ cert_usage_p (ksba_cert_t cert, int mode)
)
return 0;
- log_info (mode==3? _("certificate should have not been used for encryption\n"):
- mode==2? _("certificate should have not been used for signing\n"):
+ log_info (mode==3? _("certificate should not have been used for encryption\n"):
+ mode==2? _("certificate should not have been used for signing\n"):
mode==1? _("certificate is not usable for encryption\n"):
_("certificate is not usable for signing\n"));
return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
diff --git a/sm/decrypt.c b/sm/decrypt.c
index 6161150..a560272 100644
--- a/sm/decrypt.c
+++ b/sm/decrypt.c
@@ -259,7 +259,7 @@ gpgsm_decrypt (ctrl_t ctrl, int in_fd, estream_t out_fp)
kh = keydb_new (0);
if (!kh)
{
- log_error (_("failed to allocated keyDB handle\n"));
+ log_error (_("failed to allocate keyDB handle\n"));
rc = gpg_error (GPG_ERR_GENERAL);
goto leave;
}
diff --git a/sm/encrypt.c b/sm/encrypt.c
index e881333..54a8bd1 100644
--- a/sm/encrypt.c
+++ b/sm/encrypt.c
@@ -336,7 +336,7 @@ gpgsm_encrypt (ctrl_t ctrl, certlist_t recplist, int data_fd, estream_t out_fp)
kh = keydb_new (0);
if (!kh)
{
- log_error (_("failed to allocated keyDB handle\n"));
+ log_error (_("failed to allocate keyDB handle\n"));
rc = gpg_error (GPG_ERR_GENERAL);
goto leave;
}
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 7263fd0..b001682 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -535,8 +535,8 @@ my_strusage( int level )
break;
case 41:
p = _("Syntax: gpgsm [options] [files]\n"
- "sign, check, encrypt or decrypt using the S/MIME protocol\n"
- "default operation depends on the input data\n");
+ "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
+ "Default operation depends on the input data\n");
break;
case 20:
diff --git a/sm/sign.c b/sm/sign.c
index e102cd0..08eebb7 100644
--- a/sm/sign.c
+++ b/sm/sign.c
@@ -334,7 +334,7 @@ gpgsm_sign (ctrl_t ctrl, certlist_t signerlist,
kh = keydb_new (0);
if (!kh)
{
- log_error (_("failed to allocated keyDB handle\n"));
+ log_error (_("failed to allocate keyDB handle\n"));
rc = gpg_error (GPG_ERR_GENERAL);
goto leave;
}
diff --git a/sm/verify.c b/sm/verify.c
index 8cf7ff9..2e91137 100644
--- a/sm/verify.c
+++ b/sm/verify.c
@@ -111,7 +111,7 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, estream_t out_fp)
kh = keydb_new (0);
if (!kh)
{
- log_error (_("failed to allocated keyDB handle\n"));
+ log_error (_("failed to allocate keyDB handle\n"));
rc = gpg_error (GPG_ERR_GENERAL);
goto leave;
}
commit 94e663885b35ff01f2bb848b6719043ff7fc612a
Author: David Prévot <taffit at debian.org>
Date: Wed Aug 22 12:54:37 2012 -0400
Actually show translators comments in PO files
--
diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c
index 381d0f0..c37831a 100644
--- a/agent/call-pinentry.c
+++ b/agent/call-pinentry.c
@@ -818,7 +818,7 @@ agent_askpin (ctrl_t ctrl,
if (errtext)
{
- /* TRANLATORS: The string is appended to an error message in
+ /* 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. */
snprintf (line, DIM(line)-1, _("SETERROR %s (try %d of %d)"),
diff --git a/g10/pkclist.c b/g10/pkclist.c
index c43c74c..f805da8 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -202,7 +202,7 @@ do_edit_ownertrust (PKT_public_key *pk, int mode,
for(;;) {
/* A string with valid answers.
- Note to translators: These are the allowed answers in lower and
+ TRANSLATORS: These are the allowed answers in lower and
uppercase. Below you will find the matching strings which
should be translated accordingly and the letter changed to
match the one in the answer string.
diff --git a/g10/trustdb.c b/g10/trustdb.c
index 0f13dc1..6b228d2 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -507,7 +507,11 @@ trust_letter (unsigned int value)
}
}
-/* NOTE TO TRANSLATOR: these strings are similar to those in
+const char *
+uid_trust_string_fixed(PKT_public_key *key,PKT_user_id *uid)
+{
+ if(!key && !uid)
+/* TRANSLATORS: these strings are similar to those in
trust_value_to_string(), but are a fixed length. This is needed to
make attractive information listings where columns line up
properly. The value "10" should be the length of the strings you
@@ -515,10 +519,6 @@ trust_letter (unsigned int value)
It gets passed to atoi() so everything after the number is
essentially a comment and need not be translated. Either key and
uid are both NULL, or neither are NULL. */
-const char *
-uid_trust_string_fixed(PKT_public_key *key,PKT_user_id *uid)
-{
- if(!key && !uid)
return _("10 translator see trustdb.c:uid_trust_string_fixed");
else if(uid->is_revoked || (key && key->flags.revoked))
return _("[ revoked]");
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 0dd20e2..9c8ef59 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -2081,8 +2081,7 @@ do_change_pin (app_t app, ctrl_t ctrl, const char *chvnostr,
/* TRANSLATORS: Do not translate the "|*|" prefixes but
keep it at the start of the string. We need this elsewhere
to get some infos on the string. */
- rc = pincb (pincb_arg,
- set_resetcode? _("|RN|New Reset Code") :
+ rc = pincb (pincb_arg, set_resetcode? _("|RN|New Reset Code") :
chvno == 3? _("|AN|New Admin PIN") : _("|N|New PIN"),
&pinvalue);
if (rc)
commit bf95408fc33709d154cd41566d33af3ec3c48886
Author: David Prévot <taffit at debian.org>
Date: Wed Aug 22 12:54:36 2012 -0400
Keep previous msgids of translated messages
* po/Makefile.in.in: Use --previous with msgmerge.
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index fecf500..eb68ea2 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -56,8 +56,8 @@ XGETTEXT_ = @XGETTEXT@
XGETTEXT_no = @XGETTEXT@
XGETTEXT_yes = @XGETTEXT_015@
XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
-MSGMERGE = msgmerge
-MSGMERGE_UPDATE = @MSGMERGE@ --update
+MSGMERGE = msgmerge --previous
+MSGMERGE_UPDATE = @MSGMERGE@ --previous --update
MSGINIT = msginit
MSGCONV = msgconv
MSGFILTER = msgfilter
commit 1da04bfb3f5714a0fa6d0b779d0d2ae4e9544b8f
Author: Hans-Christoph Steiner <hans at eds.org>
Date: Thu Aug 16 22:43:15 2012 -0400
Fix build system for Android by disabling tests since its x-compiled
* configure.ac (HAVE_ANDROID_SYSTEM, RUN_TESTS): New.
(AH_BOTTOM) [__ANDROID__]: Do not re-define ttyname.
* Makefile.am: Depend tests on new RUN_TESTS conditional.
diff --git a/Makefile.am b/Makefile.am
index 6207d7b..c5ac11c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,10 +82,10 @@ else
doc =
endif
-if HAVE_W32_SYSTEM
-tests =
-else
+if RUN_TESTS
tests = tests
+else
+tests =
endif
SUBDIRS = m4 gl include common ${kbx} \
diff --git a/configure.ac b/configure.ac
index d46a838..0241a9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -494,13 +494,6 @@ AH_BOTTOM([
# endif
#endif
-/* Hacks required for Android. */
-#ifdef __ANDROID__
- /* ttyname is a stub in BIONIC, printing a FIXME warning. */
-# define ttyname broken_native_ttyname
-# undef HAVE_TTYNAME
-#endif /*__ANDROID__*/
-
/* Tell libgcrypt not to use its own libgpg-error implementation. */
#define USE_LIBGPG_ERROR 1
@@ -585,6 +578,8 @@ try_gettext=yes
have_dosish_system=no
have_w32_system=no
have_w32ce_system=no
+have_android_system=no
+run_tests=yes
use_simple_gettext=no
use_ldapwrapper=yes
mmap_needed=yes
@@ -601,6 +596,7 @@ case "${host}" in
disable_keyserver_path=yes
have_dosish_system=yes
have_w32_system=yes
+ run_tests=no
use_ldapwrapper=no # Fixme: Do this only for CE.
case "${host}" in
*-mingw32ce*)
@@ -660,6 +656,10 @@ case "${host}" in
;;
m68k-atari-mint)
;;
+ *-linux-androideabi)
+ have_android_system=yes
+ run_tests=no
+ ;;
*)
;;
esac
@@ -684,6 +684,16 @@ fi
AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes)
AM_CONDITIONAL(HAVE_W32CE_SYSTEM, test "$have_w32ce_system" = yes)
+if test "$have_android_system" = yes; then
+ AC_DEFINE(HAVE_ANDROID_SYSTEM,1, [Defined if we build for an Android system])
+fi
+AM_CONDITIONAL(HAVE_ANDROID_SYSTEM, test "$have_android_system" = yes)
+
+if test "$run_tests" = yes; then
+ AC_DEFINE(RUN_TESTS,1, [Defined if we should run the tests])
+fi
+AM_CONDITIONAL(RUN_TESTS, test "$run_tests" = yes)
+
if test "$use_ldapwrapper" = yes; then
AC_DEFINE(USE_LDAPWRAPPER,1, [Build dirmngr with LDAP wrapper process])
fi
commit 8156a38674421deef6c2eb3e91e0186fe7fe4b26
Author: Werner Koch <wk at gnupg.org>
Date: Fri Aug 24 09:29:56 2012 +0200
Fix left over use of jnlib on some platforms
* tools/watchgnupg.c: Take mischelp.h from common/ and not jnlib/.
--
Also fixed in some comments.
diff --git a/common/srv.c b/common/srv.c
index c493f97..74afbcb 100644
--- a/common/srv.c
+++ b/common/srv.c
@@ -326,6 +326,6 @@ main(int argc,char *argv[])
/*
Local Variables:
-compile-command: "cc -DTEST -I.. -I../include -Wall -g -o srv srv.c -lresolv ../tools/no-libgcrypt.o ../jnlib/libjnlib.a"
+compile-command: "cc -DTEST -I.. -I../include -Wall -g -o srv srv.c -lresolv ../tools/no-libgcrypt.o ../common/libcommon.a"
End:
*/
diff --git a/scd/Makefile.am b/scd/Makefile.am
index 09aea0e..a0c0369 100644
--- a/scd/Makefile.am
+++ b/scd/Makefile.am
@@ -61,7 +61,7 @@ scdaemon_LDADD = $(libcommonpth) ../gl/libgnu.a \
# app.c app-common.h app-help.c $(card_apps)
#
#sc_copykeys_LDADD = \
-# ../jnlib/libjnlib.a ../common/libcommon.a \
+# ../common/libcommon.a \
# ../common/libsimple-pwquery.a \
# $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \
# $(LIBUSB_LIBS) \
diff --git a/tools/no-libgcrypt.c b/tools/no-libgcrypt.c
index 9e52566..b56cc38 100644
--- a/tools/no-libgcrypt.c
+++ b/tools/no-libgcrypt.c
@@ -22,7 +22,7 @@
/* Replace libgcrypt's malloc functions which are used by
- ../jnlib/libjnlib.a . ../common/util.h defines macros to map them
+ ../common/libcommon.a . ../common/util.h defines macros to map them
to xmalloc etc. */
static void
out_of_memory (void)
diff --git a/tools/watchgnupg.c b/tools/watchgnupg.c
index 1bd9e80..060aa04 100644
--- a/tools/watchgnupg.c
+++ b/tools/watchgnupg.c
@@ -47,7 +47,7 @@
#endif
#if !defined(SUN_LEN) || !defined(PF_LOCAL) || !defined(AF_LOCAL)
#define JNLIB_NEED_AFLOCAL
-#include "../jnlib/mischelp.h"
+#include "../common/mischelp.h"
#endif
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 6 ++--
agent/call-pinentry.c | 2 +-
agent/genkey.c | 2 +-
common/srv.c | 2 +-
configure.ac | 24 +++++++++----
dirmngr/crlcache.c | 2 +-
dirmngr/dirmngr-client.c | 2 +-
dirmngr/dirmngr_ldap.c | 4 +-
dirmngr/validate.c | 10 +++---
g10/gpg.c | 4 +-
g10/pkclist.c | 2 +-
g10/seskey.c | 2 +-
g10/trustdb.c | 10 +++---
kbx/kbxutil.c | 2 +-
po/Makefile.in.in | 4 +-
po/de.po | 82 +++++++++++++++++++++++++++++++--------------
scd/Makefile.am | 2 +-
scd/app-openpgp.c | 3 +-
sm/certchain.c | 6 ++--
sm/certlist.c | 8 ++--
sm/decrypt.c | 2 +-
sm/encrypt.c | 2 +-
sm/gpgsm.c | 4 +-
sm/sign.c | 2 +-
sm/verify.c | 2 +-
tools/no-libgcrypt.c | 2 +-
tools/watchgnupg.c | 2 +-
27 files changed, 117 insertions(+), 78 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list