[git] GnuPG - branch, master, updated. gnupg-2.1.8-1-ge41b657

Thu Sep 10 21:09:25 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  e41b6579f7e9a3a42b9cc080a21446ff160a347e (commit)
       via  311816f6cf9d411dba060603e3c5d01c72824645 (commit)
       via  7a0c3cc760367024305d23e2124ea4cbc7e802df (commit)
       via  e92a8ab021672b19e5cd397fa555fcc8a3401e8b (commit)
       via  fbf24cd09abcdc3dec21db4114ab2db99ce21e4c (commit)
       via  cafcd4336a0a220d4ce8acddfc4d60d0972058bd (commit)
       via  e086364f3325759e471a594f1cd62d8d957b3743 (commit)
       via  19545e3a2d2990cba6d62f98cdb1f665b38ba4f1 (commit)
       via  56bf1061f86326b814e878f925cbf144e837fd66 (commit)
      from  f10b427d0e2be333776fee2df8150145da36e587 (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 e41b6579f7e9a3a42b9cc080a21446ff160a347e
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Sep 10 21:05:27 2015 +0200

    Post release updates.
    
    --

diff --git a/NEWS b/NEWS
index e444f38..16cbfbe 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 2.1.9 (unreleased)
+------------------------------------------------
+
+
 Noteworthy changes in version 2.1.8 (2015-09-10)
 ------------------------------------------------
 
diff --git a/configure.ac b/configure.ac
index 680d0b7..27fc9a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ min_automake_version="1.14"
 m4_define([mym4_package],[gnupg])
 m4_define([mym4_major], [2])
 m4_define([mym4_minor], [1])
-m4_define([mym4_micro], [8])
+m4_define([mym4_micro], [9])
 
 # To start a new development series, i.e a new major or minor number
 # you need to mark an arbitrary commit before the first beta release

commit 311816f6cf9d411dba060603e3c5d01c72824645
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Sep 10 16:40:37 2015 +0200

    Release 2.1.8.

diff --git a/NEWS b/NEWS
index 6a00c0e..e444f38 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,29 @@
-Noteworthy changes in version 2.1.8 (unreleased)
+Noteworthy changes in version 2.1.8 (2015-09-10)
 ------------------------------------------------
 
+ * gpg: Sending very large keys to the keyservers works again.
+
+ * gpg: Validity strings in key listings are now again translatable.
+
+ * gpg: Emit FAILURE status lines to help GPGME.
+
+ * gpg: Does not anymore link to Libksba to reduce dependencies.
+
+ * gpgsm: Export of secret keys via Assuan is now possible.
+
+ * agent: Raise the maximum passphrase length from 100 to 255 bytes.
+
+ * agent: Fix regression using EdDSA keys with ssh.
+
+ * Does not anymore use a build timestamp by default.
+
+ * The fallback encoding for broken locale settings changed
+   from Latin-1 to UTF-8.
+
+ * Many code cleanups and improved internal documentation.
+
+ * Various minor bug fixes.
+
 
 Noteworthy changes in version 2.1.7 (2015-08-11)
 ------------------------------------------------

commit 7a0c3cc760367024305d23e2124ea4cbc7e802df
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Sep 10 18:07:20 2015 +0200

    tests: Silence the 5gb-packet test.
    
    * tests/openpgp/4gb-packet.test: Send output to /dev/null.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/tests/openpgp/4gb-packet.test b/tests/openpgp/4gb-packet.test
index f8e43c8..57b8fc7 100755
--- a/tests/openpgp/4gb-packet.test
+++ b/tests/openpgp/4gb-packet.test
@@ -6,7 +6,7 @@
 # 2^32-1 as invalid and exit with status code 2.
 i=$srcdir/4gb-packet.asc
 
-if ! $GPG --list-packets $i
+if ! $GPG --list-packets $i >/dev/null
 then
   echo Failed to parse 4GB packet.
   exit 1

commit e92a8ab021672b19e5cd397fa555fcc8a3401e8b
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Sep 10 18:11:58 2015 +0200

    g10: Fix make distcheck problem.
    
    * g10/test.c: Include string.h.
    (prepend_srcdir): New.  Taken from Libgcrypt.
    (test_free): New.
    * g10/t-keydb.c (do_test): Malloc the filename.
    * g10/Makefile.am (AM_CPPFLAGS): Remove -DSOURCE_DIR
    (EXTRA_DIST): Add t-keydb-keyring.kbx.
    --
    
    Using SOURCE_DIR should in general work but we have seen problems when
    doing this in Libgcrypt.  Using the srcdir variable gives us anyway
    more flexibility and aligns with the way we do it in tests/openpgp.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/Makefile.am b/g10/Makefile.am
index 421870c..2fd52b3 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -19,9 +19,9 @@
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST = options.skel distsigkey.gpg ChangeLog-2011 gpg-w32info.rc \
-	     gpg.w32-manifest.in test.c
+	     gpg.w32-manifest.in test.c t-keydb-keyring.kbx
 
-AM_CPPFLAGS = -I$(top_srcdir)/common -DSOURCE_DIR="\"$(srcdir)\""
+AM_CPPFLAGS = -I$(top_srcdir)/common
 
 include $(top_srcdir)/am/cmacros.am
 
diff --git a/g10/t-keydb.c b/g10/t-keydb.c
index 634cb05..17a7611 100644
--- a/g10/t-keydb.c
+++ b/g10/t-keydb.c
@@ -30,11 +30,14 @@ do_test (int argc, char *argv[])
   KBNODE kb1, kb2;
   char *uid1;
   char *uid2;
+  char *fname;
 
   (void) argc;
   (void) argv;
 
-  rc = keydb_add_resource (SOURCE_DIR "/t-keydb-keyring.kbx", 0);
+  fname = prepend_srcdir ("t-keydb-keyring.kbx");
+  rc = keydb_add_resource (fname, 0);
+  test_free (fname);
   if (rc)
     ABORT ("Failed to open keyring.");
 
diff --git a/g10/test.c b/g10/test.c
index e9e6b23..59a015c 100644
--- a/g10/test.c
+++ b/g10/test.c
@@ -20,6 +20,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "gpg.h"
 
@@ -138,6 +139,35 @@ exit_tests (int force)
     }
 }
 
+
+/* Prepend FNAME with the srcdir environment variable's value and
+   return a malloced filename.  Caller must release the returned
+   string using test_free.  */
+char *
+prepend_srcdir (const char *fname)
+{
+  static const char *srcdir;
+  char *result;
+
+  if (!srcdir && !(srcdir = getenv ("srcdir")))
+    srcdir = ".";
+
+  result = malloc (strlen (srcdir) + 1 + strlen (fname) + 1);
+  strcpy (result, srcdir);
+  strcat (result, "/");
+  strcat (result, fname);
+  return result;
+}
+
+
+void
+test_free (void *a)
+{
+  if (a)
+    free (a);
+}
+
+
 int
 main (int argc, char *argv[])
 {

commit fbf24cd09abcdc3dec21db4114ab2db99ce21e4c
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Sep 10 17:43:13 2015 +0200

    g10: Improve portability of the new test driver.
    
    * g10/test.c: Include stdio.h and stdlib.h.
    (verbose): New.
    (print_results): Rename to exit_tests.
    (main): Remove atexit and call exit_tests.  Set verbose.
    (ASSERT, ABORT): Call exit_tests instead of exit.
    --
    
    Calling exit from an exit handler is undefined behaviour.  It works on
    Linux but other systems will hit an endless loop.  That is indeed
    unfortunate but we can't do anything about it.  Calling _exit() would
    be possible but that may lead to other problems.  Thus we change to
    call a custom exit function :-(.
    
    Using "make check verbose=1" is supported by tests/openpgp and thus
    we add the same mechanism here.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/t-keydb.c b/g10/t-keydb.c
index 0f17643..634cb05 100644
--- a/g10/t-keydb.c
+++ b/g10/t-keydb.c
@@ -80,8 +80,11 @@ do_test (int argc, char *argv[])
     ABORT ("1E42B367 has no user id packet");
   uid2 = kb2->pkt->pkt.user_id->name;
 
-  printf ("user id for DBFC6AD9: %s\n", uid1);
-  printf ("user id for 1E42B367: %s\n", uid2);
+  if (verbose)
+    {
+      printf ("user id for DBFC6AD9: %s\n", uid1);
+      printf ("user id for 1E42B367: %s\n", uid2);
+    }
 
   TEST_P ("cache consistency", strcmp (uid1, uid2) != 0);
 }
diff --git a/g10/test.c b/g10/test.c
index 6910f95..e9e6b23 100644
--- a/g10/test.c
+++ b/g10/test.c
@@ -18,6 +18,9 @@
  */
 
 #include <config.h>
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "gpg.h"
 
 /* A unit test consists of one or more tests.  Tests can be broken
@@ -38,6 +41,10 @@ static int tests;
 /* The total number of tests that failed.  */
 static int tests_failed;
 
+/* Flag to request verbose diagnostics.  This is set if the envvar
+   "verbose" exists and is not the empty string.  */
+static int verbose;
+
 #define TEST_GROUP(description)	     \
   do {				     \
     test_group = (description);	     \
@@ -92,7 +99,7 @@ static int tests_failed;
     int tests_failed_pre = tests_failed;		\
     CHECK(description, test, expected);			\
     if (tests_failed_pre != tests_failed)		\
-      exit (1);						\
+      exit_tests (1);					\
   } while (0)
 
 /* Call this if something went wrong.  */
@@ -102,19 +109,22 @@ static int tests_failed;
     if (message)				\
       printf (" %s\n", (message));		\
 						\
-    exit(1);					\
+    exit_tests (1);				\
   } while (0)
 
 /* You need to fill this function in.  */
 static void do_test (int argc, char *argv[]);
 
+
+/* Print stats and call the real exit.  If FORCE is set use
+   EXIT_FAILURE even if no test has failed.  */
 static void
-print_results (void)
+exit_tests (int force)
 {
   if (tests_failed == 0)
     {
       printf ("All %d tests passed.\n", tests);
-      exit (0);
+      exit (!!force);
     }
   else
     {
@@ -124,7 +134,6 @@ print_results (void)
 	printf (" (%d of %d groups)",
 		test_groups_failed, test_groups);
       printf ("\n");
-
       exit (1);
     }
 }
@@ -132,10 +141,16 @@ print_results (void)
 int
 main (int argc, char *argv[])
 {
+  const char *s;
+
   (void) test_group;
 
+  s = getenv ("verbose");
+  if (s && *s)
+    verbose = 1;
+
   do_test (argc, argv);
-  atexit (print_results);
+  exit_tests (0);
 
-  return tests_failed == 0;
+  return !!tests_failed;
 }

commit cafcd4336a0a220d4ce8acddfc4d60d0972058bd
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Sep 10 16:22:49 2015 +0200

    po: Auto-update
    
    --

diff --git a/po/ca.po b/po/ca.po
index 1d0417a..65c392f 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -5753,6 +5753,57 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registre de confianÃ§a %lu, tipus %d: no s'ha pogut escriure: %s\n"
 
+msgid "undefined"
+msgstr ""
+
+#, fuzzy
+msgid "never"
+msgstr "mai       "
+
+msgid "marginal"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
+msgid "ultimate"
+msgstr ""
+
+#. 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 ""
+
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[revocada]"
+
+#, fuzzy
+msgid "[ expired]"
+msgstr "[caducada]"
+
+#, fuzzy
+msgid "[ unknown]"
+msgstr "desconeguda"
+
+msgid "[  undef ]"
+msgstr ""
+
+msgid "[marginal]"
+msgstr ""
+
+msgid "[  full  ]"
+msgstr ""
+
+msgid "[ultimate]"
+msgstr ""
+
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -8837,22 +8888,6 @@ msgstr ""
 #~ "nomÃ©s podeu signar en clar amb claus d'estil PGP 2.x en el mode --pgp2\n"
 
 #, fuzzy
-#~ msgid "[ revoked]"
-#~ msgstr "[revocada]"
-
-#, fuzzy
-#~ msgid "[ expired]"
-#~ msgstr "[caducada]"
-
-#, fuzzy
-#~ msgid "[ unknown]"
-#~ msgstr "desconeguda"
-
-#, fuzzy
-#~ msgid "never"
-#~ msgstr "mai       "
-
-#, fuzzy
 #~ msgid "Usage: scdaemon [options] (-h for help)"
 #~ msgstr "Forma d'Ãºs: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
diff --git a/po/cs.po b/po/cs.po
index ff197ba..7c878e9 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5337,6 +5337,57 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "nelze aktualizovat zÃ¡znam v databÃ¡zi dÅ¯vÄ›ry: chyba pÅ™i zÃ¡pisu: %s\n"
 
+msgid "undefined"
+msgstr "nedefinovÃ¡na"
+
+msgid "never"
+msgstr "Å¾Ã¡dnÃ¡"
+
+msgid "marginal"
+msgstr "ÄÃ¡steÄnÃ¡"
+
+msgid "full"
+msgstr "plnÃ¡"
+
+msgid "ultimate"
+msgstr "absolutnÃ"
+
+#. 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.
+#, fuzzy
+#| msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgid "10 translator see trust.c:uid_trust_string_fixed"
+msgstr ""
+"14 fixnÃ dÃ©lka na kterou se pÅ™eklÃ¡dÃ¡ see trustdb.c:uid_trust_string_fixed"
+
+msgid "[ revoked]"
+msgstr "[ revokovÃ¡n  ]"
+
+# TODO: use context to distinguish gender
+msgid "[ expired]"
+msgstr "[ proÅ¡lÃ½(Ã¡)  ]"
+
+msgid "[ unknown]"
+msgstr "[  neznÃ¡mÃ¡   ]"
+
+msgid "[  undef ]"
+msgstr "[nedefinovanÃ¡]"
+
+msgid "[marginal]"
+msgstr "[  ÄÃ¡steÄnÃ¡  ]"
+
+msgid "[  full  ]"
+msgstr "[    plnÃ¡    ]"
+
+msgid "[ultimate]"
+msgstr "[  absolutnÃ ]"
+
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -8641,47 +8692,6 @@ msgstr ""
 #~ "v mÃ³du --pgp2 mÅ¯Å¾ete vytvÃ¡Å™et jen ÄitelnÃ© podpisy s klÃÄi formÃ¡tu PGP-2."
 #~ "x\n"
 
-#~ msgid "10 translator see trustdb.c:uid_trust_string_fixed"
-#~ msgstr ""
-#~ "14 fixnÃ dÃ©lka na kterou se pÅ™eklÃ¡dÃ¡ see trustdb.c:uid_trust_string_fixed"
-
-#~ msgid "[ revoked]"
-#~ msgstr "[ revokovÃ¡n  ]"
-
-# TODO: use context to distinguish gender
-#~ msgid "[ expired]"
-#~ msgstr "[ proÅ¡lÃ½(Ã¡)  ]"
-
-#~ msgid "[ unknown]"
-#~ msgstr "[  neznÃ¡mÃ¡   ]"
-
-#~ msgid "[  undef ]"
-#~ msgstr "[nedefinovanÃ¡]"
-
-#~ msgid "[marginal]"
-#~ msgstr "[  ÄÃ¡steÄnÃ¡  ]"
-
-#~ msgid "[  full  ]"
-#~ msgstr "[    plnÃ¡    ]"
-
-#~ msgid "[ultimate]"
-#~ msgstr "[  absolutnÃ ]"
-
-#~ msgid "undefined"
-#~ msgstr "nedefinovÃ¡na"
-
-#~ msgid "never"
-#~ msgstr "Å¾Ã¡dnÃ¡"
-
-#~ msgid "marginal"
-#~ msgstr "ÄÃ¡steÄnÃ¡"
-
-#~ msgid "full"
-#~ msgstr "plnÃ¡"
-
-#~ msgid "ultimate"
-#~ msgstr "absolutnÃ"
-
 #~ msgid " - probably dead - removing lock"
 #~ msgstr "Â â€“ asi mrtvÃ½Â â€“ odstraÅˆuji zÃ¡mek"
 
diff --git a/po/da.po b/po/da.po
index 01700f0..742c0ed 100644
--- a/po/da.po
+++ b/po/da.po
@@ -5587,6 +5587,55 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "kan ikke opdatere trustdb-versionspost: skrivning mislykkedes: %s\n"
 
+msgid "undefined"
+msgstr "ej defineret"
+
+msgid "never"
+msgstr "aldrig"
+
+msgid "marginal"
+msgstr "marginal"
+
+msgid "full"
+msgstr "fuld"
+
+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.
+#, fuzzy
+#| msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgid "10 translator see trust.c:uid_trust_string_fixed"
+msgstr "10 oversÃ¦tter se trustdb.c:uid_trust_string_fixed"
+
+msgid "[ revoked]"
+msgstr "[   tilb.]"
+
+msgid "[ expired]"
+msgstr "[ udlÃ¸bet]"
+
+msgid "[ unknown]"
+msgstr "[  ukendt]"
+
+msgid "[  undef ]"
+msgstr "[  ej def]"
+
+msgid "[marginal]"
+msgstr "[marginal]"
+
+msgid "[  full  ]"
+msgstr "[  fuld  ]"
+
+msgid "[ultimate]"
+msgstr "[ ultim. ]"
+
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -8813,45 +8862,6 @@ msgstr ""
 #~ "du kan kun clearsign med nÃ¸gler i PGP 2.x-stil mens du er i tilstanden --"
 #~ "pgp2\n"
 
-#~ msgid "10 translator see trustdb.c:uid_trust_string_fixed"
-#~ msgstr "10 oversÃ¦tter se trustdb.c:uid_trust_string_fixed"
-
-#~ msgid "[ revoked]"
-#~ msgstr "[   tilb.]"
-
-#~ msgid "[ expired]"
-#~ msgstr "[ udlÃ¸bet]"
-
-#~ msgid "[ unknown]"
-#~ msgstr "[  ukendt]"
-
-#~ msgid "[  undef ]"
-#~ msgstr "[  ej def]"
-
-#~ msgid "[marginal]"
-#~ msgstr "[marginal]"
-
-#~ msgid "[  full  ]"
-#~ msgstr "[  fuld  ]"
-
-#~ msgid "[ultimate]"
-#~ msgstr "[ ultim. ]"
-
-#~ msgid "undefined"
-#~ msgstr "ej defineret"
-
-#~ msgid "never"
-#~ msgstr "aldrig"
-
-#~ msgid "marginal"
-#~ msgstr "marginal"
-
-#~ msgid "full"
-#~ msgstr "fuld"
-
-#~ msgid "ultimate"
-#~ msgstr "ultimativ"
-
 #~ msgid " - probably dead - removing lock"
 #~ msgstr " - sikkert dÃ¸d - fjerner lÃ¥s"
 
diff --git a/po/el.po b/po/el.po
index 9cbcf5f..fe4605c 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5617,6 +5617,57 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "åããñáöÞ trust %lu, ôýðïò %d: write áðÝôõ÷å: %s\n"
 
+msgid "undefined"
+msgstr ""
+
+#, fuzzy
+msgid "never"
+msgstr "ðïôÝ     "
+
+msgid "marginal"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
+msgid "ultimate"
+msgstr ""
+
+#. 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 ""
+
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[áíáêëçìÝíï]"
+
+#, fuzzy
+msgid "[ expired]"
+msgstr "[ëçãìÝíï]"
+
+#, fuzzy
+msgid "[ unknown]"
+msgstr "Üãíùóôï"
+
+msgid "[  undef ]"
+msgstr ""
+
+msgid "[marginal]"
+msgstr ""
+
+msgid "[  full  ]"
+msgstr ""
+
+msgid "[ultimate]"
+msgstr ""
+
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -8654,22 +8705,6 @@ msgstr ""
 #~ "pgp2\n"
 
 #, fuzzy
-#~ msgid "[ revoked]"
-#~ msgstr "[áíáêëçìÝíï]"
-
-#, fuzzy
-#~ msgid "[ expired]"
-#~ msgstr "[ëçãìÝíï]"
-
-#, fuzzy
-#~ msgid "[ unknown]"
-#~ msgstr "Üãíùóôï"
-
-#, fuzzy
-#~ msgid "never"
-#~ msgstr "ðïôÝ     "
-
-#, fuzzy
 #~ msgid "Usage: scdaemon [options] (-h for help)"
 #~ msgstr "×ñÞóç: gpg [åðéëïãÝò] [áñ÷åßá] (-h ãéá âïÞèåéá)"
 
diff --git a/po/eo.po b/po/eo.po
index 062b2f0..5a90921 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5569,6 +5569,56 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
 
+msgid "undefined"
+msgstr ""
+
+msgid "never"
+msgstr ""
+
+msgid "marginal"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
+msgid "ultimate"
+msgstr ""
+
+#. 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 ""
+
+#, fuzzy
+msgid "[ revoked]"
+msgstr "rev"
+
+#, fuzzy
+msgid "[ expired]"
+msgstr "eksval"
+
+#, fuzzy
+msgid "[ unknown]"
+msgstr "nekonata versio"
+
+msgid "[  undef ]"
+msgstr ""
+
+msgid "[marginal]"
+msgstr ""
+
+msgid "[  full  ]"
+msgstr ""
+
+msgid "[ultimate]"
+msgstr ""
+
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -8572,18 +8622,6 @@ msgstr ""
 #~ "eblas klartekste subskribi nur per PGP-2.x-stilaj þlosiloj kun --pgp2\n"
 
 #, fuzzy
-#~ msgid "[ revoked]"
-#~ msgstr "rev"
-
-#, fuzzy
-#~ msgid "[ expired]"
-#~ msgstr "eksval"
-
-#, fuzzy
-#~ msgid "[ unknown]"
-#~ msgstr "nekonata versio"
-
-#, fuzzy
 #~ msgid "Usage: scdaemon [options] (-h for help)"
 #~ msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
diff --git a/po/es.po b/po/es.po
index 40ebb72..062394b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5590,6 +5590,55 @@ msgstr ""
 "no se puede actualizar el registro de la versión de la base de datos\n"
 "de confianza: fallo de escritura: %s\n"
 
+msgid "undefined"
+msgstr "no definido"
+
+msgid "never"
+msgstr "nunca"
+
+msgid "marginal"
+msgstr "dudosa"
+
+msgid "full"
+msgstr "total"
+
+msgid "ultimate"
+msgstr "absoluta"
+
+#. 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.
+#, fuzzy
+#| msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgid "10 translator see trust.c:uid_trust_string_fixed"
+msgstr "13 no apto para supersticiosos"
+
+msgid "[ revoked]"
+msgstr "[  revocada ]"
+
+msgid "[ expired]"
+msgstr "[  caducada ]"
+
+msgid "[ unknown]"
+msgstr "[desconocida]"
+
+msgid "[  undef ]"
+msgstr "[no definida]"
+
+msgid "[marginal]"
+msgstr "[   dudosa  ]"
+
+msgid "[  full  ]"
+msgstr "[   total   ]"
+
+msgid "[ultimate]"
+msgstr "[  absoluta ]"
+
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -8873,45 +8922,6 @@ msgstr ""
 #~ msgstr ""
 #~ "sólo puede firmar en claro con claves PGP 2.x estando en modo --pgp2\n"
 
-#~ msgid "10 translator see trustdb.c:uid_trust_string_fixed"
-#~ msgstr "13 no apto para supersticiosos"
-
-#~ msgid "[ revoked]"
-#~ msgstr "[  revocada ]"
-
-#~ msgid "[ expired]"
-#~ msgstr "[  caducada ]"
-
-#~ msgid "[ unknown]"
-#~ msgstr "[desconocida]"
-
-#~ msgid "[  undef ]"
-#~ msgstr "[no definida]"
-
-#~ msgid "[marginal]"
-#~ msgstr "[   dudosa  ]"
-
-#~ msgid "[  full  ]"
-#~ msgstr "[   total   ]"
-
-#~ msgid "[ultimate]"
-#~ msgstr "[  absoluta ]"
-
-#~ msgid "undefined"
-#~ msgstr "no definido"
-
-#~ msgid "never"
-#~ msgstr "nunca"
-
-#~ msgid "marginal"
-#~ msgstr "dudosa"
-
-#~ msgid "full"
-#~ msgstr "total"
-
-#~ msgid "ultimate"
-#~ msgstr "absoluta"
-
 #~ msgid " - probably dead - removing lock"
 #~ msgstr " - probablemente muerto - suprimiendo el bloqueo"
 
diff --git a/po/et.po b/po/et.po
index 5ec88c9..e78e98a 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5546,6 +5546,57 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "usalduse kirje %lu, tüüp %d: kirjutamine ebaõnnestus: %s\n"
 
+msgid "undefined"
+msgstr ""
+
+#, fuzzy
+msgid "never"
+msgstr "mitte kunagi"
+
+msgid "marginal"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
+msgid "ultimate"
+msgstr ""
+
+#. 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 ""
+
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[tühistatud] "
+
+#, fuzzy
+msgid "[ expired]"
+msgstr "[aegunud] "
+
+#, fuzzy
+msgid "[ unknown]"
+msgstr "tundmatu"
+
+msgid "[  undef ]"
+msgstr ""
+
+msgid "[marginal]"
+msgstr ""
+
+msgid "[  full  ]"
+msgstr ""
+
+msgid "[ultimate]"
+msgstr ""
+
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -8564,22 +8615,6 @@ msgstr ""
 #~ "moodis\n"
 
 #, fuzzy
-#~ msgid "[ revoked]"
-#~ msgstr "[tühistatud] "
-
-#, fuzzy
-#~ msgid "[ expired]"
-#~ msgstr "[aegunud] "
-
-#, fuzzy
-#~ msgid "[ unknown]"
-#~ msgstr "tundmatu"
-
-#, fuzzy
-#~ msgid "never"
-#~ msgstr "mitte kunagi"
-
-#, fuzzy
 #~ msgid "Usage: scdaemon [options] (-h for help)"
 #~ msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
diff --git a/po/fi.po b/po/fi.po
index 14f4f16..a921e0b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5601,6 +5601,57 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epÃ¤onnistui: %s\n"
 
+msgid "undefined"
+msgstr ""
+
+#, fuzzy
+msgid "never"
+msgstr "ei koskaan"
+
+msgid "marginal"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
+msgid "ultimate"
+msgstr ""
+
+#. 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 ""
+
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[mitÃ¤tÃ¶ity] "
+
+#, fuzzy
+msgid "[ expired]"
+msgstr "[vanhentunut] "
+
+#, fuzzy
+msgid "[ unknown]"
+msgstr "tuntematon "
+
+msgid "[  undef ]"
+msgstr ""
+
+msgid "[marginal]"
+msgstr ""
+
+msgid "[  full  ]"
+msgstr ""
+
+msgid "[ultimate]"
+msgstr ""
+
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -8632,22 +8683,6 @@ msgstr ""
 #~ "vain --pgp2-tilassa\n"
 
 #, fuzzy
-#~ msgid "[ revoked]"
-#~ msgstr "[mitÃ¤tÃ¶ity] "
-
-#, fuzzy
-#~ msgid "[ expired]"
-#~ msgstr "[vanhentunut] "
-
-#, fuzzy
-#~ msgid "[ unknown]"
-#~ msgstr "tuntematon "
-
-#, fuzzy
-#~ msgid "never"
-#~ msgstr "ei koskaan"
-
-#, fuzzy
 #~ msgid "Usage: scdaemon [options] (-h for help)"
 #~ msgstr "KÃ¤yttÃ¶: gpg [valitsimet] [tiedostot] (-h nÃ¤yttÃ¤Ã¤ ohjeen)"
 
diff --git a/po/fr.po b/po/fr.po
index aed3bb7..67aa7db 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: 2014-11-01 19:04-0400\n"
+"PO-Revision-Date: 2015-09-10 16:22+0200\n"
 "Last-Translator: David PrÃ©vot <david at tilapin.org>\n"
 "Language-Team: French <traduc at traduc.org>\n"
 "Language: fr\n"
@@ -5464,6 +5464,53 @@ msgstr ""
 "impossible de mettre Ã  jour l'enregistrement de version de la\n"
 "base de confianceÂ : Ã©chec d'Ã©critureÂ : %s\n"
 
+msgid "undefined"
+msgstr "indÃ©finie"
+
+msgid "never"
+msgstr "jamais"
+
+msgid "marginal"
+msgstr "marginale"
+
+msgid "full"
+msgstr "totale"
+
+msgid "ultimate"
+msgstr "ultime"
+
+#. 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 "11 le traducteur a bien lu ce qu'il fallait :)"
+
+msgid "[ revoked]"
+msgstr "[ rÃ©voquÃ©e]"
+
+msgid "[ expired]"
+msgstr "[ expirÃ©e ]"
+
+msgid "[ unknown]"
+msgstr "[ inconnue]"
+
+msgid "[  undef ]"
+msgstr "[indÃ©finie]"
+
+msgid "[marginal]"
+msgstr "[marginale]"
+
+msgid "[  full  ]"
+msgstr "[  totale ]"
+
+msgid "[ultimate]"
+msgstr "[  ultime ]"
+
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -8371,45 +8418,6 @@ msgstr ""
 #~ msgid "deleting secret key not implemented\n"
 #~ msgstr "la suppression de clef secrÃ¨te n'est pas implÃ©mentÃ©e\n"
 
-#~ msgid "10 translator see trustdb.c:uid_trust_string_fixed"
-#~ msgstr "11 le traducteur a bien lu ce qu'il fallait :)"
-
-#~ msgid "[ revoked]"
-#~ msgstr "[ rÃ©voquÃ©e]"
-
-#~ msgid "[ expired]"
-#~ msgstr "[ expirÃ©e ]"
-
-#~ msgid "[ unknown]"
-#~ msgstr "[ inconnue]"
-
-#~ msgid "[  undef ]"
-#~ msgstr "[indÃ©finie]"
-
-#~ msgid "[marginal]"
-#~ msgstr "[marginale]"
-
-#~ msgid "[  full  ]"
-#~ msgstr "[  totale ]"
-
-#~ msgid "[ultimate]"
-#~ msgstr "[  ultime ]"
-
-#~ msgid "undefined"
-#~ msgstr "indÃ©finie"
-
-#~ msgid "never"
-#~ msgstr "jamais"
-
-#~ msgid "marginal"
-#~ msgstr "marginale"
-
-#~ msgid "full"
-#~ msgstr "totale"
-
-#~ msgid "ultimate"
-#~ msgstr "ultime"
-
 #~ msgid "Usage: scdaemon [options] (-h for help)"
 #~ msgstr "UtilisationÂ : scdaemon [options] (-h pour l'aide)"
 
diff --git a/po/gl.po b/po/gl.po
index ee50059..028fb92 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5606,6 +5606,57 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
 
+msgid "undefined"
+msgstr ""
+
+#, fuzzy
+msgid "never"
+msgstr "nunca     "
+
+msgid "marginal"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
+msgid "ultimate"
+msgstr ""
+
+#. 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 ""
+
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[revocada] "
+
+#, fuzzy
+msgid "[ expired]"
+msgstr "[caducada ]"
+
+#, fuzzy
+msgid "[ unknown]"
+msgstr "descoñecido"
+
+msgid "[  undef ]"
+msgstr ""
+
+msgid "[marginal]"
+msgstr ""
+
+msgid "[  full  ]"
+msgstr ""
+
+msgid "[ultimate]"
+msgstr ""
+
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -8656,22 +8707,6 @@ msgstr ""
 #~ msgstr "só pode asinar en claro con chaves estilo PGP 2.x no modo --pgp2\n"
 
 #, fuzzy
-#~ msgid "[ revoked]"
-#~ msgstr "[revocada] "
-
-#, fuzzy
-#~ msgid "[ expired]"
-#~ msgstr "[caducada ]"
-
-#, fuzzy
-#~ msgid "[ unknown]"
-#~ msgstr "descoñecido"
-
-#, fuzzy
-#~ msgid "never"
-#~ msgstr "nunca     "
-
-#, fuzzy
 #~ msgid "Usage: scdaemon [options] (-h for help)"
 #~ msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
diff --git a/po/hu.po b/po/hu.po
index df78cee..5bd41aa 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5577,6 +5577,57 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "%lu bizalmi rekord, %d típus: írás sikertelen: %s.\n"
 
+msgid "undefined"
+msgstr ""
+
+#, fuzzy
+msgid "never"
+msgstr "soha      "
+
+msgid "marginal"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
+msgid "ultimate"
+msgstr ""
+
+#. 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 ""
+
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[visszavont] "
+
+#, fuzzy
+msgid "[ expired]"
+msgstr "[lejárt]     "
+
+#, fuzzy
+msgid "[ unknown]"
+msgstr "Ismeretlen módú"
+
+msgid "[  undef ]"
+msgstr ""
+
+msgid "[marginal]"
+msgstr ""
+
+msgid "[  full  ]"
+msgstr ""
+
+msgid "[ultimate]"
+msgstr ""
+
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -8606,22 +8657,6 @@ msgstr ""
 #~ "alá!\n"
 
 #, fuzzy
-#~ msgid "[ revoked]"
-#~ msgstr "[visszavont] "
-
-#, fuzzy
-#~ msgid "[ expired]"
-#~ msgstr "[lejárt]     "
-
-#, fuzzy
-#~ msgid "[ unknown]"
-#~ msgstr "Ismeretlen módú"
-
-#, fuzzy
-#~ msgid "never"
-#~ msgstr "soha      "
-
-#, fuzzy
 #~ msgid "Usage: scdaemon [options] (-h for help)"
 #~ msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
 
diff --git a/po/id.po b/po/id.po
index 8cffa15..2338293 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5566,6 +5566,57 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
 
+msgid "undefined"
+msgstr ""
+
+#, fuzzy
+msgid "never"
+msgstr "tidak pernah..."
+
+msgid "marginal"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
+msgid "ultimate"
+msgstr ""
+
+#. 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 ""
+
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[revoked] "
+
+#, fuzzy
+msgid "[ expired]"
+msgstr "[expired] "
+
+#, fuzzy
+msgid "[ unknown]"
+msgstr "tidak dikenal"
+
+msgid "[  undef ]"
+msgstr ""
+
+msgid "[marginal]"
+msgstr ""
+
+msgid "[  full  ]"
+msgstr ""
+
+msgid "[ultimate]"
+msgstr ""
+
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -8598,22 +8649,6 @@ msgstr ""
 #~ "pgp2\n"
 
 #, fuzzy
-#~ msgid "[ revoked]"
-#~ msgstr "[revoked] "
-
-#, fuzzy
-#~ msgid "[ expired]"
-#~ msgstr "[expired] "
-
-#, fuzzy
-#~ msgid "[ unknown]"
-#~ msgstr "tidak dikenal"
-
-#, fuzzy
-#~ msgid "never"
-#~ msgstr "tidak pernah..."
-
-#, fuzzy
 #~ msgid "Usage: scdaemon [options] (-h for help)"
 #~ msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
diff --git a/po/it.po b/po/it.po
index 0486c6c..83ffc90 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5605,6 +5605,57 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, req type %d: write fallita: %s\n"
 
+msgid "undefined"
+msgstr ""
+
+#, fuzzy
+msgid "never"
+msgstr "mai       "
+
+msgid "marginal"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
+msgid "ultimate"
+msgstr ""
+
+#. 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 ""
+
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[revocata]"
+
+#, fuzzy
+msgid "[ expired]"
+msgstr "[scaduta]"
+
+#, fuzzy
+msgid "[ unknown]"
+msgstr "sconosciuto"
+
+msgid "[  undef ]"
+msgstr ""
+
+msgid "[marginal]"
+msgstr ""
+
+msgid "[  full  ]"
+msgstr ""
+
+msgid "[ultimate]"
+msgstr ""
+
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -8642,22 +8693,6 @@ msgstr ""
 #~ "x\n"
 
 #, fuzzy
-#~ msgid "[ revoked]"
-#~ msgstr "[revocata]"
-
-#, fuzzy
-#~ msgid "[ expired]"
-#~ msgstr "[scaduta]"
-
-#, fuzzy
-#~ msgid "[ unknown]"
-#~ msgstr "sconosciuto"
-
-#, fuzzy
-#~ msgid "never"
-#~ msgstr "mai       "
-
-#, fuzzy
 #~ msgid "Usage: scdaemon [options] (-h for help)"
 #~ msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
diff --git a/po/ja.po b/po/ja.po
index 51a9d74..e04c92c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5205,6 +5205,61 @@ msgstr ""
 "ä¿¡ç”¨ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ»ãƒ¬ã‚³ãƒ¼ãƒ‰ãŒæ›´æ–°ã§ãã¾ã›ã‚“: æ›¸ãè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—"
 "ãŸ: %s\n"
 
+msgid "undefined"
+msgstr ""
+
+#, fuzzy
+#| msgid "never     "
+msgid "never"
+msgstr "ç„¡æœŸé™    "
+
+msgid "marginal"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
+msgid "ultimate"
+msgstr ""
+
+#. 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 ""
+
+#, fuzzy
+#| msgid "revoked"
+msgid "[ revoked]"
+msgstr "å¤±åŠ¹"
+
+#, fuzzy
+#| msgid "expired"
+msgid "[ expired]"
+msgstr "æœŸé™åˆ‡ã‚Œ"
+
+#, fuzzy
+#| msgid "unknown"
+msgid "[ unknown]"
+msgstr "ä¸æ˜Žã®"
+
+msgid "[  undef ]"
+msgstr ""
+
+msgid "[marginal]"
+msgstr ""
+
+msgid "[  full  ]"
+msgstr ""
+
+msgid "[ultimate]"
+msgstr ""
+
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
diff --git a/po/nb.po b/po/nb.po
index c50c8d3..712d04e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -5431,6 +5431,53 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 
+msgid "undefined"
+msgstr ""
+
+msgid "never"
+msgstr ""
+
+msgid "marginal"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
+msgid "ultimate"
+msgstr ""
+
+#. 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 ""
+
+msgid "[ revoked]"
+msgstr "[ opphevet]"
+
+msgid "[ expired]"
+msgstr "[ utgått]"
+
+msgid "[ unknown]"
+msgstr "[ ukjent]"
+
+msgid "[  undef ]"
+msgstr "[ udef ]"
+
+msgid "[marginal]"
+msgstr ""
+
+msgid "[  full  ]"
+msgstr ""
+
+msgid "[ultimate]"
+msgstr ""
+
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -8338,18 +8385,6 @@ msgstr ""
 #~ msgid "Invalid passphrase; please try again"
 #~ msgstr "Ugyldig passfrase; vennligst prøv igjen"
 
-#~ msgid "[ revoked]"
-#~ msgstr "[ opphevet]"
-
-#~ msgid "[ expired]"
-#~ msgstr "[ utgått]"
-
-#~ msgid "[ unknown]"
-#~ msgstr "[ ukjent]"
-
-#~ msgid "[  undef ]"
-#~ msgstr "[ udef ]"
-
 #, fuzzy
 #~ msgid "Usage: scdaemon [options] (-h for help)"
 #~ msgstr "Bruksmåte: gpg [valg] [filer] (-h for hjelp)"
diff --git a/po/pl.po b/po/pl.po
index 4f5d4a8..5ed9386 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5611,6 +5611,55 @@ msgstr ""
 "nie mo¿na uaktualniæ rekordu wersji bazy zaufania: zapis nie powiód³ siê: "
 "%s\n"
 
+msgid "undefined"
+msgstr "nieokre¶lone"
+
+msgid "never"
+msgstr "nigdy"
+
+msgid "marginal"
+msgstr "marginalne"
+
+msgid "full"
+msgstr "pe³ne"
+
+msgid "ultimate"
+msgstr "absolutne"
+
+#. 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.
+#, fuzzy
+#| msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgid "10 translator see trust.c:uid_trust_string_fixed"
+msgstr "17"
+
+msgid "[ revoked]"
+msgstr "[  uniewa¿niony ]"
+
+msgid "[ expired]"
+msgstr "[przeterminowany]"
+
+msgid "[ unknown]"
+msgstr "[    nieznane   ]"
+
+msgid "[  undef ]"
+msgstr "[  nieokre¶lone ]"
+
+msgid "[marginal]"
+msgstr "[   marginalne  ]"
+
+msgid "[  full  ]"
+msgstr "[      pe³ne    ]"
+
+msgid "[ultimate]"
+msgstr "[    absolutne   ]"
+
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -8841,45 +8890,6 @@ msgstr ""
 #~ msgstr ""
 #~ "w trybie --pgp2 mo¿na podpisywaæ tylko za pomoc± kluczy z wersji 2.x\n"
 
-#~ msgid "10 translator see trustdb.c:uid_trust_string_fixed"
-#~ msgstr "17"
-
-#~ msgid "[ revoked]"
-#~ msgstr "[  uniewa¿niony ]"
-
-#~ msgid "[ expired]"
-#~ msgstr "[przeterminowany]"
-
-#~ msgid "[ unknown]"
-#~ msgstr "[    nieznane   ]"
-
-#~ msgid "[  undef ]"
-#~ msgstr "[  nieokre¶lone ]"
-
-#~ msgid "[marginal]"
-#~ msgstr "[   marginalne  ]"
-
-#~ msgid "[  full  ]"
-#~ msgstr "[      pe³ne    ]"
-
-#~ msgid "[ultimate]"
-#~ msgstr "[    absolutne   ]"
-
-#~ msgid "undefined"
-#~ msgstr "nieokre¶lone"
-
-#~ msgid "never"
-#~ msgstr "nigdy"
-
-#~ msgid "marginal"
-#~ msgstr "marginalne"
-
-#~ msgid "full"
-#~ msgstr "pe³ne"
-
-#~ msgid "ultimate"
-#~ msgstr "absolutne"
-
 #~ msgid " - probably dead - removing lock"
 #~ msgstr " - prawdopodobnie martwy - usuwanie blokady"
 
diff --git a/po/pt.po b/po/pt.po
index b9c0753..eefaea9 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5581,6 +5581,56 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registo de confiança %lu, tipo %d: escrita falhou: %s\n"
 
+msgid "undefined"
+msgstr ""
+
+msgid "never"
+msgstr ""
+
+msgid "marginal"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
+msgid "ultimate"
+msgstr ""
+
+#. 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 ""
+
+#, fuzzy
+msgid "[ revoked]"
+msgstr "revkey"
+
+#, fuzzy
+msgid "[ expired]"
+msgstr "expire"
+
+#, fuzzy
+msgid "[ unknown]"
+msgstr "versão desconhecida"
+
+msgid "[  undef ]"
+msgstr ""
+
+msgid "[marginal]"
+msgstr ""
+
+msgid "[  full  ]"
+msgstr ""
+
+msgid "[ultimate]"
+msgstr ""
+
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -8596,18 +8646,6 @@ msgstr ""
 #~ msgstr "só pode assinar à vista com chaves do tipo PGP 2.x no modo --pgp2\n"
 
 #, fuzzy
-#~ msgid "[ revoked]"
-#~ msgstr "revkey"
-
-#, fuzzy
-#~ msgid "[ expired]"
-#~ msgstr "expire"
-
-#, fuzzy
-#~ msgid "[ unknown]"
-#~ msgstr "versão desconhecida"
-
-#, fuzzy
 #~ msgid "Usage: scdaemon [options] (-h for help)"
 #~ msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
diff --git a/po/ro.po b/po/ro.po
index 3cd7f33..554f463 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5574,6 +5574,55 @@ msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "nu pot actualiza înregistrare versiunii trustdb: scrierea a eºuat: %s\n"
 
+msgid "undefined"
+msgstr "nedefinitã"
+
+msgid "never"
+msgstr "niciodatã"
+
+msgid "marginal"
+msgstr "marginal"
+
+msgid "full"
+msgstr "deplinã"
+
+msgid "ultimate"
+msgstr "supremã"
+
+#. 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.
+#, fuzzy
+#| msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgid "10 translator see trust.c:uid_trust_string_fixed"
+msgstr "10 traducãtor vezi trustdb.c:uid_trust_string_fixed"
+
+msgid "[ revoked]"
+msgstr "[revocatã]"
+
+msgid "[ expired]"
+msgstr "[expiratã] "
+
+msgid "[ unknown]"
+msgstr "[necunoscutã]"
+
+msgid "[  undef ]"
+msgstr "[  nedef ]"
+
+msgid "[marginal]"
+msgstr "[marginal]"
+
+msgid "[  full  ]"
+msgstr "[ deplinã]"
+
+msgid "[ultimate]"
+msgstr "[ supremã]"
+
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -8636,45 +8685,6 @@ msgstr ""
 #~ "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 #~ msgstr "puteþi semna-în-clar cu chei stil PGP 2.x în modul --pgp2\n"
 
-#~ msgid "10 translator see trustdb.c:uid_trust_string_fixed"
-#~ msgstr "10 traducãtor vezi trustdb.c:uid_trust_string_fixed"
-
-#~ msgid "[ revoked]"
-#~ msgstr "[revocatã]"
-
-#~ msgid "[ expired]"
-#~ msgstr "[expiratã] "
-
-#~ msgid "[ unknown]"
-#~ msgstr "[necunoscutã]"
-
-#~ msgid "[  undef ]"
-#~ msgstr "[  nedef ]"
-
-#~ msgid "[marginal]"
-#~ msgstr "[marginal]"
-
-#~ msgid "[  full  ]"
-#~ msgstr "[ deplinã]"
-
-#~ msgid "[ultimate]"
-#~ msgstr "[ supremã]"
-
-#~ msgid "undefined"
-#~ msgstr "nedefinitã"
-
-#~ msgid "never"
-#~ msgstr "niciodatã"
-
-#~ msgid "marginal"
-#~ msgstr "marginal"
-
-#~ msgid "full"
-#~ msgstr "deplinã"
-
-#~ msgid "ultimate"
-#~ msgstr "supremã"
-
 #, fuzzy
 #~ msgid "Usage: scdaemon [options] (-h for help)"
 #~ msgstr "Folosire: gpg [opþiuni] [fiºiere] (-h pentru ajutor)"
diff --git a/po/ru.po b/po/ru.po
index 8bd0387..f79effc 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -660,8 +660,7 @@ msgstr "Ð¡Ð¼ÐµÐ½ÑŽ Ð¿Ð¾Ð·Ð¶Ðµ"
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
-msgstr ""
-"Ð’Ñ‹ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡ Ñ ÐºÐ¾Ð´Ð¾Ð¼%%0A  %s%%0A  %%C%%0A?"
+msgstr "Ð’Ñ‹ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡ Ñ ÐºÐ¾Ð´Ð¾Ð¼%%0A  %s%%0A  %%C%%0A?"
 
 msgid "Delete key"
 msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡"
@@ -5272,6 +5271,61 @@ msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð·Ð°Ð¿Ð¸ÑÑŒ Ð¾ Ð²ÐµÑ€ÑÐ¸Ð¸ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ‹ Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ: Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð·Ð°Ð¿Ð¸ÑÐ¸: %s\n"
 
+msgid "undefined"
+msgstr ""
+
+#, fuzzy
+#| msgid "never     "
+msgid "never"
+msgstr "Ð½Ð¸ÐºÐ¾Ð³Ð´Ð°   "
+
+msgid "marginal"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
+msgid "ultimate"
+msgstr ""
+
+#. 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 ""
+
+#, fuzzy
+#| msgid "revoked"
+msgid "[ revoked]"
+msgstr "Ð¾Ñ‚Ð¾Ð·Ð²Ð°Ð½"
+
+#, fuzzy
+#| msgid "expired"
+msgid "[ expired]"
+msgstr "Ð¿Ñ€Ð¾ÑÑ€Ð¾Ñ‡ÐµÐ½"
+
+#, fuzzy
+#| msgid "unknown"
+msgid "[ unknown]"
+msgstr "Ð½ÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ð¾"
+
+msgid "[  undef ]"
+msgstr ""
+
+msgid "[marginal]"
+msgstr ""
+
+msgid "[  full  ]"
+msgstr ""
+
+msgid "[ultimate]"
+msgstr ""
+
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
diff --git a/po/sk.po b/po/sk.po
index 562aeb7..b38aab0 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5591,6 +5591,57 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "záznam dôvery %lu, typ %d: zápis zlyhal: %s\n"
 
+msgid "undefined"
+msgstr ""
+
+#, fuzzy
+msgid "never"
+msgstr "nikdy     "
+
+msgid "marginal"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
+msgid "ultimate"
+msgstr ""
+
+#. 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 ""
+
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[revokované]"
+
+#, fuzzy
+msgid "[ expired]"
+msgstr "[expirované]"
+
+#, fuzzy
+msgid "[ unknown]"
+msgstr "neznáme"
+
+msgid "[  undef ]"
+msgstr ""
+
+msgid "[marginal]"
+msgstr ""
+
+msgid "[  full  ]"
+msgstr ""
+
+msgid "[ultimate]"
+msgstr ""
+
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -8618,22 +8669,6 @@ msgstr ""
 #~ "PGP-2.x\n"
 
 #, fuzzy
-#~ msgid "[ revoked]"
-#~ msgstr "[revokované]"
-
-#, fuzzy
-#~ msgid "[ expired]"
-#~ msgstr "[expirované]"
-
-#, fuzzy
-#~ msgid "[ unknown]"
-#~ msgstr "neznáme"
-
-#, fuzzy
-#~ msgid "never"
-#~ msgstr "nikdy     "
-
-#, fuzzy
 #~ msgid "Usage: scdaemon [options] (-h for help)"
 #~ msgstr "Pou¾itie: gpg [mo¾nosti] [súbory] (-h pre pomoc)"
 
diff --git a/po/sv.po b/po/sv.po
index fb4ca7e..fd08e46 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5691,6 +5691,64 @@ msgstr ""
 "kunde inte uppdatera versionspost i tillitsdatabasen: skrivning "
 "misslyckades: %s\n"
 
+msgid "undefined"
+msgstr "odefinierad"
+
+msgid "never"
+msgstr "aldrig"
+
+msgid "marginal"
+msgstr "marginell"
+
+msgid "full"
+msgstr "fullstÃ¤ndig"
+
+msgid "ultimate"
+msgstr "fÃ¶rbehÃ¥llslÃ¶s"
+
+# Denna mÃ¥ste testas.
+# /* NOTE TO TRANSLATOR: 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. */
+#. 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.
+#, fuzzy
+#| msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgid "10 translator see trust.c:uid_trust_string_fixed"
+msgstr "15"
+
+msgid "[ revoked]"
+msgstr "[   spÃ¤rrad   ]"
+
+msgid "[ expired]"
+msgstr "[   utgÃ¥nget  ]"
+
+msgid "[ unknown]"
+msgstr "[    okÃ¤nt    ]"
+
+msgid "[  undef ]"
+msgstr "[ odefinierad ]"
+
+msgid "[marginal]"
+msgstr "[  marginell  ]"
+
+msgid "[  full  ]"
+msgstr "[ fullstÃ¤ndig ]"
+
+msgid "[ultimate]"
+msgstr "[fÃ¶rbehÃ¥llslÃ¶s]"
+
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -8954,54 +9012,6 @@ msgstr ""
 #~ "du kan bara gÃ¶ra klartextsignaturer med en PGP 2.x-nyckel\n"
 #~ "nÃ¤r du Ã¤r i --pgp2-lÃ¤ge\n"
 
-# Denna mÃ¥ste testas.
-# /* NOTE TO TRANSLATOR: 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 "15"
-
-#~ msgid "[ revoked]"
-#~ msgstr "[   spÃ¤rrad   ]"
-
-#~ msgid "[ expired]"
-#~ msgstr "[   utgÃ¥nget  ]"
-
-#~ msgid "[ unknown]"
-#~ msgstr "[    okÃ¤nt    ]"
-
-#~ msgid "[  undef ]"
-#~ msgstr "[ odefinierad ]"
-
-#~ msgid "[marginal]"
-#~ msgstr "[  marginell  ]"
-
-#~ msgid "[  full  ]"
-#~ msgstr "[ fullstÃ¤ndig ]"
-
-#~ msgid "[ultimate]"
-#~ msgstr "[fÃ¶rbehÃ¥llslÃ¶s]"
-
-#~ msgid "undefined"
-#~ msgstr "odefinierad"
-
-#~ msgid "never"
-#~ msgstr "aldrig"
-
-#~ msgid "marginal"
-#~ msgstr "marginell"
-
-#~ msgid "full"
-#~ msgstr "fullstÃ¤ndig"
-
-#~ msgid "ultimate"
-#~ msgstr "fÃ¶rbehÃ¥llslÃ¶s"
-
 #~ msgid " - probably dead - removing lock"
 #~ msgstr " - antagligen dÃ¶d - tar bort lÃ¥s"
 
diff --git a/po/tr.po b/po/tr.po
index 3ab774a..26b2c3a 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5619,6 +5619,55 @@ msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "gÃ¼vence veritabanÄ±nÄ±n sÃ¼rÃ¼m kaydÄ± gÃ¼ncellenemedi: yazma baÅŸarÄ±sÄ±z: %s\n"
 
+msgid "undefined"
+msgstr "tanÄ±msÄ±z"
+
+msgid "never"
+msgstr "asla    "
+
+msgid "marginal"
+msgstr "ÅŸÃ¶yle bÃ¶yle"
+
+msgid "full"
+msgstr "tamamen"
+
+msgid "ultimate"
+msgstr "son derece"
+
+#. 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.
+#, fuzzy
+#| msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgid "10 translator see trust.c:uid_trust_string_fixed"
+msgstr "20 translator seen trustdb.c:uid_trust_string_fixed"
+
+msgid "[ revoked]"
+msgstr "[yÃ¼rÃ¼rlÃ¼kten kalktÄ±]"
+
+msgid "[ expired]"
+msgstr "[  sÃ¼resi  doldu  ]"
+
+msgid "[ unknown]"
+msgstr "[    bilinmeyen   ]"
+
+msgid "[  undef ]"
+msgstr "[     tanÄ±msÄ±z    ]"
+
+msgid "[marginal]"
+msgstr "[   ÅŸÃ¶yle bÃ¶yle   ]"
+
+msgid "[  full  ]"
+msgstr "[     tamamen     ]"
+
+msgid "[ultimate]"
+msgstr "[   son  derece   ]"
+
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -8872,45 +8921,6 @@ msgstr ""
 #~ "--pgp2 kipinde sadece PGP 2.x tarzÄ± anahtarlarla aÃ§Ä±k imzalama "
 #~ "yapabilirsiniz\n"
 
-#~ msgid "10 translator see trustdb.c:uid_trust_string_fixed"
-#~ msgstr "20 translator seen trustdb.c:uid_trust_string_fixed"
-
-#~ msgid "[ revoked]"
-#~ msgstr "[yÃ¼rÃ¼rlÃ¼kten kalktÄ±]"
-
-#~ msgid "[ expired]"
-#~ msgstr "[  sÃ¼resi  doldu  ]"
-
-#~ msgid "[ unknown]"
-#~ msgstr "[    bilinmeyen   ]"
-
-#~ msgid "[  undef ]"
-#~ msgstr "[     tanÄ±msÄ±z    ]"
-
-#~ msgid "[marginal]"
-#~ msgstr "[   ÅŸÃ¶yle bÃ¶yle   ]"
-
-#~ msgid "[  full  ]"
-#~ msgstr "[     tamamen     ]"
-
-#~ msgid "[ultimate]"
-#~ msgstr "[   son  derece   ]"
-
-#~ msgid "undefined"
-#~ msgstr "tanÄ±msÄ±z"
-
-#~ msgid "never"
-#~ msgstr "asla    "
-
-#~ msgid "marginal"
-#~ msgstr "ÅŸÃ¶yle bÃ¶yle"
-
-#~ msgid "full"
-#~ msgstr "tamamen"
-
-#~ msgid "ultimate"
-#~ msgstr "son derece"
-
 #~ msgid " - probably dead - removing lock"
 #~ msgstr " - muhtemelen Ã¶lÃ¼ - kilit siliniyor"
 
diff --git a/po/uk.po b/po/uk.po
index b523414..02e5437 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5383,6 +5383,55 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ Ð²ÐµÑ€ÑÑ–Ñ— trustdb: Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð·Ð°Ð¿Ð¸ÑÑƒ: %s\n"
 
+msgid "undefined"
+msgstr "Ð½Ðµ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¾"
+
+msgid "never"
+msgstr "Ð½Ñ–ÐºÐ¾Ð»Ð¸"
+
+msgid "marginal"
+msgstr "Ð½ÐµÐ¿Ð¾Ð²Ð½Ð°"
+
+msgid "full"
+msgstr "Ð¿Ð¾Ð²Ð½Ð°"
+
+msgid "ultimate"
+msgstr "Ð±ÐµÐ·Ð¼ÐµÐ¶Ð½Ð°"
+
+#. 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.
+#, fuzzy
+#| msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgid "10 translator see trust.c:uid_trust_string_fixed"
+msgstr "10 translator see trustdb.c:uid_trust_string_fixed"
+
+msgid "[ revoked]"
+msgstr "[Ð²Ñ–Ð´ÐºÐ»Ð¸Ðº.]"
+
+msgid "[ expired]"
+msgstr "[Ð·Ð°ÑÑ‚Ð°Ñ€Ñ–Ð»]"
+
+msgid "[ unknown]"
+msgstr "[Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð°]"
+
+msgid "[  undef ]"
+msgstr "[Ð½Ðµ Ð²Ð¸Ð·Ð½.]"
+
+msgid "[marginal]"
+msgstr "[Ð½ÐµÐ¿Ð¾Ð²Ð½Ð° ]"
+
+msgid "[  full  ]"
+msgstr "[ Ð¿Ð¾Ð²Ð½Ð°  ]"
+
+msgid "[ultimate]"
+msgstr "[Ð±ÐµÐ·Ð¼ÐµÐ¶Ð½Ð°]"
+
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -8221,45 +8270,6 @@ msgstr ""
 #~ msgid "the IDEA cipher plugin is not present\n"
 #~ msgstr "Ð½Ðµ Ð²Ð¸ÑÐ²Ð»ÐµÐ½Ð¾ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ° ÑˆÐ¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ IDEA\n"
 
-#~ msgid "10 translator see trustdb.c:uid_trust_string_fixed"
-#~ msgstr "10 translator see trustdb.c:uid_trust_string_fixed"
-
-#~ msgid "[ revoked]"
-#~ msgstr "[Ð²Ñ–Ð´ÐºÐ»Ð¸Ðº.]"
-
-#~ msgid "[ expired]"
-#~ msgstr "[Ð·Ð°ÑÑ‚Ð°Ñ€Ñ–Ð»]"
-
-#~ msgid "[ unknown]"
-#~ msgstr "[Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð°]"
-
-#~ msgid "[  undef ]"
-#~ msgstr "[Ð½Ðµ Ð²Ð¸Ð·Ð½.]"
-
-#~ msgid "[marginal]"
-#~ msgstr "[Ð½ÐµÐ¿Ð¾Ð²Ð½Ð° ]"
-
-#~ msgid "[  full  ]"
-#~ msgstr "[ Ð¿Ð¾Ð²Ð½Ð°  ]"
-
-#~ msgid "[ultimate]"
-#~ msgstr "[Ð±ÐµÐ·Ð¼ÐµÐ¶Ð½Ð°]"
-
-#~ msgid "undefined"
-#~ msgstr "Ð½Ðµ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¾"
-
-#~ msgid "never"
-#~ msgstr "Ð½Ñ–ÐºÐ¾Ð»Ð¸"
-
-#~ msgid "marginal"
-#~ msgstr "Ð½ÐµÐ¿Ð¾Ð²Ð½Ð°"
-
-#~ msgid "full"
-#~ msgstr "Ð¿Ð¾Ð²Ð½Ð°"
-
-#~ msgid "ultimate"
-#~ msgstr "Ð±ÐµÐ·Ð¼ÐµÐ¶Ð½Ð°"
-
 #~ msgid "Usage: scdaemon [options] (-h for help)"
 #~ msgstr "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ: scdaemon [Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¸] (-h â€” Ð´Ð¾Ð²Ñ–Ð´ÐºÐ°)"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ed873ba..9d32b3b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5431,6 +5431,55 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "æ— æ³•æ›´æ–°ä¿¡ä»»åº¦æ•°æ®åº“ç‰ˆæœ¬è®°å½•ï¼šå†™å…¥å¤±è´¥ï¼š%s\n"
 
+msgid "undefined"
+msgstr "æœªå®šä¹‰"
+
+msgid "never"
+msgstr "ä»Žä¸"
+
+msgid "marginal"
+msgstr "å‹‰å¼º"
+
+msgid "full"
+msgstr "å®Œå…¨"
+
+msgid "ultimate"
+msgstr "ç»å¯¹"
+
+#. 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.
+#, fuzzy
+#| msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgid "10 translator see trust.c:uid_trust_string_fixed"
+msgstr "10 translator see trustdb.c:uid_trust_string_fixed"
+
+msgid "[ revoked]"
+msgstr "[å·²åŠé”€]"
+
+msgid "[ expired]"
+msgstr "[å·²è¿‡æœŸ]"
+
+msgid "[ unknown]"
+msgstr "[ æœªçŸ¥ ]"
+
+msgid "[  undef ]"
+msgstr "[æœªå®šä¹‰]"
+
+msgid "[marginal]"
+msgstr "[ å‹‰å¼º ]"
+
+msgid "[  full  ]"
+msgstr "[ å®Œå…¨ ]"
+
+msgid "[ultimate]"
+msgstr "[ ç»å¯¹ ]"
+
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -8461,45 +8510,6 @@ msgstr ""
 #~ "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 #~ msgstr "æ‚¨åœ¨ --pgp2 æ¨¡å¼ä¸‹åªèƒ½å¤Ÿä½¿ç”¨ PGP 2.x æ ·å¼çš„å¯†é’¥æ¥åšæ˜Žæ–‡ç¾å\n"
 
-#~ msgid "10 translator see trustdb.c:uid_trust_string_fixed"
-#~ msgstr "10 translator see trustdb.c:uid_trust_string_fixed"
-
-#~ msgid "[ revoked]"
-#~ msgstr "[å·²åŠé”€]"
-
-#~ msgid "[ expired]"
-#~ msgstr "[å·²è¿‡æœŸ]"
-
-#~ msgid "[ unknown]"
-#~ msgstr "[ æœªçŸ¥ ]"
-
-#~ msgid "[  undef ]"
-#~ msgstr "[æœªå®šä¹‰]"
-
-#~ msgid "[marginal]"
-#~ msgstr "[ å‹‰å¼º ]"
-
-#~ msgid "[  full  ]"
-#~ msgstr "[ å®Œå…¨ ]"
-
-#~ msgid "[ultimate]"
-#~ msgstr "[ ç»å¯¹ ]"
-
-#~ msgid "undefined"
-#~ msgstr "æœªå®šä¹‰"
-
-#~ msgid "never"
-#~ msgstr "ä»Žä¸"
-
-#~ msgid "marginal"
-#~ msgstr "å‹‰å¼º"
-
-#~ msgid "full"
-#~ msgstr "å®Œå…¨"
-
-#~ msgid "ultimate"
-#~ msgstr "ç»å¯¹"
-
 #, fuzzy
 #~ msgid "Usage: scdaemon [options] (-h for help)"
 #~ msgstr "ç”¨æ³•ï¼š gpg [é€‰é¡¹] [æ–‡ä»¶] (ç”¨ -h æ±‚åŠ©)"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ac86d58..ffda8fd 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5193,6 +5193,61 @@ msgstr "æ·±åº¦: %d  æœ‰æ•ˆ: %3d  å·²ç°½ç½²: %3d  ä¿¡ä»»: %d-, %dq, %dn, %dm, %df
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "ç„¡æ³•æ›´æ–°ä¿¡ä»»è³‡æ–™åº«ç‰ˆæœ¬è¨˜éŒ„: å¯«å…¥å¤±æ•—: %s\n"
 
+msgid "undefined"
+msgstr ""
+
+#, fuzzy
+#| msgid "never     "
+msgid "never"
+msgstr "æ°¸é ä¸éŽæœŸ"
+
+msgid "marginal"
+msgstr ""
+
+msgid "full"
+msgstr ""
+
+msgid "ultimate"
+msgstr ""
+
+#. 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 ""
+
+#, fuzzy
+#| msgid "revoked"
+msgid "[ revoked]"
+msgstr "å·²æ’¤éŠ·"
+
+#, fuzzy
+#| msgid "expired"
+msgid "[ expired]"
+msgstr "å·²éŽæœŸ"
+
+#, fuzzy
+#| msgid "unknown"
+msgid "[ unknown]"
+msgstr "æœªçŸ¥"
+
+msgid "[  undef ]"
+msgstr ""
+
+msgid "[marginal]"
+msgstr ""
+
+msgid "[  full  ]"
+msgstr ""
+
+msgid "[ultimate]"
+msgstr ""
+
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"

commit e086364f3325759e471a594f1cd62d8d957b3743
Author: Ineiev <ineiev at gnu.org>
Date:   Thu Sep 10 16:16:39 2015 +0200

    po: Update Russian translation
    
    --

diff --git a/po/ru.po b/po/ru.po
index 661299a..8bd0387 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 2.1.0\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2015-06-25 17:17+0000\n"
+"PO-Revision-Date: 2015-08-12 17:17+0000\n"
 "Last-Translator: Ineiev <ineiev at gnu.org>\n"
 "Language-Team: Russian <gnupg-ru at gnupg.org>\n"
 "Language: ru\n"
@@ -88,7 +88,7 @@ msgstr ""
 "ÑÑ‚Ð¾Ð³Ð¾ ÑÐµÐ°Ð½ÑÐ°"
 
 msgid "PIN:"
-msgstr ""
+msgstr "PIN:"
 
 msgid "Passphrase:"
 msgstr "Ð¤Ñ€Ð°Ð·Ð°-Ð¿Ð°Ñ€Ð¾Ð»ÑŒ:"
@@ -656,12 +656,12 @@ msgstr "Ð¡Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ñ„Ñ€Ð°Ð·Ñƒ-Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 msgid "I'll change it later"
 msgstr "Ð¡Ð¼ÐµÐ½ÑŽ Ð¿Ð¾Ð·Ð¶Ðµ"
 
-#, fuzzy, c-format
-#| msgid "Do you really want to delete the selected keys? (y/N) "
+#, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
-msgstr "Ð’Ñ‹ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ðµ ÐºÐ»ÑŽÑ‡Ð¸? (y/N) "
+msgstr ""
+"Ð’Ñ‹ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡ Ñ ÐºÐ¾Ð´Ð¾Ð¼%%0A  %s%%0A  %%C%%0A?"
 
 msgid "Delete key"
 msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡"
@@ -2932,10 +2932,8 @@ msgstr "ÑÐ¾Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ Ð¸ Ð²Ñ‹Ð¹Ñ‚Ð¸"
 msgid "show key fingerprint"
 msgstr "Ð¿Ð¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¾Ñ‚Ð¿ÐµÑ‡Ð°Ñ‚Ð¾Ðº ÐºÐ»ÑŽÑ‡Ð°"
 
-#, fuzzy
-#| msgid "Enter the keygrip: "
 msgid "show the keygrip"
-msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ ÐºÐ¾Ð´ ÐºÐ»ÑŽÑ‡Ð°:"
+msgstr "Ð¿Ð¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ ÐºÐ¾Ð´ ÐºÐ»ÑŽÑ‡Ð°"
 
 msgid "list key and user IDs"
 msgstr "Ð²Ñ‹Ð²ÐµÑÑ‚Ð¸ ÑÐ¿Ð¸ÑÐ¾Ðº ÐºÐ»ÑŽÑ‡ÐµÐ¹ Ð¸ ID Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
@@ -3977,15 +3975,12 @@ msgstr "ÐšÑ€Ð¸Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¾Ðµ Ð¿Ñ€Ð¸Ð¼ÐµÑ‡Ð°Ð½Ð¸Ðµ Ðº Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ¸: "
 msgid "Signature notation: "
 msgstr "ÐŸÑ€Ð¸Ð¼ÐµÑ‡Ð°Ð½Ð¸Ðµ Ðº Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ¸: "
 
-#, fuzzy
-#| msgid "1 bad signature\n"
 msgid "1 good signature\n"
-msgstr "1 Ð¿Ð»Ð¾Ñ…Ð°Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑŒ\n"
+msgstr "1 Ñ…Ð¾Ñ€Ð¾ÑˆÐ°Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑŒ\n"
 
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
+#, c-format
 msgid "%d good signatures\n"
-msgstr "%d Ð¿Ð»Ð¾Ñ…Ð¸Ñ… Ð¿Ð¾Ð´Ð¿Ð¸ÑÐµÐ¹\n"
+msgstr "%d Ñ…Ð¾Ñ€Ð¾ÑˆÐ¸Ñ… Ð¿Ð¾Ð´Ð¿Ð¸ÑÐµÐ¹\n"
 
 #, c-format
 msgid "Warning: %lu key(s) skipped due to their large size\n"

commit 19545e3a2d2990cba6d62f98cdb1f665b38ba4f1
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Sep 9 15:41:25 2015 +0200

    dirmngr: Allow sending much larger keyblocks.
    
    * dirmngr/server.c (MAX_CERT_LENGTH): Increase to 16k.
    (MAX_KEYBLOCK_LENGTH): Increase to 20M.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/dirmngr/server.c b/dirmngr/server.c
index 5c142e8..0f1d262 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -54,14 +54,19 @@
 #include "mbox-util.h"
 
 /* To avoid DoS attacks we limit the size of a certificate to
-   something reasonable. */
-#define MAX_CERT_LENGTH (8*1024)
+   something reasonable.  The DoS was actually only an issue back when
+   Dirmngr was a system service and not a user service. */
+#define MAX_CERT_LENGTH (16*1024)
 
 /* The same goes for OpenPGP keyblocks, but here we need to allow for
    much longer blocks; a 200k keyblock is not too unusual for keys
    with a lot of signatures (e.g. 0x5b0358a2).  9C31503C6D866396 even
-   has 770 KiB as of 2015-08-23.  */
-#define MAX_KEYBLOCK_LENGTH (1024*1024)
+   has 770 KiB as of 2015-08-23.  To avoid adding a runtime option we
+   now use 20MiB which should really be enough.  Well, a key with
+   several pictures could be larger (the parser as a 18MiB limit for
+   attribute packets) but it won't be nice to the keyservers to send
+   them such large blobs.  */
+#define MAX_KEYBLOCK_LENGTH (20*1024*1024)
 
 
 #define PARM_ERROR(t) assuan_set_error (ctx, \

commit 56bf1061f86326b814e878f925cbf144e837fd66
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Sep 9 15:14:20 2015 +0200

    doc: Minor comment fixes.
    
    --

diff --git a/g10/getkey.c b/g10/getkey.c
index 7aeaebc..028b049 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -2602,7 +2602,7 @@ lookup (getkey_ctx_t ctx, kbnode_t *ret_keyblock, int want_secret)
         goto skip; /* No secret key available.  */
 
       /* Warning: node flag bits 0 and 1 should be preserved by
-       * merge_selfsigs.  For secret keys, premerge did tranfer the
+       * merge_selfsigs.  For secret keys, premerge transferred the
        * keys to the keyblock.  */
       merge_selfsigs (ctx->keyblock);
       if (finish_lookup (ctx))
@@ -2617,10 +2617,11 @@ lookup (getkey_ctx_t ctx, kbnode_t *ret_keyblock, int want_secret)
       /* Release resources and continue search. */
       release_kbnode (ctx->keyblock);
       ctx->keyblock = NULL;
-      /* We need to disable the caching so that for an exact key search we
-         won't get the result back from the cache and thus end up in an
-         endless loop.  Disabling this here is sufficient because although
-         the result may have been cached, if won't be used then.  */
+      /* We need to disable the caching so that for an exact key
+         search we won't get the result back from the cache and thus
+         end up in an endless loop.  Disabling the cache here at this
+         point is sufficient because even a cached result won't be
+         used after a call to keydb_disable_caching.  */
       keydb_disable_caching (ctx->kr_handle);
     }
 
diff --git a/g13/keyblob.h b/g13/keyblob.h
index 99d239f..5c3e74e 100644
--- a/g13/keyblob.h
+++ b/g13/keyblob.h
@@ -115,12 +115,14 @@
 /* A EncFS based backend.  This requires a whole directory which
    includes the encrypted files.  Metadata is not encrypted.  */
 
+#define CONTTYPE_DM_CRYPT   2
+/* A DM-Crypt based backend.  */
+
 
 #define CONTTYPE_TRUECRYPT  21571
 /* A Truecrypt (www.truecrypt.org) based container.  Due to the design
    of truecrypt this requires a second datafile because it is not
-   possible to to prepend a truecrypt container with our keyblob.  */
-
+   possible to prepend a truecrypt container with our keyblob.  */
 
 
 

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

Summary of changes:
 NEWS                          |  29 +++++++++++-
 configure.ac                  |   2 +-
 dirmngr/server.c              |  13 ++++--
 g10/Makefile.am               |   4 +-
 g10/getkey.c                  |  11 +++--
 g10/t-keydb.c                 |  12 +++--
 g10/test.c                    |  59 ++++++++++++++++++++---
 g13/keyblob.h                 |   6 ++-
 po/ca.po                      |  67 +++++++++++++++++++-------
 po/cs.po                      |  92 ++++++++++++++++++++----------------
 po/da.po                      |  88 +++++++++++++++++++----------------
 po/el.po                      |  67 +++++++++++++++++++-------
 po/eo.po                      |  62 +++++++++++++++++++-----
 po/es.po                      |  88 +++++++++++++++++++----------------
 po/et.po                      |  67 +++++++++++++++++++-------
 po/fi.po                      |  67 +++++++++++++++++++-------
 po/fr.po                      |  88 +++++++++++++++++++----------------
 po/gl.po                      |  67 +++++++++++++++++++-------
 po/hu.po                      |  67 +++++++++++++++++++-------
 po/id.po                      |  67 +++++++++++++++++++-------
 po/it.po                      |  67 +++++++++++++++++++-------
 po/ja.po                      |  55 ++++++++++++++++++++++
 po/nb.po                      |  59 ++++++++++++++++++-----
 po/pl.po                      |  88 +++++++++++++++++++----------------
 po/pt.po                      |  62 +++++++++++++++++++-----
 po/ro.po                      |  88 +++++++++++++++++++----------------
 po/ru.po                      |  77 ++++++++++++++++++++++++------
 po/sk.po                      |  67 +++++++++++++++++++-------
 po/sv.po                      | 106 +++++++++++++++++++++++-------------------
 po/tr.po                      |  88 +++++++++++++++++++----------------
 po/uk.po                      |  88 +++++++++++++++++++----------------
 po/zh_CN.po                   |  88 +++++++++++++++++++----------------
 po/zh_TW.po                   |  55 ++++++++++++++++++++++
 tests/openpgp/4gb-packet.test |   2 +-
 34 files changed, 1391 insertions(+), 622 deletions(-)


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


