[git] GnuPG - branch, master, updated. gnupg-2.1.7-36-gb8adfc4
by Werner Koch
cvs at cvs.gnupg.org
Thu Aug 20 17:45:49 CEST 2015
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 b8adfc4186fa209dce3e7ca763cec8576b8ee291 (commit)
via 0d5a4138f27187e7828ef8216758edc9b48b2c64 (commit)
from 0add91ae1ca3718e8140af09294c595f47c958d3 (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 b8adfc4186fa209dce3e7ca763cec8576b8ee291
Author: Werner Koch <wk at gnupg.org>
Date: Thu Aug 20 17:42:55 2015 +0200
doc: Remove C++ style comments and update HACKING.
--
diff --git a/common/t-iobuf.c b/common/t-iobuf.c
index 01c94a3..ae72fde 100644
--- a/common/t-iobuf.c
+++ b/common/t-iobuf.c
@@ -27,7 +27,7 @@ every_other_filter (void *opaque, int control,
else
c2 = iobuf_readbyte (chain);
- // printf ("Discarding %d (%c); return %d (%c)\n", c, c, c2, c2);
+ /* printf ("Discarding %d (%c); return %d (%c)\n", c, c, c2, c2); */
if (c2 == -1)
{
@@ -149,12 +149,12 @@ main (int argc, char *argv[])
n = 0;
while ((c = iobuf_readbyte (iobuf)) != -1)
{
- // printf ("%d: %c\n", n + 1, (char) c);
+ /* printf ("%d: %c\n", n + 1, (char) c); */
assert (content[2 * n + 1] == c);
n ++;
}
- // printf ("Got EOF after reading %d bytes (content: %d)\n",
- // n, strlen (content));
+ /* printf ("Got EOF after reading %d bytes (content: %d)\n", */
+ /* n, strlen (content)); */
assert (n == strlen (content) / 2);
iobuf_close (iobuf);
@@ -185,7 +185,7 @@ main (int argc, char *argv[])
while ((c = iobuf_readbyte (iobuf)) != -1)
{
- // printf ("%d: %c\n", n + 1, (char) c);
+ /* printf ("%d: %c\n", n + 1, (char) c); */
assert (content[2 * (n - 5) + 1] == c);
n ++;
}
@@ -293,7 +293,7 @@ main (int argc, char *argv[])
c = iobuf_readbyte (iobuf);
if (c == -1 && lastc == -1)
{
- // printf("Two EOFs in a row. Done.\n");
+ /* printf("Two EOFs in a row. Done.\n"); */
assert (n == 44);
break;
}
@@ -302,13 +302,13 @@ main (int argc, char *argv[])
if (c == -1)
{
- // printf("After %d bytes, got EOF.\n", n);
+ /* printf("After %d bytes, got EOF.\n", n); */
assert (n == 27 || n == 44);
}
else
{
n ++;
- // printf ("%d: '%c' (%d)\n", n, c, c);
+ /* printf ("%d: '%c' (%d)\n", n, c, c); */
}
}
}
@@ -366,7 +366,7 @@ main (int argc, char *argv[])
for (n = 0; (c = iobuf_get (iobuf)) != -1; n ++)
{
- // printf ("%d: `%c'\n", n, c);
+ /* printf ("%d: `%c'\n", n, c); */
buffer[n] = c;
}
diff --git a/doc/HACKING b/doc/HACKING
index c1cd348..5d72017 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -32,11 +32,31 @@ TAB, will not exceed 80 columns. If you want to add text which shall
not be copied to the ChangeLog, separate it by a line consisting of
two dashes at the begin of a line.
-Typo fixes and documentation updates don't need a ChangeLog Entry,
+The one-line summary usually starts with a keyword to identify the
+mainly affected subsystem. If more than one keyword is required the
+are delimited by a comma (e.g. =scd,w32:=). Commonly found keywords
+are
+
+ - agent :: The gpg-agent component
+ - ssh :: The ssh-agent part of the agent
+ - common :: Code in common
+ - iobuf :: The IOBUF system in common
+ - gpg :: The gpg or gpgv components
+ - gpgsm :: The gpgsm component
+ - scd :: The scdaemon component
+ - ccid :: The CCID driver in scdaemon
+ - dirmngr :: The dirmngr component
+ - w32 :: Windows related code
+ - po :: Translations
+ - build :: Changes to the build system
+ - speedo :: Speedo build system specific changes
+ - doc :: Documentation changes
+
+Typo fixes and documentation updates don't need a ChangeLog entry;
thus you would use a commit message like
#+begin_example
-Fix type in a comment
+Fix typo in a comment
--
#+end_example
@@ -54,7 +74,6 @@ Note that such a comment will be removed if the git commit option
=--cleanup=scissor= is used.
-
** License policy
GnuPG is licensed under the GPLv3+ with some files under a mixed
@@ -104,6 +123,12 @@ Note that such a comment will be removed if the git commit option
need. If you really need to do it, use a separate commit for such a
change.
+ - C99 syntax should not be used; stick to C90.
+ - Please do not use C++ =//= style comments.
+ - Try to fit lines into 80 columns.
+ - Ignore signed/unsigned pointer mismatches
+ - No arithmetic on void pointers; cast to char* first.
+
** Commit log keywords
- GnuPG-bug-id :: Values are comma or space delimited bug numbers
@@ -156,7 +181,6 @@ Note that such a comment will be removed if the git commit option
the git repositories. In case of problems, don't hesitate to ask
on the gnupg-devel mailing for help.
-
* Debug hints
See the manual for some hints.
commit 0d5a4138f27187e7828ef8216758edc9b48b2c64
Author: Werner Koch <wk at gnupg.org>
Date: Thu Aug 20 16:37:45 2015 +0200
po: Add lost translation of validity strings.
* po/POTFILES.in (trust.c): Add missing file.
* po/de.po: Changed German validity strings.
* doc/help.de.txt: Ditto.
--
Note that I replaced "uneingeschränkt" in de.po to "ultimativ" to
make the output better readable.
diff --git a/doc/help.de.txt b/doc/help.de.txt
index ea2a4e4..7b2fffe 100644
--- a/doc/help.de.txt
+++ b/doc/help.de.txt
@@ -7,12 +7,12 @@
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
-#
+#
# GnuPG is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
@@ -41,9 +41,9 @@ um das "Netz des Vertrauens" aufzubauen. Dieses hat nichts mit dem
.gpg.edit_ownertrust.set_ultimate.okay
Um das Web-of-Trust aufzubauen muß GnuPG wissen, welchen Schlüsseln
-uneingeschränkt vertraut wird. Das sind üblicherweise die Schlüssel
+ultimativ vertraut wird. Das sind üblicherweise die Schlüssel
auf deren geheimen Schlüssel Sie Zugruff haben.
-Antworten Sie mit "yes" um diesen Schlüssel uneingeschränkt zu vertrauen
+Antworten Sie mit "yes" um diesen Schlüssel ultimativ zu vertrauen
.
@@ -74,7 +74,7 @@ unterschrieben werden kann.
.gpg.keygen.algo.rsa_se
Normalerweise ist es nicht gut, denselben Schlüssel zum unterschreiben
und verschlüsseln zu nutzen. Dieses Verfahren sollte in speziellen
-Anwendungsgebiten benutzt werden. Bitte lassen Sie sich zuerst von
+Anwendungsgebiten benutzt werden. Bitte lassen Sie sich zuerst von
einem Sicherheistexperten beraten.
.
@@ -138,7 +138,7 @@ sicherstellen, daß der Schlüssel demjenigen gehört, der in der User-ID genann
ist. Für Dritte ist es hilfreich zu wissen, wie gut diese Zuordnung überprüft
wurde.
-"0" zeigt, daß Sie keine bestimmte Aussage über die Sorgfalt der
+"0" zeigt, daß Sie keine bestimmte Aussage über die Sorgfalt der
Schlüsselzuordnung machen.
"1" Sie glauben, daß der Schlüssel der benannten Person gehört,
@@ -224,7 +224,7 @@ Eigenbeglaubigungen werden um eine Sekunde vorgestellt.
.
.gpg.passphrase.enter
-Bitte geben Sie die Passphrase ein. Dies ist ein geheimer Satz
+Bitte geben Sie die Passphrase ein. Dies ist ein geheimer Satz
.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6050b1b..09c6ec4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -72,6 +72,7 @@ g10/tdbdump.c
g10/tdbio.c
g10/textfilter.c
g10/trustdb.c
+g10/trust.c
g10/verify.c
kbx/kbxutil.c
diff --git a/po/de.po b/po/de.po
index 368fce9..a2bba9e 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: 2015-08-11 13:52+0200\n"
+"PO-Revision-Date: 2015-08-20 16:27+0200\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
"Language: de\n"
@@ -4704,7 +4704,7 @@ msgid "Your decision? "
msgstr "Ihre Auswahl? "
msgid "Do you really want to set this key to ultimate trust? (y/N) "
-msgstr "Wollen Sie diesem Schlüssel wirklich uneingeschränkt vertrauen? (j/N) "
+msgstr "Wollen Sie diesem Schlüssel wirklich ultimativ vertrauen? (j/N) "
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "Zertifikate führen zu einem letztlich vertrauenswürdigen Schlüssel:\n"
@@ -5331,7 +5331,7 @@ msgstr ""
#, c-format
msgid "key %s marked as ultimately trusted\n"
-msgstr "Schlüssel %s ist als uneingeschränkt vertrauenswürdig gekennzeichnet\n"
+msgstr "Schlüssel %s ist als ultimativ vertrauenswürdig gekennzeichnet\n"
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
@@ -5390,12 +5390,11 @@ msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "%d Schlüssel verarbeitet (%d Validity Zähler gelöscht)\n"
msgid "no ultimately trusted keys found\n"
-msgstr "keine uneingeschränkt vertrauenswürdigen Schlüssel gefunden\n"
+msgstr "keine ultimativ vertrauenswürdigen Schlüssel gefunden\n"
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
-msgstr ""
-"öff. Schlüssel des uneingeschränkt vertrautem Schlüssel %s nicht gefunden\n"
+msgstr "öff. Schlüssel des ultimativ vertrautem Schlüssel %s nicht gefunden\n"
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
@@ -5414,6 +5413,53 @@ msgstr ""
"\"Trust-DB\"-Versions-Satz kann nicht geändert werden: Schreiben "
"fehlgeschlagen: %s\n"
+msgid "undefined"
+msgstr "unbestimmt"
+
+msgid "never"
+msgstr "niemals"
+
+msgid "marginal"
+msgstr "marginal"
+
+msgid "full"
+msgstr "vollständig"
+
+msgid "ultimate"
+msgstr "ultimativ"
+
+#. 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 trust.c:uid_trust_string_fixed"
+msgstr "13"
+
+msgid "[ revoked]"
+msgstr "[ widerrufen]"
+
+msgid "[ expired]"
+msgstr "[ verfallen]"
+
+msgid "[ unknown]"
+msgstr "[ unbekannt]"
+
+msgid "[ undef ]"
+msgstr "[undefiniert]"
+
+msgid "[marginal]"
+msgstr "[ marginal]"
+
+msgid "[ full ]"
+msgstr "[vollständig]"
+
+msgid "[ultimate]"
+msgstr "[ ultimativ]"
+
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@ -8222,45 +8268,6 @@ msgstr ""
#~ msgid "deleting secret key not implemented\n"
#~ msgstr "Löschen des geheimen Schlüssel ist nicht implementiert\n"
-#~ msgid "10 translator see trustdb.c:uid_trust_string_fixed"
-#~ msgstr "10"
-
-#~ msgid "[ revoked]"
-#~ msgstr "[widerrufen]"
-
-#~ msgid "[ expired]"
-#~ msgstr "[verfall.]"
-
-#~ msgid "[ unknown]"
-#~ msgstr "[ unbek.]"
-
-#~ msgid "[ undef ]"
-#~ msgstr "[ undef.]"
-
-#~ msgid "[marginal]"
-#~ msgstr "[marginal]"
-
-#~ msgid "[ full ]"
-#~ msgstr "[ vollst.]"
-
-#~ msgid "[ultimate]"
-#~ msgstr "[ uneing.]"
-
-#~ msgid "undefined"
-#~ msgstr "unbestimmt"
-
-#~ msgid "never"
-#~ msgstr "niemals"
-
-#~ msgid "marginal"
-#~ msgstr "marginal"
-
-#~ msgid "full"
-#~ msgstr "vollständig"
-
-#~ msgid "ultimate"
-#~ msgstr "uneingeschränkt"
-
#~ msgid "usage: gpgconf [options] "
#~ msgstr "Aufruf: gpgconf [Optionen] "
@@ -8645,10 +8652,9 @@ msgstr ""
#~ "ultimately trusted\n"
#~ msgstr ""
#~ "Um das Web-of-Trust aufzubauen muß GnuPG wissen, welchen Schlüsseln\n"
-#~ "uneingeschränkt vertraut wird. Das sind üblicherweise die Schlüssel\n"
+#~ "ultimativ vertraut wird. Das sind üblicherweise die Schlüssel\n"
#~ "auf deren geheimen Schlüssel Sie Zugruff haben.\n"
-#~ "Antworten Sie mit \"yes\" um diesen Schlüssel uneingeschränkt zu "
-#~ "vertrauen\n"
+#~ "Antworten Sie mit \"yes\" um diesen Schlüssel ultimativ zu vertrauen\n"
#~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
#~ msgstr ""
-----------------------------------------------------------------------
Summary of changes:
common/t-iobuf.c | 18 +++++-----
doc/HACKING | 32 ++++++++++++++---
doc/help.de.txt | 14 ++++----
po/POTFILES.in | 1 +
po/de.po | 102 +++++++++++++++++++++++++++++--------------------------
5 files changed, 99 insertions(+), 68 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list