gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gnunet] branch master updated: BUILD: Remove gnurl. Improve curl-gnutls


From: gnunet
Subject: [gnunet] branch master updated: BUILD: Remove gnurl. Improve curl-gnutls detection
Date: Tue, 06 Sep 2022 12:34:42 +0200

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new afea0eea1 BUILD: Remove gnurl. Improve curl-gnutls detection
afea0eea1 is described below

commit afea0eea1ecfa41150fdf9ee052acac75eee6534
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Tue Sep 6 12:34:39 2022 +0200

    BUILD: Remove gnurl. Improve curl-gnutls detection
---
 configure.ac                      |  52 ++---
 m4/Makefile.am                    |   1 -
 m4/libgnurl.m4                    | 269 ----------------------
 po/de.po                          | 467 +++++++++++++++++++-------------------
 po/es.po                          | 467 +++++++++++++++++++-------------------
 po/fr.po                          | 467 +++++++++++++++++++-------------------
 po/it.po                          | 463 +++++++++++++++++++------------------
 po/sr.po                          | 467 +++++++++++++++++++-------------------
 po/sv.po                          | 467 +++++++++++++++++++-------------------
 po/vi.po                          | 467 +++++++++++++++++++-------------------
 po/zh_CN.po                       | 467 +++++++++++++++++++-------------------
 src/curl/Makefile.am              |  14 +-
 src/gns/Makefile.am               |  25 +-
 src/hostlist/Makefile.am          |  26 +--
 src/include/gnunet_curl_lib.h     |   6 -
 src/integration-tests/Makefile.am |   7 -
 src/json/Makefile.am              |  15 +-
 src/pt/Makefile.am                |  37 +--
 src/transport/Makefile.am         |  73 ++----
 19 files changed, 1918 insertions(+), 2339 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6e6161434..217b54210 100644
--- a/configure.ac
+++ b/configure.ac
@@ -719,35 +719,21 @@ AS_IF([test "x$pulse" != "x1" || test "x$opus" != "x1" || 
test "x$ogg" != "x1"],
 AM_CONDITIONAL([BUILD_CONVERSATION], [test "x$conversation_backend" != 
"xnone"])
 AC_MSG_RESULT([$conversation_backend])
 
-# check for libgnurl
-LIBGNURL_CHECK_CONFIG([], [7.34.0],
-                      [gnurl=1
-                       curl=0],
-                      [gnurl=0
-                       curl=0])
-AS_IF([test "x$gnurl" = "x0"],
-  [LIBCURL_CHECK_CONFIG([], [7.34.0], [curl=1], [curl=0])
-   AS_IF([test "x$curl" = "x0"],
-     [AC_CHECK_HEADER([curl/curl.h],
-        [AC_CHECK_DECLS([CURLINFO_TLS_SSL_PTR],
-                        [curl=1],
-                        [curl=0],
-                        [[#include <curl/curl.h>]])])
-      AC_CHECK_LIB([curl-gnutls],
-                   [curl_easy_getinfo],
-                   [curl_gnutls=1],
-                   [curl_gnutls=0])])
-   AS_IF([test "x$curl" = "x0" || test "x$curl_gnutls" = "x0"],
-     [AC_MSG_ERROR([cURL must have a version >= 7.34.0 and must support 
CURLINFO_TLS_SESSION])])])
-
-AS_IF([test "x$gnurl" = "x0" && test "x$curl" = "x0"],
-  [AC_MSG_ERROR([either gnurl or cURL must be available])])
-
-AM_CONDITIONAL([HAVE_LIBGNURL], [test "x$gnurl" = "x1"])
-AC_DEFINE_UNQUOTED([HAVE_LIBGNURL], [$gnurl], [Define to 1 if libgnurl is 
used])
-AM_CONDITIONAL([HAVE_LIBCURL], [test "x$curl" = "x1"])
-AC_DEFINE_UNQUOTED([HAVE_LIBCURL], [$curl], [Define to 0 if libcurl is used])
-
+AC_CHECK_LIB([curl-gnutls],
+             [curl_easy_getinfo],
+             [curl_gnutls=1
+              LIBCURL="-lcurl-gnutls"
+              ],
+             [curl_gnutls=0])
+
+LIBCURL_CHECK_CONFIG([], [7.34.0], [],
+                     [AC_MSG_ERROR([cURL must have a version >= 7.34.0])])
+
+AC_CHECK_HEADER([curl/curl.h],
+                [AC_CHECK_DECLS([CURLINFO_TLS_SSL_PTR],
+                                [],
+                                [AC_MSG_ERROR([cURL must support 
CURLINFO_TLS_SSL_PTR])],
+                                [[#include <curl/curl.h>]])])
 # libatomic
 AC_SEARCH_LIBS([__atomic_load_8], [atomic],
                [have_libatomic=1
@@ -1506,11 +1492,9 @@ AS_IF([test "x$png" = "x1"],
   [libpng_msg="no"])
 
 # curl or gnurl
-AS_IF([test "x$gnurl" = "x1"],
-  [http_client="gnurl"],
-  [AS_IF([test "x$curl_gnutls" = "x1"],
-     [http_client="curl-gnutls"],
-     [http_client="curl-openssl"])])
+AS_IF([test "x$curl_gnutls" = "x1"],
+      [http_client="curl-gnutls"],
+      [http_client="curl-openssl"])
 
 # ifconfig
 AS_IF([test "x$IFCONFIG_BINARY" = "xfalse"],
diff --git a/m4/Makefile.am b/m4/Makefile.am
index d41788460..79010513f 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -21,7 +21,6 @@ inttypes-pri.m4\
 isc-posix.m4\
 lcmessage.m4\
 libgcrypt.m4\
-libgnurl.m4\
 libcurl.m4\
 lib-ld.m4\
 lib-link.m4\
diff --git a/m4/libgnurl.m4 b/m4/libgnurl.m4
deleted file mode 100644
index d030c5dd8..000000000
--- a/m4/libgnurl.m4
+++ /dev/null
@@ -1,269 +0,0 @@
-###########################################################################
-# LIBGNURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION],
-#                       [ACTION-IF-YES], [ACTION-IF-NO])
-# ----------------------------------------------------------
-#      David Shaw <dshaw@jabberwocky.com>   May-09-2006
-#
-# Checks for libgnurl.  DEFAULT-ACTION is the string yes or no to
-# specify whether to default to --with-libgnurl or --without-libgnurl.
-# If not supplied, DEFAULT-ACTION is yes.  MINIMUM-VERSION is the
-# minimum version of libgnurl to accept.  Pass the version as a regular
-# version number like 7.10.1. If not supplied, any version is
-# accepted.  ACTION-IF-YES is a list of shell commands to run if
-# libgnurl was successfully found and passed the various tests.
-# ACTION-IF-NO is a list of shell commands that are run otherwise.
-# Note that using --without-libgnurl does run ACTION-IF-NO.
-#
-# This macro #defines HAVE_LIBGNURL if a working libgnurl setup is
-# found, and sets @LIBGNURL@ and @LIBGNURL_CPPFLAGS@ to the necessary
-# values.  Other useful defines are LIBGNURL_FEATURE_xxx where xxx are
-# the various features supported by libgnurl, and LIBGNURL_PROTOCOL_yyy
-# where yyy are the various protocols supported by libgnurl.  Both xxx
-# and yyy are capitalized.  See the list of AH_TEMPLATEs at the top of
-# the macro for the complete list of possible defines.  Shell
-# variables $libgnurl_feature_xxx and $libgnurl_protocol_yyy are also
-# defined to 'yes' for those features and protocols that were found.
-# Note that xxx and yyy keep the same capitalization as in the
-# gnurl-config list (e.g. it's "HTTP" and not "http").
-#
-# Users may override the detected values by doing something like:
-# LIBGNURL="-lgnurl" LIBGNURL_CPPFLAGS="-I/usr/myinclude" ./configure
-#
-# For the sake of sanity, this macro assumes that any libgnurl that is
-# found is after version 7.7.2, the first version that included the
-# gnurl-config script.  Note that it is very important for people
-# packaging binary versions of libgnurl to include this script!
-# Without gnurl-config, we can only guess what protocols are available,
-# or use gnurl_version_info to figure it out at runtime.
-
-AC_DEFUN([LIBGNURL_CHECK_CONFIG],
-[
-  AH_TEMPLATE([LIBGNURL_FEATURE_SSL],[Defined if libgnurl supports SSL])
-  AH_TEMPLATE([LIBGNURL_FEATURE_KRB4],[Defined if libgnurl supports KRB4])
-  AH_TEMPLATE([LIBGNURL_FEATURE_IPV6],[Defined if libgnurl supports IPv6])
-  AH_TEMPLATE([LIBGNURL_FEATURE_LIBZ],[Defined if libgnurl supports libz])
-  AH_TEMPLATE([LIBGNURL_FEATURE_ASYNCHDNS],[Defined if libgnurl supports 
AsynchDNS])
-  AH_TEMPLATE([LIBGNURL_FEATURE_IDN],[Defined if libgnurl supports IDN])
-  AH_TEMPLATE([LIBGNURL_FEATURE_SSPI],[Defined if libgnurl supports SSPI])
-  AH_TEMPLATE([LIBGNURL_FEATURE_NTLM],[Defined if libgnurl supports NTLM])
-
-  AH_TEMPLATE([LIBGNURL_PROTOCOL_HTTP],[Defined if libgnurl supports HTTP])
-  AH_TEMPLATE([LIBGNURL_PROTOCOL_HTTPS],[Defined if libgnurl supports HTTPS])
-  AH_TEMPLATE([LIBGNURL_PROTOCOL_FTP],[Defined if libgnurl supports FTP])
-  AH_TEMPLATE([LIBGNURL_PROTOCOL_FTPS],[Defined if libgnurl supports FTPS])
-  AH_TEMPLATE([LIBGNURL_PROTOCOL_FILE],[Defined if libgnurl supports FILE])
-  AH_TEMPLATE([LIBGNURL_PROTOCOL_TELNET],[Defined if libgnurl supports TELNET])
-  AH_TEMPLATE([LIBGNURL_PROTOCOL_LDAP],[Defined if libgnurl supports LDAP])
-  AH_TEMPLATE([LIBGNURL_PROTOCOL_DICT],[Defined if libgnurl supports DICT])
-  AH_TEMPLATE([LIBGNURL_PROTOCOL_TFTP],[Defined if libgnurl supports TFTP])
-  AH_TEMPLATE([LIBGNURL_PROTOCOL_RTSP],[Defined if libgnurl supports RTSP])
-  AH_TEMPLATE([LIBGNURL_PROTOCOL_POP3],[Defined if libgnurl supports POP3])
-  AH_TEMPLATE([LIBGNURL_PROTOCOL_IMAP],[Defined if libgnurl supports IMAP])
-  AH_TEMPLATE([LIBGNURL_PROTOCOL_SMTP],[Defined if libgnurl supports SMTP])
-
-  AC_ARG_WITH(libgnurl,
-     AS_HELP_STRING([--with-libgnurl=PREFIX],[look for the gnurl library in 
PREFIX/lib and headers in PREFIX/include]),
-     [_libgnurl_with=$withval],[_libgnurl_with=ifelse([$1],,[yes],[$1])])
-
-  if test "$_libgnurl_with" != "no" ; then
-
-     AC_PROG_AWK
-
-     _libgnurl_version_parse="eval $AWK '{split(\$NF,A,\".\"); 
X=256*256*A[[1]]+256*A[[2]]+A[[3]]; print X;}'"
-
-     _libgnurl_try_link=yes
-
-     if test -d "$_libgnurl_with" ; then
-        LIBGNURL_CPPFLAGS="-I$withval/include"
-        _libgnurl_ldflags="-L$withval/lib"
-        AC_PATH_PROG([_libgnurl_config],[gnurl-config],[],
-                     ["$withval/bin"])
-     else
-        AC_PATH_PROG([_libgnurl_config],[gnurl-config],[],[$PATH])
-     fi
-
-     if test x$_libgnurl_config != "x" ; then
-        AC_CACHE_CHECK([for the version of libgnurl],
-           [libgnurl_cv_lib_gnurl_version],
-           [libgnurl_cv_lib_gnurl_version=`$_libgnurl_config --version | $AWK 
'{print $[]2}'`])
-
-        _libgnurl_version=`echo $libgnurl_cv_lib_gnurl_version | 
$_libgnurl_version_parse`
-        _libgnurl_wanted=`echo ifelse([$2],,[0],[$2]) | 
$_libgnurl_version_parse`
-
-        if test $_libgnurl_wanted -gt 0 ; then
-           AC_CACHE_CHECK([for libgnurl >= version $2],
-              [libgnurl_cv_lib_version_ok],
-              [
-              if test $_libgnurl_version -ge $_libgnurl_wanted ; then
-                 libgnurl_cv_lib_version_ok=yes
-              else
-                 libgnurl_cv_lib_version_ok=no
-              fi
-              ])
-        fi
-
-        if test $_libgnurl_wanted -eq 0 || test x$libgnurl_cv_lib_version_ok = 
xyes ; then
-           if test x"$LIBGNURL_CPPFLAGS" = "x" ; then
-              LIBGNURL_CPPFLAGS=`$_libgnurl_config --cflags`
-           fi
-           if test x"$LIBGNURL" = "x" ; then
-              LIBGNURL=`$_libgnurl_config --libs`
-
-              # This is so silly, but Apple actually has a bug in their
-              # gnurl-config script.  Fixed in Tiger, but there are still
-              # lots of Panther installs around.
-              case "${host}" in
-                 powerpc-apple-darwin7*)
-                    LIBGNURL=`echo $LIBGNURL | sed -e 's|-arch i386||g'`
-                 ;;
-              esac
-           fi
-
-           # All gnurl-config scripts support --feature
-           _libgnurl_features=`$_libgnurl_config --feature`
-
-           # Is it modern enough to have --protocols? (7.12.4)
-           if test $_libgnurl_version -ge 461828 ; then
-              _libgnurl_protocols=`$_libgnurl_config --protocols`
-           fi
-        else
-           _libgnurl_try_link=no
-        fi
-
-        unset _libgnurl_wanted
-     fi
-
-     if test $_libgnurl_try_link = yes ; then
-
-        # we didn't find gnurl-config, so let's see if the user-supplied
-        # link line (or failing that, "-lgnurl") is enough.
-        LIBGNURL=${LIBGNURL-"$_libgnurl_ldflags -lgnurl"}
-
-        AC_CACHE_CHECK([whether libgnurl is usable],
-           [libgnurl_cv_lib_gnurl_usable],
-           [
-           _libgnurl_save_cppflags=$CPPFLAGS
-           CPPFLAGS="$LIBGNURL_CPPFLAGS $CPPFLAGS"
-           _libgnurl_save_libs=$LIBS
-           LIBS="$LIBGNURL $LIBS"
-
-           AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curl/curl.h>]],[[
-/* Try and use a few common options to force a failure if we are
-   missing symbols or can't link. */
-int x;
-curl_easy_setopt(NULL,CURLOPT_URL,NULL);
-x=CURL_ERROR_SIZE;
-x=CURLOPT_WRITEFUNCTION;
-x=CURLOPT_WRITEDATA;
-x=CURLOPT_ERRORBUFFER;
-x=CURLOPT_STDERR;
-x=CURLOPT_VERBOSE;
-if (x) {;}
-]])],libgnurl_cv_lib_gnurl_usable=yes,libgnurl_cv_lib_gnurl_usable=no)
-
-# BEGIN Changes from original libcurl.m4:
-# Give it a second shot using 'gnurl/curl.h'
-           AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gnurl/curl.h>]],[[
-/* Try and use a few common options to force a failure if we are
-   missing symbols or can't link. */
-int x;
-curl_easy_setopt(NULL,CURLOPT_URL,NULL);
-x=CURL_ERROR_SIZE;
-x=CURLOPT_WRITEFUNCTION;
-x=CURLOPT_WRITEDATA;
-x=CURLOPT_ERRORBUFFER;
-x=CURLOPT_STDERR;
-x=CURLOPT_VERBOSE;
-if (x) {;}
-]])],libgnurl_cv_lib_gnurl_usable=yes,libgnurl_cv_lib_gnurl_usable=no)
-# END Changes from original libcurl.m4
-
-           CPPFLAGS=$_libgnurl_save_cppflags
-           LIBS=$_libgnurl_save_libs
-           unset _libgnurl_save_cppflags
-           unset _libgnurl_save_libs
-           ])
-
-        if test $libgnurl_cv_lib_gnurl_usable = yes ; then
-
-           # Does curl_free() exist in this version of libgnurl?
-           # If not, fake it with free()
-
-           _libgnurl_save_cppflags=$CPPFLAGS
-           CPPFLAGS="$CPPFLAGS $LIBGNURL_CPPFLAGS"
-           _libgnurl_save_libs=$LIBS
-           LIBS="$LIBS $LIBGNURL"
-
-           AC_CHECK_FUNC(curl_free,,
-              AC_DEFINE(curl_free,free,
-                [Define curl_free() as free() if our version of gnurl lacks 
curl_free.]))
-
-           CPPFLAGS=$_libgnurl_save_cppflags
-           LIBS=$_libgnurl_save_libs
-           unset _libgnurl_save_cppflags
-           unset _libgnurl_save_libs
-
-           AC_DEFINE(HAVE_LIBGNURL,1,
-             [Define to 1 if you have a functional gnurl library.])
-           AC_SUBST(LIBGNURL_CPPFLAGS)
-           AC_SUBST(LIBGNURL)
-
-           for _libgnurl_feature in $_libgnurl_features ; do
-              
AC_DEFINE_UNQUOTED(AS_TR_CPP(libgnurl_feature_$_libgnurl_feature),[1])
-              eval AS_TR_SH(libgnurl_feature_$_libgnurl_feature)=yes
-           done
-
-           if test "x$_libgnurl_protocols" = "x" ; then
-
-              # We don't have --protocols, so just assume that all
-              # protocols are available
-              _libgnurl_protocols="HTTP FTP FILE TELNET LDAP DICT TFTP"
-
-              if test x$libgnurl_feature_SSL = xyes ; then
-                 _libgnurl_protocols="$_libgnurl_protocols HTTPS"
-
-                 # FTPS wasn't standards-compliant until version
-                 # 7.11.0 (0x070b00 == 461568)
-                 if test $_libgnurl_version -ge 461568; then
-                    _libgnurl_protocols="$_libgnurl_protocols FTPS"
-                 fi
-              fi
-
-              # RTSP, IMAP, POP3 and SMTP were added in
-              # 7.20.0 (0x071400 == 463872)
-              if test $_libgnurl_version -ge 463872; then
-                 _libgnurl_protocols="$_libgnurl_protocols RTSP IMAP POP3 SMTP"
-              fi
-           fi
-
-           for _libgnurl_protocol in $_libgnurl_protocols ; do
-              
AC_DEFINE_UNQUOTED(AS_TR_CPP(libgnurl_protocol_$_libgnurl_protocol),[1])
-              eval AS_TR_SH(libgnurl_protocol_$_libgnurl_protocol)=yes
-           done
-        else
-           unset LIBGNURL
-           unset LIBGNURL_CPPFLAGS
-        fi
-     fi
-
-     unset _libgnurl_try_link
-     unset _libgnurl_version_parse
-     unset _libgnurl_config
-     unset _libgnurl_feature
-     unset _libgnurl_features
-     unset _libgnurl_protocol
-     unset _libgnurl_protocols
-     unset _libgnurl_version
-     unset _libgnurl_ldflags
-  fi
-
-  if test x$_libgnurl_with = xno || test x$libgnurl_cv_lib_gnurl_usable != 
xyes ; then
-     # This is the IF-NO path
-     ifelse([$4],,:,[$4])
-  else
-     # This is the IF-YES path
-     ifelse([$3],,:,[$3])
-  fi
-
-  unset _libgnurl_with
-])dnl
diff --git a/po/de.po b/po/de.po
index 78273d858..c0ff332fe 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-08-05 13:57+0200\n"
+"POT-Creation-Date: 2022-09-04 11:01+0200\n"
 "PO-Revision-Date: 2015-03-08 16:16+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -662,25 +662,25 @@ msgstr ""
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:326
+#: src/ats/gnunet-service-ats_plugins.c:321
 #, c-format
 msgid ""
 "Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:336
+#: src/ats/gnunet-service-ats_plugins.c:331
 #, c-format
 msgid "%s quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:382
+#: src/ats/gnunet-service-ats_plugins.c:377
 #, c-format
 msgid ""
 "No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:474
+#: src/ats/gnunet-service-ats_plugins.c:462
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
@@ -1470,44 +1470,44 @@ msgstr "# Bytes empfangen über TCP"
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1513
+#: src/core/gnunet-service-core_kx.c:1506
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1524
+#: src/core/gnunet-service-core_kx.c:1517
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1528
+#: src/core/gnunet-service-core_kx.c:1521
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1606
-#: src/core/gnunet-service-core_kx.c:1633
+#: src/core/gnunet-service-core_kx.c:1599
+#: src/core/gnunet-service-core_kx.c:1626
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1619
+#: src/core/gnunet-service-core_kx.c:1612
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1664
+#: src/core/gnunet-service-core_kx.c:1657
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1673
+#: src/core/gnunet-service-core_kx.c:1666
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
 #: src/core/gnunet-service-core_sessions.c:252
 #: src/core/gnunet-service-core_sessions.c:337
-#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1519
+#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1496
 #: src/topology/gnunet-daemon-topology.c:579
 #: src/topology/gnunet-daemon-topology.c:671
 #: src/transport/gnunet-service-transport_neighbours.c:723
@@ -1600,34 +1600,34 @@ msgstr "# empfangene Ergebnisse"
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1032
+#: src/datastore/datastore_api.c:1007
 #, fuzzy
 msgid "# PUT requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1093
+#: src/datastore/datastore_api.c:1068
 #, fuzzy
 msgid "# RESERVE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1158
+#: src/datastore/datastore_api.c:1113
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1236
+#: src/datastore/datastore_api.c:1171
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1295
+#: src/datastore/datastore_api.c:1230
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1357
+#: src/datastore/datastore_api.c:1276
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1438
+#: src/datastore/datastore_api.c:1357
 msgid "# GET requests executed"
 msgstr "# ausgeführte GET-Anfragen"
 
@@ -1962,46 +1962,46 @@ msgstr ""
 msgid "Result %d, type %d:\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:221
+#: src/dht/gnunet-dht-get.c:238
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:229 src/dht/gnunet-dht-hello.c:119
+#: src/dht/gnunet-dht-get.c:246 src/dht/gnunet-dht-hello.c:119
 #: src/dht/gnunet-dht-monitor.c:255
 #, c-format
 msgid "Failed to connect to DHT service!\n"
 msgstr "Verbindung zum DHT-Dienst ist fehlgeschlagen!\n"
 
-#: src/dht/gnunet-dht-get.c:239
+#: src/dht/gnunet-dht-get.c:256
 msgid "Issuing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:275 src/dht/gnunet-dht-monitor.c:302
+#: src/dht/gnunet-dht-get.c:292 src/dht/gnunet-dht-monitor.c:302
 #: src/dht/gnunet-dht-put.c:200
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:281
+#: src/dht/gnunet-dht-get.c:298
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:286 src/dht/gnunet-dht-put.c:217
+#: src/dht/gnunet-dht-get.c:303 src/dht/gnunet-dht-put.c:217
 msgid "use DHT's record route option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:292 src/dht/gnunet-dht-monitor.c:308
+#: src/dht/gnunet-dht-get.c:309 src/dht/gnunet-dht-monitor.c:308
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:298
+#: src/dht/gnunet-dht-get.c:315
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:304 src/dht/gnunet-dht-put.c:206
+#: src/dht/gnunet-dht-get.c:321 src/dht/gnunet-dht-put.c:206
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:321
+#: src/dht/gnunet-dht-get.c:338
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -2440,71 +2440,71 @@ msgstr ""
 msgid "# fragmentation transmissions completed"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/fs/fs_api.c:491
+#: src/fs/fs_api.c:480
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
 
-#: src/fs/fs_api.c:502
+#: src/fs/fs_api.c:491
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/fs_api.c:510
+#: src/fs/fs_api.c:499
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1173
+#: src/fs/fs_api.c:1156
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:1724
+#: src/fs/fs_api.c:1707
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1739
+#: src/fs/fs_api.c:1722
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2468
+#: src/fs/fs_api.c:2451
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2479
+#: src/fs/fs_api.c:2462
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2627 src/fs/fs_api.c:2873
+#: src/fs/fs_api.c:2610 src/fs/fs_api.c:2856
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2645
+#: src/fs/fs_api.c:2628
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2661 src/fs/fs_api.c:2681 src/fs/fs_api.c:3180
+#: src/fs/fs_api.c:2644 src/fs/fs_api.c:2664 src/fs/fs_api.c:3163
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2863
+#: src/fs/fs_api.c:2846
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3124
+#: src/fs/fs_api.c:3107
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3219
+#: src/fs/fs_api.c:3202
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2541,37 +2541,37 @@ msgstr "Datei wurde als `%s' gespeichert.\n"
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/fs/fs_download.c:1053
+#: src/fs/fs_download.c:1044
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %lu bytes at depth %u and "
 "offset %llu/%llu, got %lu bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1075
+#: src/fs/fs_download.c:1066
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1098
+#: src/fs/fs_download.c:1089
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:1109
+#: src/fs/fs_download.c:1100
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:1119
+#: src/fs/fs_download.c:1110
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1227
+#: src/fs/fs_download.c:1218
 msgid "internal error decoding tree"
 msgstr ""
 
-#: src/fs/fs_download.c:1899
+#: src/fs/fs_download.c:1890
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -2690,12 +2690,12 @@ msgstr "Verbindung fehlgeschlagen: %s\n"
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:218
+#: src/fs/fs_publish_ksk.c:212
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_publish_ublock.c:240
+#: src/fs/fs_publish_ublock.c:215
 #, fuzzy
 msgid "Internal error."
 msgstr "Unbekannter Fehler.\n"
@@ -3455,65 +3455,65 @@ msgstr "# Sitzungsschlüssel abgelehnt"
 msgid "# cadet connections active"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/fs/gnunet-service-fs_cp.c:680
+#: src/fs/gnunet-service-fs_cp.c:665
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:684
+#: src/fs/gnunet-service-fs_cp.c:669
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:717 src/fs/gnunet-service-fs_cp.c:1342
+#: src/fs/gnunet-service-fs_cp.c:702 src/fs/gnunet-service-fs_cp.c:1327
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:812
+#: src/fs/gnunet-service-fs_cp.c:797
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1009
+#: src/fs/gnunet-service-fs_cp.c:994
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1034
+#: src/fs/gnunet-service-fs_cp.c:1019
 #, fuzzy
 msgid "# request dropped, priority insufficient"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1044
+#: src/fs/gnunet-service-fs_cp.c:1029
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1141
+#: src/fs/gnunet-service-fs_cp.c:1126
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1199
+#: src/fs/gnunet-service-fs_cp.c:1184
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1223
+#: src/fs/gnunet-service-fs_cp.c:1208
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1237
+#: src/fs/gnunet-service-fs_cp.c:1222
 #, fuzzy
 msgid "# requests dropped due to full reply queue"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1294
+#: src/fs/gnunet-service-fs_cp.c:1279
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1338
+#: src/fs/gnunet-service-fs_cp.c:1323
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:1708
+#: src/fs/gnunet-service-fs_cp.c:1679
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
@@ -3534,26 +3534,26 @@ msgstr "Fehler beim Anlegen des Benutzers"
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:317
+#: src/fs/gnunet-service-fs_indexing.c:297
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:331
+#: src/fs/gnunet-service-fs_indexing.c:311
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Datei `%s' konnte nicht dekodiert werden bei %s:%d.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:335
+#: src/fs/gnunet-service-fs_indexing.c:315
 #, fuzzy
 msgid "not indexed"
 msgstr "Deindizierung schlug fehl."
 
-#: src/fs/gnunet-service-fs_indexing.c:349
+#: src/fs/gnunet-service-fs_indexing.c:329
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "FSUI Statusdatei `%s' hatte einen Syntaxfehler bei Offset %u.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:455
+#: src/fs/gnunet-service-fs_indexing.c:435
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3591,104 +3591,104 @@ msgstr "# dht Anfragen weitergeleitet"
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:325
+#: src/fs/gnunet-service-fs_pr.c:305
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/fs/gnunet-service-fs_pr.c:416 src/fs/gnunet-service-fs_pr.c:654
+#: src/fs/gnunet-service-fs_pr.c:396 src/fs/gnunet-service-fs_pr.c:626
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:829
+#: src/fs/gnunet-service-fs_pr.c:795
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:903
+#: src/fs/gnunet-service-fs_pr.c:869
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1037
+#: src/fs/gnunet-service-fs_pr.c:1003
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1066
+#: src/fs/gnunet-service-fs_pr.c:1032
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:1107
+#: src/fs/gnunet-service-fs_pr.c:1073
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1262
+#: src/fs/gnunet-service-fs_pr.c:1228
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1317
+#: src/fs/gnunet-service-fs_pr.c:1283
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1338
+#: src/fs/gnunet-service-fs_pr.c:1304
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1405
+#: src/fs/gnunet-service-fs_pr.c:1371
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1467
+#: src/fs/gnunet-service-fs_pr.c:1433
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1522
+#: src/fs/gnunet-service-fs_pr.c:1488
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1537
+#: src/fs/gnunet-service-fs_pr.c:1503
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1560
+#: src/fs/gnunet-service-fs_pr.c:1526
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1577
+#: src/fs/gnunet-service-fs_pr.c:1543
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1598
+#: src/fs/gnunet-service-fs_pr.c:1564
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1604
+#: src/fs/gnunet-service-fs_pr.c:1570
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1650
+#: src/fs/gnunet-service-fs_pr.c:1616
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1663
+#: src/fs/gnunet-service-fs_pr.c:1629
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1714
+#: src/fs/gnunet-service-fs_pr.c:1680
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1778
+#: src/fs/gnunet-service-fs_pr.c:1744
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_push.c:648
+#: src/fs/gnunet-service-fs_push.c:643
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -3816,11 +3816,11 @@ msgstr ""
 #: src/hostlist/gnunet-daemon-hostlist_client.c:544
 #: src/hostlist/gnunet-daemon-hostlist_client.c:772
 #: src/hostlist/gnunet-daemon-hostlist_client.c:781
-#: src/hostlist/gnunet-daemon-hostlist_client.c:836
-#: src/hostlist/gnunet-daemon-hostlist_client.c:848
-#: src/hostlist/gnunet-daemon-hostlist_client.c:964
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1066
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1074
+#: src/hostlist/gnunet-daemon-hostlist_client.c:835
+#: src/hostlist/gnunet-daemon-hostlist_client.c:847
+#: src/hostlist/gnunet-daemon-hostlist_client.c:957
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1059
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1067
 #: src/transport/plugin_transport_http_client.c:600
 #: src/transport/plugin_transport_http_client.c:618
 #, c-format
@@ -3872,59 +3872,59 @@ msgstr ""
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2658
+#: src/gns/gnunet-gns-proxy.c:2653
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/gns/gnunet-gns-proxy.c:2690
+#: src/gns/gnunet-gns-proxy.c:2685
 #, fuzzy, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2899
+#: src/gns/gnunet-gns-proxy.c:2894
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2923 src/rest/gnunet-rest-server.c:917
+#: src/gns/gnunet-gns-proxy.c:2918 src/rest/gnunet-rest-server.c:917
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3272
+#: src/gns/gnunet-gns-proxy.c:3267
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3304
+#: src/gns/gnunet-gns-proxy.c:3299
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3390
+#: src/gns/gnunet-gns-proxy.c:3385
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3731
+#: src/gns/gnunet-gns-proxy.c:3726
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gns/gnunet-gns-proxy.c:3865
+#: src/gns/gnunet-gns-proxy.c:3860
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3870
+#: src/gns/gnunet-gns-proxy.c:3865
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3874
+#: src/gns/gnunet-gns-proxy.c:3869
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3900
+#: src/gns/gnunet-gns-proxy.c:3895
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -3996,7 +3996,7 @@ msgstr "Verbindung zu gnunetd konnte nicht hergestellt 
werden.\n"
 msgid "Error converting GNS response to DNS response!\n"
 msgstr "Fehler beim Konvertieren von Parametern in URI!\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:386
+#: src/gns/gnunet-service-gns_interceptor.c:380
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
@@ -4016,50 +4016,50 @@ msgstr ""
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:904
+#: src/gns/gnunet-service-gns_resolver.c:903
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1095
+#: src/gns/gnunet-service-gns_resolver.c:1094
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1871
+#: src/gns/gnunet-service-gns_resolver.c:1870
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1886
+#: src/gns/gnunet-service-gns_resolver.c:1885
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1926
+#: src/gns/gnunet-service-gns_resolver.c:1918
 #, fuzzy, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2328
+#: src/gns/gnunet-service-gns_resolver.c:2320
 msgid "Unable to process critical delegation record\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2333
+#: src/gns/gnunet-service-gns_resolver.c:2325
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2356
+#: src/gns/gnunet-service-gns_resolver.c:2348
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2523
+#: src/gns/gnunet-service-gns_resolver.c:2515
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2671
+#: src/gns/gnunet-service-gns_resolver.c:2663
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
@@ -4332,7 +4332,7 @@ msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# Hellos per HTTP heruntergeladen"
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:677
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1460
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4348,117 +4348,117 @@ msgid ""
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:893
+#: src/hostlist/gnunet-daemon-hostlist_client.c:886
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:908
+#: src/hostlist/gnunet-daemon-hostlist_client.c:901
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:928
+#: src/hostlist/gnunet-daemon-hostlist_client.c:921
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:934
+#: src/hostlist/gnunet-daemon-hostlist_client.c:927
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:942
+#: src/hostlist/gnunet-daemon-hostlist_client.c:935
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:998
+#: src/hostlist/gnunet-daemon-hostlist_client.c:991
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1007
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1000
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1144
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1732
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1137
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1725
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1154
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1147
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1212
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1233
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1205
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1226
 #, fuzzy
 msgid "# active connections"
 msgstr "GNUnet Konfiguration"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1396
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1389
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1394
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Fehler beim Löschen des Pseudonyms `%s' (existiert nicht?).\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1412
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1405
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 "`%s' konnte nicht aufgelöst werden, um unsere IP-Adresse zu ermitteln: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1446
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1456
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1449
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1500
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 "Datei `%s' konnte nicht zu `%s' umbenannt werden: Datei existiert bereits\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1514
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1547
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1566
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1540
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1559
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1560
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1553
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1661
-#: src/transport/plugin_transport_http_client.c:2300
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1654
+#: src/transport/plugin_transport_http_client.c:2294
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1690
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1683
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1703
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1696
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1717
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1710
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4531,7 +4531,7 @@ msgid "# hostlist advertisements send"
 msgstr "# Bekanntmachungen von anderen übertragen"
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:674
-#: src/transport/gnunet-service-transport.c:2662
+#: src/transport/gnunet-service-transport.c:2657
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
@@ -4697,7 +4697,7 @@ msgstr "Fehler beim Speichern der Konfigurationsdatei 
`%s':"
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/identity/plugin_rest_identity.c:1401
+#: src/identity/plugin_rest_identity.c:1529
 msgid "Identity REST API initialized\n"
 msgstr ""
 
@@ -5453,7 +5453,7 @@ msgstr "Fehler beim Starten der Collection.\n"
 msgid "`external-ip' command not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat/gnunet-service-nat_mini.c:607
+#: src/nat/gnunet-service-nat_mini.c:602
 #, fuzzy
 msgid "`upnpc' command not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
@@ -5748,51 +5748,46 @@ msgstr ""
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:209
-#, fuzzy, c-format
-msgid "Invalid DID `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/reclaim/gnunet-did.c:835
+#: src/reclaim/gnunet-did.c:591
 msgid "Create a DID Document and display its DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:840
+#: src/reclaim/gnunet-did.c:596
 msgid "Get the DID Document associated with the given DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:844
-msgid "Show the DID for a given ego"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:849
+#: src/reclaim/gnunet-did.c:601
 msgid "Remove the DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:853 src/reclaim/gnunet-did.c:857
+#: src/reclaim/gnunet-did.c:605
 msgid "Replace the DID Document."
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:863
+#: src/reclaim/gnunet-did.c:609
+msgid "Show the DID for a given ego"
+msgstr ""
+
+#: src/reclaim/gnunet-did.c:613
+msgid "Show egos with DIDs"
+msgstr ""
+
+#: src/reclaim/gnunet-did.c:619
 msgid "The Decentralized Identity (DID)"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:869
+#: src/reclaim/gnunet-did.c:625
 msgid "The DID Document to store in GNUNET"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:874
+#: src/reclaim/gnunet-did.c:630
 msgid "The name of the EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:880
+#: src/reclaim/gnunet-did.c:636
 msgid "The time until the DID Document is going to expire (e.g. 5d)"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:889
-msgid "Manage Decentralized Identities (DIDs)"
-msgstr ""
-
 #: src/reclaim/gnunet-reclaim.c:802
 #, fuzzy, c-format
 msgid "Ego is required\n"
@@ -5900,56 +5895,56 @@ msgstr ""
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1388
+#: src/regex/gnunet-regex-profiler.c:1366
 msgid "No configuration file given. Exiting\n"
 msgstr "Keine Konfigurationsdatei angegeben. Abbruch\n"
 
-#: src/regex/gnunet-regex-profiler.c:1430
+#: src/regex/gnunet-regex-profiler.c:1408
 #: src/regex/gnunet-regex-simulation-profiler.c:631
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1436
+#: src/regex/gnunet-regex-profiler.c:1414
 #: src/regex/gnunet-regex-simulation-profiler.c:639
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1444
+#: src/regex/gnunet-regex-profiler.c:1422
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr "Keine Dateien in »%s« gefunden\n"
 
-#: src/regex/gnunet-regex-profiler.c:1453
+#: src/regex/gnunet-regex-profiler.c:1431
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1473
+#: src/regex/gnunet-regex-profiler.c:1451
 msgid "Error loading search strings. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1562
+#: src/regex/gnunet-regex-profiler.c:1540
 msgid "name of the file for writing statistics"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1569
+#: src/regex/gnunet-regex-profiler.c:1547
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1575
+#: src/regex/gnunet-regex-profiler.c:1553
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1582
+#: src/regex/gnunet-regex-profiler.c:1560
 msgid "name of file with input strings"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1589
+#: src/regex/gnunet-regex-profiler.c:1567
 msgid "name of file with hosts' names"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1604
+#: src/regex/gnunet-regex-profiler.c:1582
 msgid "Profiler for regex"
 msgstr ""
 
@@ -6891,7 +6886,7 @@ msgstr ""
 #: src/transport/gnunet-communicator-tcp.c:3342
 #: src/transport/gnunet-communicator-udp.c:3867
 #: src/transport/gnunet-service-tng.c:11039
-#: src/transport/gnunet-service-transport.c:2627
+#: src/transport/gnunet-service-transport.c:2622
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
@@ -6945,21 +6940,21 @@ msgid "# bytes payload received"
 msgstr "# Bytes Nutzdaten empfangen"
 
 #: src/transport/gnunet-service-transport.c:2019
-#: src/transport/gnunet-service-transport.c:2453
+#: src/transport/gnunet-service-transport.c:2448
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2457
+#: src/transport/gnunet-service-transport.c:2452
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/transport/gnunet-service-transport.c:2552
+#: src/transport/gnunet-service-transport.c:2547
 #, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2561
+#: src/transport/gnunet-service-transport.c:2556
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
@@ -7478,24 +7473,24 @@ msgstr ""
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2140
+#: src/transport/plugin_transport_http_client.c:2134
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2189
+#: src/transport/plugin_transport_http_client.c:2183
 #: src/transport/plugin_transport_http_server.c:3276
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/transport/plugin_transport_http_client.c:2206
+#: src/transport/plugin_transport_http_client.c:2200
 #: src/transport/plugin_transport_http_server.c:3346
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
 
-#: src/transport/plugin_transport_http_client.c:2240
+#: src/transport/plugin_transport_http_client.c:2234
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "Maximale Anzahl der Verbindungen ist %u\n"
@@ -8005,81 +8000,81 @@ msgstr "Konfigurationsdatei `%s' konnte nicht geparst 
werden.\n"
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:227 src/util/bio.c:235
+#: src/util/bio.c:228 src/util/bio.c:236
 #, fuzzy, c-format
 msgid "Error reading `%s' from file: %s"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/util/bio.c:237
+#: src/util/bio.c:238
 msgid "End of file"
 msgstr "Dateiende"
 
-#: src/util/bio.c:266
+#: src/util/bio.c:267
 #, fuzzy, c-format
 msgid "Error while reading `%s' from buffer: %s"
 msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
 
-#: src/util/bio.c:268
+#: src/util/bio.c:269
 msgid "Not enough data left"
 msgstr ""
 
-#: src/util/bio.c:308
+#: src/util/bio.c:309
 #, fuzzy, c-format
 msgid "Invalid handle type while reading `%s'"
 msgstr "Ungültiges Befehlszeilenargument »%s«\n"
 
-#: src/util/bio.c:335 src/util/bio.c:839
+#: src/util/bio.c:336 src/util/bio.c:840
 msgid "string length"
 msgstr ""
 
-#: src/util/bio.c:341
+#: src/util/bio.c:342
 #, fuzzy, c-format
 msgid "%s (while reading `%s')"
 msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
 
-#: src/util/bio.c:346
+#: src/util/bio.c:347
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:359
+#: src/util/bio.c:360
 #, c-format
 msgid "String `%s' longer than allowed (%u > %lu)"
 msgstr ""
 
-#: src/util/bio.c:398 src/util/bio.c:864 src/util/bio.c:881
+#: src/util/bio.c:399 src/util/bio.c:865 src/util/bio.c:882
 msgid "metadata length"
 msgstr ""
 
-#: src/util/bio.c:410
+#: src/util/bio.c:411
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:426
+#: src/util/bio.c:427
 #, fuzzy, c-format
 msgid "Failed to deserialize metadata `%s'"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/util/bio.c:668
+#: src/util/bio.c:669
 msgid "Unable to flush buffer to file"
 msgstr ""
 
-#: src/util/bio.c:730 src/util/bio.c:751
+#: src/util/bio.c:731 src/util/bio.c:752
 #, fuzzy, c-format
 msgid "Error while writing `%s' to file: %s"
 msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
 
-#: src/util/bio.c:732
+#: src/util/bio.c:733
 msgid "No associated file"
 msgstr ""
 
-#: src/util/bio.c:816
+#: src/util/bio.c:817
 #, fuzzy, c-format
 msgid "Invalid handle type while writing `%s'"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/util/bio.c:876
+#: src/util/bio.c:877
 #, fuzzy, c-format
 msgid "Failed to serialize metadata `%s'"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
@@ -8088,7 +8083,7 @@ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:1106
+#: src/util/client.c:1095
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -8098,55 +8093,55 @@ msgstr ""
 msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:926
+#: src/util/common_logging.c:911
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1131
+#: src/util/common_logging.c:1104
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: src/util/common_logging.c:1133
+#: src/util/common_logging.c:1106
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: src/util/common_logging.c:1135
+#: src/util/common_logging.c:1108
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:1137
+#: src/util/common_logging.c:1110
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:1139
+#: src/util/common_logging.c:1112
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:1141
+#: src/util/common_logging.c:1114
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:1142
+#: src/util/common_logging.c:1115
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1423
+#: src/util/common_logging.c:1396
 msgid "unknown address"
 msgstr "Unbekannte Adresse"
 
-#: src/util/common_logging.c:1468
+#: src/util/common_logging.c:1441
 msgid "invalid address"
 msgstr "Ungültige Adresse"
 
-#: src/util/common_logging.c:1487
+#: src/util/common_logging.c:1453
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/util/common_logging.c:1510
+#: src/util/common_logging.c:1468
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8242,7 +8237,7 @@ msgstr ""
 msgid "failed to load configuration defaults"
 msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
 
-#: src/util/container_bloomfilter.c:542
+#: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -8254,17 +8249,17 @@ msgstr ""
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/util/crypto_ecc.c:669
+#: src/util/crypto_ecc.c:689
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/util/crypto_ecc_setup.c:280
+#: src/util/crypto_ecc_setup.c:272
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/util/crypto_random.c:385
+#: src/util/crypto_random.c:372
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
@@ -8786,18 +8781,18 @@ msgstr ""
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Initialisierung des Plugin-Mechanismus fehlgeschlagen: %s!\n"
 
-#: src/util/plugin.c:156
+#: src/util/plugin.c:157
 #, fuzzy, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 "`%s' konnte die Methode '%s%s' nicht auflösen. Ort: %s:%d. Fehler: %s\n"
 
-#: src/util/plugin.c:234
+#: src/util/plugin.c:214
 #, fuzzy, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "`%s' fehlgeschlagen für die Bibliothek `%s'. Ort: %s:%d. Fehler: %s\n"
 
-#: src/util/plugin.c:414
+#: src/util/plugin.c:370
 #, fuzzy
 msgid "Could not determine plugin installation path.\n"
 msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
@@ -9146,6 +9141,10 @@ msgstr "Tunnel über VPN einrichten."
 msgid "Failed to connect to the namestore!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
+#, fuzzy, c-format
+#~ msgid "Invalid DID `%s'\n"
+#~ msgstr "Ungültiger Parameter: `%s'\n"
+
 #, fuzzy, c-format
 #~ msgid "Block not of type %u\n"
 #~ msgstr "Kein Transport des Typs %d bekannt.\n"
diff --git a/po/es.po b/po/es.po
index 06f2743e4..57e5ce6f7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-08-05 13:57+0200\n"
+"POT-Creation-Date: 2022-09-04 11:01+0200\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <rosen644835@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -713,7 +713,7 @@ msgstr "guarda protocolo al fichero en disco"
 msgid "disable normalization"
 msgstr "deshabilita normalización"
 
-#: src/ats/gnunet-service-ats_plugins.c:326
+#: src/ats/gnunet-service-ats_plugins.c:321
 #, fuzzy, c-format
 msgid ""
 "Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
@@ -723,12 +723,12 @@ msgstr ""
 "de banda predeterminado %llu\n"
 
 # Miguel: "Inbound" lo he traducido como entrada en todo el texto.
-#: src/ats/gnunet-service-ats_plugins.c:336
+#: src/ats/gnunet-service-ats_plugins.c:331
 #, fuzzy, c-format
 msgid "%s quota configured for network `%s' is %llu\n"
 msgstr "La cuota de entrada configurada para la red «%s» es %llu\n"
 
-#: src/ats/gnunet-service-ats_plugins.c:382
+#: src/ats/gnunet-service-ats_plugins.c:377
 #, fuzzy, c-format
 msgid ""
 "No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
@@ -736,7 +736,7 @@ msgstr ""
 "No hay configurada una cuota de salida para la red «%s», asignando el ancho "
 "de banda predeterminado %llu\n"
 
-#: src/ats/gnunet-service-ats_plugins.c:474
+#: src/ats/gnunet-service-ats_plugins.c:462
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "¡No se puede inicializar el resolvedor!\n"
@@ -1542,42 +1542,42 @@ msgstr "# bytes recibidos vía TCP"
 msgid "# rekey operations confirmed via PONG"
 msgstr "# operaciones de cambio de clave confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1513
+#: src/core/gnunet-service-core_kx.c:1506
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1524
+#: src/core/gnunet-service-core_kx.c:1517
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1528
+#: src/core/gnunet-service-core_kx.c:1521
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1606
-#: src/core/gnunet-service-core_kx.c:1633
+#: src/core/gnunet-service-core_kx.c:1599
+#: src/core/gnunet-service-core_kx.c:1626
 msgid "# bytes dropped (duplicates)"
 msgstr "# bytes omitidos (duplicados)"
 
-#: src/core/gnunet-service-core_kx.c:1619
+#: src/core/gnunet-service-core_kx.c:1612
 msgid "# bytes dropped (out of sequence)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1664
+#: src/core/gnunet-service-core_kx.c:1657
 msgid "# bytes dropped (ancient message)"
 msgstr "# bytes omitidos (mensaje antiguo)"
 
-#: src/core/gnunet-service-core_kx.c:1673
+#: src/core/gnunet-service-core_kx.c:1666
 msgid "# bytes of payload decrypted"
 msgstr "# bytes de «payload» descifrados"
 
 #: src/core/gnunet-service-core_sessions.c:252
 #: src/core/gnunet-service-core_sessions.c:337
-#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1519
+#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1496
 #: src/topology/gnunet-daemon-topology.c:579
 #: src/topology/gnunet-daemon-topology.c:671
 #: src/transport/gnunet-service-transport_neighbours.c:723
@@ -1668,31 +1668,31 @@ msgstr "# Resultados recibidos"
 msgid "# datastore connections (re)created"
 msgstr "# conexiones a almacenes de datos (re)creadas"
 
-#: src/datastore/datastore_api.c:1032
+#: src/datastore/datastore_api.c:1007
 msgid "# PUT requests executed"
 msgstr "# peticiones «PUT» ejecutadas"
 
-#: src/datastore/datastore_api.c:1093
+#: src/datastore/datastore_api.c:1068
 msgid "# RESERVE requests executed"
 msgstr "# peticiones «RESERVE» ejecutadas"
 
-#: src/datastore/datastore_api.c:1158
+#: src/datastore/datastore_api.c:1113
 msgid "# RELEASE RESERVE requests executed"
 msgstr "# Peticiones «RELEASE RESERVE» ejecutadas"
 
-#: src/datastore/datastore_api.c:1236
+#: src/datastore/datastore_api.c:1171
 msgid "# REMOVE requests executed"
 msgstr "# peticiones «REMOVE» ejecutadas"
 
-#: src/datastore/datastore_api.c:1295
+#: src/datastore/datastore_api.c:1230
 msgid "# GET REPLICATION requests executed"
 msgstr "# peticiones «GET REPLICATION» ejecutadas"
 
-#: src/datastore/datastore_api.c:1357
+#: src/datastore/datastore_api.c:1276
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr "# peticiones «GET ZERO ANONYMITY» ejecutadas"
 
-#: src/datastore/datastore_api.c:1438
+#: src/datastore/datastore_api.c:1357
 msgid "# GET requests executed"
 msgstr "# peticiones «GET» ejecutadas"
 
@@ -2046,48 +2046,48 @@ msgstr ""
 "Resultado %d, tipo %d:\n"
 "%.*s\n"
 
-#: src/dht/gnunet-dht-get.c:221
+#: src/dht/gnunet-dht-get.c:238
 msgid "Must provide key for DHT GET!\n"
 msgstr "¡Se debe proveer una clave para el «GET» DHT!\n"
 
-#: src/dht/gnunet-dht-get.c:229 src/dht/gnunet-dht-hello.c:119
+#: src/dht/gnunet-dht-get.c:246 src/dht/gnunet-dht-hello.c:119
 #: src/dht/gnunet-dht-monitor.c:255
 #, c-format
 msgid "Failed to connect to DHT service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
 
-#: src/dht/gnunet-dht-get.c:239
+#: src/dht/gnunet-dht-get.c:256
 #, fuzzy
 msgid "Issuing DHT GET with key"
 msgstr "Enviando un «GET» DHT con clave"
 
-#: src/dht/gnunet-dht-get.c:275 src/dht/gnunet-dht-monitor.c:302
+#: src/dht/gnunet-dht-get.c:292 src/dht/gnunet-dht-monitor.c:302
 #: src/dht/gnunet-dht-put.c:200
 msgid "the query key"
 msgstr "la clave de búsqueda"
 
-#: src/dht/gnunet-dht-get.c:281
+#: src/dht/gnunet-dht-get.c:298
 msgid "how many parallel requests (replicas) to create"
 msgstr "cuantas peticiones paralelas (réplicas) crear"
 
-#: src/dht/gnunet-dht-get.c:286 src/dht/gnunet-dht-put.c:217
+#: src/dht/gnunet-dht-get.c:303 src/dht/gnunet-dht-put.c:217
 #, fuzzy
 msgid "use DHT's record route option"
 msgstr "opción para usar el demultiplexado de la DHT siempre"
 
-#: src/dht/gnunet-dht-get.c:292 src/dht/gnunet-dht-monitor.c:308
+#: src/dht/gnunet-dht-get.c:309 src/dht/gnunet-dht-monitor.c:308
 msgid "the type of data to look for"
 msgstr "el tipo de datos a buscar"
 
-#: src/dht/gnunet-dht-get.c:298
+#: src/dht/gnunet-dht-get.c:315
 msgid "how long to execute this query before giving up?"
 msgstr "¿cuánto tiempo se debe ejecutar esta consulta antes de abandonar?"
 
-#: src/dht/gnunet-dht-get.c:304 src/dht/gnunet-dht-put.c:206
+#: src/dht/gnunet-dht-get.c:321 src/dht/gnunet-dht-put.c:206
 msgid "use DHT's demultiplex everywhere option"
 msgstr "opción para usar el demultiplexado de la DHT siempre"
 
-#: src/dht/gnunet-dht-get.c:321
+#: src/dht/gnunet-dht-get.c:338
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 "Iniciando una peticion «GET» a la DHT de GNUnet, imprimiendo resultados."
@@ -2532,79 +2532,79 @@ msgstr "# bits eliminados de reconocimientos de 
fragmentos"
 msgid "# fragmentation transmissions completed"
 msgstr "# transmisiones de fragmentos completadas"
 
-#: src/fs/fs_api.c:491
+#: src/fs/fs_api.c:480
 #, c-format
 msgid "Could not open file `%s': %s"
 msgstr "No se pudo abrir el fichero «%s»: %s"
 
-#: src/fs/fs_api.c:502
+#: src/fs/fs_api.c:491
 #, c-format
 msgid "Could not read file `%s': %s"
 msgstr "No se pudo leer el fichero «%s»: %s"
 
 # Short read??
-#: src/fs/fs_api.c:510
+#: src/fs/fs_api.c:499
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr "¡Lectura corta leyendo del fichero «%s»!"
 
-#: src/fs/fs_api.c:1173
+#: src/fs/fs_api.c:1156
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:1724
+#: src/fs/fs_api.c:1707
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr "Fallo mientras se reiniciaba la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:1739
+#: src/fs/fs_api.c:1722
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:2468
+#: src/fs/fs_api.c:2451
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 "Se produjo un fallo mientras se retomaba la operación de publicación «%s»: "
 "%s\n"
 
-#: src/fs/fs_api.c:2479
+#: src/fs/fs_api.c:2462
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de desindexado «%s»: %s\n"
 
-#: src/fs/fs_api.c:2627 src/fs/fs_api.c:2873
+#: src/fs/fs_api.c:2610 src/fs/fs_api.c:2856
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la sub-descarga «%s»: %s\n"
 
-#: src/fs/fs_api.c:2645
+#: src/fs/fs_api.c:2628
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la sub-búsqueda «%s»: %s\n"
 
-#: src/fs/fs_api.c:2661 src/fs/fs_api.c:2681 src/fs/fs_api.c:3180
+#: src/fs/fs_api.c:2644 src/fs/fs_api.c:2664 src/fs/fs_api.c:3163
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 "Se produjo un fallo mientras se retomaba la operación de búsqueda «%s»: %s\n"
 
-#: src/fs/fs_api.c:2863
+#: src/fs/fs_api.c:2846
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 "Se produjo un fallo al retomar la sub-descarga «%s»: no se pudo abrir el "
 "fichero «%s»\n"
 
-#: src/fs/fs_api.c:3124
+#: src/fs/fs_api.c:3107
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 "No se pudo retomar la búsqueda en ejecución, se retomará como una búsqueda "
 "en pausa\n"
 
-#: src/fs/fs_api.c:3219
+#: src/fs/fs_api.c:3202
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2648,7 +2648,7 @@ msgstr ""
 "Se produjo un fallo al crear el directorio para la descarga recursiva de "
 "«%s»\n"
 
-#: src/fs/fs_download.c:1053
+#: src/fs/fs_download.c:1044
 #, fuzzy, c-format
 msgid ""
 "Internal error or bogus download URI (expected %lu bytes at depth %u and "
@@ -2657,33 +2657,33 @@ msgstr ""
 "Error interno o URI de descarga defectuosa (se esperaban %u bytes a "
 "profundidad %u y desplazamiento %llu/%llu, se obtuvieron %u bytes)"
 
-#: src/fs/fs_download.c:1075
+#: src/fs/fs_download.c:1066
 msgid "internal error decrypting content"
 msgstr "error interno descifrando el contenido"
 
-#: src/fs/fs_download.c:1098
+#: src/fs/fs_download.c:1089
 #, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Descarga fallida: no se pudo abrir el fichero «%s»: %s"
 
-#: src/fs/fs_download.c:1109
+#: src/fs/fs_download.c:1100
 #, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr ""
 "Se produjo un fallo al buscar en el desplazamiento %llu del fichero «%s»: %s"
 
-#: src/fs/fs_download.c:1119
+#: src/fs/fs_download.c:1110
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
 "Se produjo un fallo al escribir el bloque de %u bytes en el desplazamiento "
 "%llu del fichero «%s»: %s"
 
-#: src/fs/fs_download.c:1227
+#: src/fs/fs_download.c:1218
 msgid "internal error decoding tree"
 msgstr "error interno decodificando árbol"
 
-#: src/fs/fs_download.c:1899
+#: src/fs/fs_download.c:1890
 msgid "Invalid URI"
 msgstr "URI no válida"
 
@@ -2802,11 +2802,11 @@ msgstr "# «PUT» en el almacén de datos fallidos"
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr "Reservando espacio para %u entradas y %llu bytes para publicación\n"
 
-#: src/fs/fs_publish_ksk.c:218
+#: src/fs/fs_publish_ksk.c:212
 msgid "Could not connect to datastore."
 msgstr "No se pudo conectar con el almacén de datos."
 
-#: src/fs/fs_publish_ublock.c:240
+#: src/fs/fs_publish_ublock.c:215
 msgid "Internal error."
 msgstr "Error interno."
 
@@ -3591,61 +3591,61 @@ msgstr "# conexiones de clientes «stream» rechazadas"
 msgid "# cadet connections active"
 msgstr "# conexiones «stream» activas"
 
-#: src/fs/gnunet-service-fs_cp.c:680
+#: src/fs/gnunet-service-fs_cp.c:665
 msgid "# migration stop messages received"
 msgstr "# mensajes de detención de migración recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:684
+#: src/fs/gnunet-service-fs_cp.c:669
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr "Migración de contenido al par «%s» bloqueada durante %s\n"
 
-#: src/fs/gnunet-service-fs_cp.c:717 src/fs/gnunet-service-fs_cp.c:1342
+#: src/fs/gnunet-service-fs_cp.c:702 src/fs/gnunet-service-fs_cp.c:1327
 msgid "# P2P searches active"
 msgstr "# busquedas P2P activas"
 
-#: src/fs/gnunet-service-fs_cp.c:812
+#: src/fs/gnunet-service-fs_cp.c:797
 msgid "# artificial delays introduced (ms)"
 msgstr "# retardos artificiales introducidos (ms)"
 
-#: src/fs/gnunet-service-fs_cp.c:1009
+#: src/fs/gnunet-service-fs_cp.c:994
 msgid "# requests done for free (low load)"
 msgstr "# peticiones realizadas gratuitamente (baja carga)"
 
-#: src/fs/gnunet-service-fs_cp.c:1034
+#: src/fs/gnunet-service-fs_cp.c:1019
 msgid "# request dropped, priority insufficient"
 msgstr "# peticiones omitidas, prioridad insuficiente"
 
-#: src/fs/gnunet-service-fs_cp.c:1044
+#: src/fs/gnunet-service-fs_cp.c:1029
 msgid "# requests done for a price (normal load)"
 msgstr "# peticiones realizadas por un precio (carga normal)"
 
-#: src/fs/gnunet-service-fs_cp.c:1141
+#: src/fs/gnunet-service-fs_cp.c:1126
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# peticiones omitidas debido a una petición de mayor TTL"
 
-#: src/fs/gnunet-service-fs_cp.c:1199
+#: src/fs/gnunet-service-fs_cp.c:1184
 msgid "# GET requests received (from other peers)"
 msgstr "# peticiones «GET» recibidas (de otros pares)"
 
-#: src/fs/gnunet-service-fs_cp.c:1223
+#: src/fs/gnunet-service-fs_cp.c:1208
 msgid "# requests dropped due to missing reverse route"
 msgstr "# peticiones omitidas debido a falta de ruta inversa"
 
-#: src/fs/gnunet-service-fs_cp.c:1237
+#: src/fs/gnunet-service-fs_cp.c:1222
 #, fuzzy
 msgid "# requests dropped due to full reply queue"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
-#: src/fs/gnunet-service-fs_cp.c:1294
+#: src/fs/gnunet-service-fs_cp.c:1279
 msgid "# requests dropped due TTL underflow"
 msgstr "# peticiones omitidas debido a expiración del TTL"
 
-#: src/fs/gnunet-service-fs_cp.c:1338
+#: src/fs/gnunet-service-fs_cp.c:1323
 msgid "# P2P query messages received and processed"
 msgstr "# mensajes de búsqueda P2P recibidos y procesados"
 
-#: src/fs/gnunet-service-fs_cp.c:1708
+#: src/fs/gnunet-service-fs_cp.c:1679
 msgid "# migration stop messages sent"
 msgstr "# mensajes de detención de migración enviados"
 
@@ -3665,27 +3665,27 @@ msgstr "Error escribiendo «%s».\n"
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Se produjo un fallo al eliminar el bloque defectuoso: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:317
+#: src/fs/gnunet-service-fs_indexing.c:297
 msgid "# index blocks removed: original file inaccessible"
 msgstr "# bloques de índice eliminados: fichero original inaccesible"
 
-#: src/fs/gnunet-service-fs_indexing.c:331
+#: src/fs/gnunet-service-fs_indexing.c:311
 #, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
 "No se pudo acceder al fichero indexado «%s» (%s) en el desplazamiento %llu: "
 "%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:335
+#: src/fs/gnunet-service-fs_indexing.c:315
 msgid "not indexed"
 msgstr "no indexado"
 
-#: src/fs/gnunet-service-fs_indexing.c:349
+#: src/fs/gnunet-service-fs_indexing.c:329
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "El fichero indexado «%s» ha cambiado en el desplazamiento %llu\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:455
+#: src/fs/gnunet-service-fs_indexing.c:435
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3725,99 +3725,99 @@ msgstr "# peticiones refrescadas"
 msgid "# query plan entries"
 msgstr "# entradas de planes de búsqueda"
 
-#: src/fs/gnunet-service-fs_pr.c:325
+#: src/fs/gnunet-service-fs_pr.c:305
 msgid "# Pending requests created"
 msgstr "# Peticiones pendientes creadas"
 
-#: src/fs/gnunet-service-fs_pr.c:416 src/fs/gnunet-service-fs_pr.c:654
+#: src/fs/gnunet-service-fs_pr.c:396 src/fs/gnunet-service-fs_pr.c:626
 msgid "# Pending requests active"
 msgstr "# Peticiones pendientes activas"
 
-#: src/fs/gnunet-service-fs_pr.c:829
+#: src/fs/gnunet-service-fs_pr.c:795
 msgid "# replies received and matched"
 msgstr "# respuestas recibidas y asociadas"
 
-#: src/fs/gnunet-service-fs_pr.c:903
+#: src/fs/gnunet-service-fs_pr.c:869
 msgid "# results found locally"
 msgstr "# resultados hallados localmente"
 
-#: src/fs/gnunet-service-fs_pr.c:1037
+#: src/fs/gnunet-service-fs_pr.c:1003
 msgid "# Datastore `PUT' failures"
 msgstr "# «PUT» en el almacén de datos fallidos"
 
-#: src/fs/gnunet-service-fs_pr.c:1066
+#: src/fs/gnunet-service-fs_pr.c:1032
 msgid "# storage requests dropped due to high load"
 msgstr "# peticiones de almacenamiento omitidas debido a alta carga"
 
-#: src/fs/gnunet-service-fs_pr.c:1107
+#: src/fs/gnunet-service-fs_pr.c:1073
 msgid "# Replies received from DHT"
 msgstr "# Respuestas recibidas de la DHT"
 
-#: src/fs/gnunet-service-fs_pr.c:1262
+#: src/fs/gnunet-service-fs_pr.c:1228
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# Respuestas recibidas de la DHT"
 
-#: src/fs/gnunet-service-fs_pr.c:1317
+#: src/fs/gnunet-service-fs_pr.c:1283
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr "¡La búsqueda en el almacén de datos toma %s!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1338
+#: src/fs/gnunet-service-fs_pr.c:1304
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr "¡La búsqueda en bajo demanda toma %s!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1405
+#: src/fs/gnunet-service-fs_pr.c:1371
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr "# «DBLOCK» o «IBLOCK» pedido no encontrado"
 
-#: src/fs/gnunet-service-fs_pr.c:1467
+#: src/fs/gnunet-service-fs_pr.c:1433
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (error encolando)"
 
-#: src/fs/gnunet-service-fs_pr.c:1522
+#: src/fs/gnunet-service-fs_pr.c:1488
 msgid "# Datastore lookups concluded (no results)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (sin resultados)"
 
-#: src/fs/gnunet-service-fs_pr.c:1537
+#: src/fs/gnunet-service-fs_pr.c:1503
 msgid "# Datastore lookups concluded (seen all)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (vistos todos)"
 
-#: src/fs/gnunet-service-fs_pr.c:1560
+#: src/fs/gnunet-service-fs_pr.c:1526
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (más de «MAX_RESULTS»)"
 
-#: src/fs/gnunet-service-fs_pr.c:1577
+#: src/fs/gnunet-service-fs_pr.c:1543
 msgid "# on-demand blocks matched requests"
 msgstr "# peticiones asociadas de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1598
+#: src/fs/gnunet-service-fs_pr.c:1564
 msgid "# on-demand lookups performed successfully"
 msgstr "# búsquedas satisfactorias de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1604
+#: src/fs/gnunet-service-fs_pr.c:1570
 msgid "# on-demand lookups failed"
 msgstr "# búsquedas fallidas de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1650
+#: src/fs/gnunet-service-fs_pr.c:1616
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 "# Búsquedas en el almacén de datos finalizadas (encontrado último resultado)"
 
-#: src/fs/gnunet-service-fs_pr.c:1663
+#: src/fs/gnunet-service-fs_pr.c:1629
 msgid "# Datastore lookups concluded (load too high)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (carga demasiado alta)"
 
-#: src/fs/gnunet-service-fs_pr.c:1714
+#: src/fs/gnunet-service-fs_pr.c:1680
 msgid "# Datastore lookups initiated"
 msgstr "# Búsquedas en el almacén de datos iniciadas"
 
-#: src/fs/gnunet-service-fs_pr.c:1778
+#: src/fs/gnunet-service-fs_pr.c:1744
 msgid "# GAP PUT messages received"
 msgstr "# Mensajes «GAP PUT» recibidos"
 
-#: src/fs/gnunet-service-fs_push.c:648
+#: src/fs/gnunet-service-fs_push.c:643
 msgid "time required, content pushing disabled"
 msgstr "se requiere tiempo, publicación de contenido deshabilitada"
 
@@ -3945,11 +3945,11 @@ msgstr ""
 #: src/hostlist/gnunet-daemon-hostlist_client.c:544
 #: src/hostlist/gnunet-daemon-hostlist_client.c:772
 #: src/hostlist/gnunet-daemon-hostlist_client.c:781
-#: src/hostlist/gnunet-daemon-hostlist_client.c:836
-#: src/hostlist/gnunet-daemon-hostlist_client.c:848
-#: src/hostlist/gnunet-daemon-hostlist_client.c:964
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1066
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1074
+#: src/hostlist/gnunet-daemon-hostlist_client.c:835
+#: src/hostlist/gnunet-daemon-hostlist_client.c:847
+#: src/hostlist/gnunet-daemon-hostlist_client.c:957
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1059
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1067
 #: src/transport/plugin_transport_http_client.c:600
 #: src/transport/plugin_transport_http_client.c:618
 #, c-format
@@ -4001,59 +4001,59 @@ msgstr ""
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:2658
+#: src/gns/gnunet-gns-proxy.c:2653
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "No se pudo importar la clave privada del fichero «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:2690
+#: src/gns/gnunet-gns-proxy.c:2685
 #, fuzzy, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr "No se pudo importar el certificado %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:2899
+#: src/gns/gnunet-gns-proxy.c:2894
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
 
-#: src/gns/gnunet-gns-proxy.c:2923 src/rest/gnunet-rest-server.c:917
+#: src/gns/gnunet-gns-proxy.c:2918 src/rest/gnunet-rest-server.c:917
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/gns/gnunet-gns-proxy.c:3272
+#: src/gns/gnunet-gns-proxy.c:3267
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:3304
+#: src/gns/gnunet-gns-proxy.c:3299
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:3390
+#: src/gns/gnunet-gns-proxy.c:3385
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:3731
+#: src/gns/gnunet-gns-proxy.c:3726
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:3865
+#: src/gns/gnunet-gns-proxy.c:3860
 msgid "listen on specified port (default: 7777)"
 msgstr "escuchar en el puerto especificado (predeterminado: 7777)"
 
-#: src/gns/gnunet-gns-proxy.c:3870
+#: src/gns/gnunet-gns-proxy.c:3865
 msgid "pem file to use as CA"
 msgstr "fichero pem para usar como autoridad de certificación (CA)"
 
-#: src/gns/gnunet-gns-proxy.c:3874
+#: src/gns/gnunet-gns-proxy.c:3869
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3900
+#: src/gns/gnunet-gns-proxy.c:3895
 msgid "GNUnet GNS proxy"
 msgstr "Proxy GNUnet GNS"
 
@@ -4125,7 +4125,7 @@ msgstr "¡No se pudo conectar a la DHT!\n"
 msgid "Error converting GNS response to DNS response!\n"
 msgstr "¡Se produjo un error al convertir los argumentos a una URI!\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:386
+#: src/gns/gnunet-service-gns_interceptor.c:380
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio GNS!\n"
@@ -4145,50 +4145,50 @@ msgstr ""
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr "Módulo «%s» no encontrado\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:904
+#: src/gns/gnunet-service-gns_resolver.c:903
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1095
+#: src/gns/gnunet-service-gns_resolver.c:1094
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1871
+#: src/gns/gnunet-service-gns_resolver.c:1870
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1886
+#: src/gns/gnunet-service-gns_resolver.c:1885
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1926
+#: src/gns/gnunet-service-gns_resolver.c:1918
 #, fuzzy, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr "No se han encontrado ficheros en «%s»\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2328
+#: src/gns/gnunet-service-gns_resolver.c:2320
 msgid "Unable to process critical delegation record\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2333
+#: src/gns/gnunet-service-gns_resolver.c:2325
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2356
+#: src/gns/gnunet-service-gns_resolver.c:2348
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Se produjo un fallo al mandar la petición DNS a %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2523
+#: src/gns/gnunet-service-gns_resolver.c:2515
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2671
+#: src/gns/gnunet-service-gns_resolver.c:2663
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
@@ -4482,7 +4482,7 @@ msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# «HELLO» válidos descargados de servidores de listas de máquinas"
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:677
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1460
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
 msgid "# advertised hostlist URIs"
 msgstr "# URI de listas de máquinas anunciadas"
 
@@ -4500,120 +4500,120 @@ msgstr ""
 "Lista de máquinas anunciada con la URI «%s» no pudo ser descargada. La URI "
 "anunciada es descartada.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:893
+#: src/hostlist/gnunet-daemon-hostlist_client.c:886
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 "Finalizado el plazo mientras se intentaba bajar lista de máquinas de «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:908
+#: src/hostlist/gnunet-daemon-hostlist_client.c:901
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr "Límite de descarga de %u bytes superado, parando descarga\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:928
+#: src/hostlist/gnunet-daemon-hostlist_client.c:921
 #, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "Descarga de lista de máquinas de «%s» fallida: «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:934
+#: src/hostlist/gnunet-daemon-hostlist_client.c:927
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr "Descarga de lista de máquinas «%s» completada.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:942
+#: src/hostlist/gnunet-daemon-hostlist_client.c:935
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr "Añadiendo el almacén de datos de la lista de máquinas probada «%s».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:998
+#: src/hostlist/gnunet-daemon-hostlist_client.c:991
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr "Inicializando usando lista de máquinas en «%s».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1007
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1000
 msgid "# hostlist downloads initiated"
 msgstr "# descargas de listas de máquinas iniciadas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1144
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1732
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1137
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1725
 msgid "# milliseconds between hostlist downloads"
 msgstr "# milisegundos entre descargas de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1154
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1147
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 "Hay %u/%u conexiones.  Se considerará descargar una lista de máquinas en %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1212
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1233
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1205
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1226
 msgid "# active connections"
 msgstr "# conexiones activas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1396
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1389
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Cargando entradas guardadas de listas de máquinas del fichero «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1394
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "El fichero de listas de máquinas «%s» no existe\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1412
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1405
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 "No se pudo abrir el fichero «%s» en modo lectura para cargar las listas de "
 "máquinas: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1446
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr "%u URI de listas de máquinas cargadas del fichero\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1456
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1449
 msgid "# hostlist URIs read from file"
 msgstr "# URI de listas de máquinas leídas de fichero"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1500
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 "No se pudo abrir el fichero «%s» en modo escritura para almacenar las listas "
 "de máquinas: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1514
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Escribiendo %u URI de listas de máquinas a «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1547
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1566
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1540
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1559
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr "Error escribiendo URI de listas de máquinas al fichero «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1560
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1553
 msgid "# hostlist URIs written to file"
 msgstr "# URI de listas de máquinas escritas a fichero"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1661
-#: src/transport/plugin_transport_http_client.c:2300
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1654
+#: src/transport/plugin_transport_http_client.c:2294
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1690
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1683
 msgid "Learning is enabled on this peer\n"
 msgstr "El aprendizaje está habilitado en este par\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1703
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1696
 msgid "Learning is not enabled on this peer\n"
 msgstr "El aprendizaje no está habilitado en este par\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1717
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1710
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4689,7 +4689,7 @@ msgid "# hostlist advertisements send"
 msgstr "# anuncios de listas de máquinas enviados"
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:674
-#: src/transport/gnunet-service-transport.c:2662
+#: src/transport/gnunet-service-transport.c:2657
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 "No se pudo acceder al servicio de información de pares (PEERINFO).  "
@@ -4866,7 +4866,7 @@ msgstr "Se produjo un fallo al borrar el fichero de 
configuración %s\n"
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Se produjo un fallo al leer el directorio «%s»\n"
 
-#: src/identity/plugin_rest_identity.c:1401
+#: src/identity/plugin_rest_identity.c:1529
 #, fuzzy
 msgid "Identity REST API initialized\n"
 msgstr "Conexión fallida\n"
@@ -5644,7 +5644,7 @@ msgstr "Se produjo un fallo al arrancar %s\n"
 msgid "`external-ip' command not found\n"
 msgstr "comando «external-ip» no encontrado\n"
 
-#: src/nat/gnunet-service-nat_mini.c:607
+#: src/nat/gnunet-service-nat_mini.c:602
 msgid "`upnpc' command not found\n"
 msgstr "comando «upnpc» no encontrado\n"
 
@@ -5936,51 +5936,46 @@ msgid "Daemon to run to perform IP protocol translation 
to GNUnet"
 msgstr ""
 "Demonio a ejecutar para realizar la traducción de protocolo IP a GNUnet"
 
-#: src/reclaim/gnunet-did.c:209
-#, fuzzy, c-format
-msgid "Invalid DID `%s'\n"
-msgstr "URI no válida: «%s»\n"
-
-#: src/reclaim/gnunet-did.c:835
+#: src/reclaim/gnunet-did.c:591
 msgid "Create a DID Document and display its DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:840
+#: src/reclaim/gnunet-did.c:596
 msgid "Get the DID Document associated with the given DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:844
-msgid "Show the DID for a given ego"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:849
+#: src/reclaim/gnunet-did.c:601
 msgid "Remove the DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:853 src/reclaim/gnunet-did.c:857
+#: src/reclaim/gnunet-did.c:605
 msgid "Replace the DID Document."
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:863
+#: src/reclaim/gnunet-did.c:609
+msgid "Show the DID for a given ego"
+msgstr ""
+
+#: src/reclaim/gnunet-did.c:613
+msgid "Show egos with DIDs"
+msgstr ""
+
+#: src/reclaim/gnunet-did.c:619
 msgid "The Decentralized Identity (DID)"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:869
+#: src/reclaim/gnunet-did.c:625
 msgid "The DID Document to store in GNUNET"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:874
+#: src/reclaim/gnunet-did.c:630
 msgid "The name of the EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:880
+#: src/reclaim/gnunet-did.c:636
 msgid "The time until the DID Document is going to expire (e.g. 5d)"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:889
-msgid "Manage Decentralized Identities (DIDs)"
-msgstr ""
-
 #: src/reclaim/gnunet-reclaim.c:802
 #, fuzzy, c-format
 msgid "Ego is required\n"
@@ -6092,11 +6087,11 @@ msgstr ""
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr "Demonio para anunciar expresiones regulares para el par usando mesh."
 
-#: src/regex/gnunet-regex-profiler.c:1388
+#: src/regex/gnunet-regex-profiler.c:1366
 msgid "No configuration file given. Exiting\n"
 msgstr "No se ha introducido ningún fichero de configuración. Saliendo\n"
 
-#: src/regex/gnunet-regex-profiler.c:1430
+#: src/regex/gnunet-regex-profiler.c:1408
 #: src/regex/gnunet-regex-simulation-profiler.c:631
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
@@ -6104,51 +6099,51 @@ msgstr ""
 "No se ha especificado una política de directorios en la línea de comandos. "
 "Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1436
+#: src/regex/gnunet-regex-profiler.c:1414
 #: src/regex/gnunet-regex-simulation-profiler.c:639
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr "Las políticas de directorio especificadas no existen. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1444
+#: src/regex/gnunet-regex-profiler.c:1422
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr "No se han encontrado ficheros en «%s»\n"
 
-#: src/regex/gnunet-regex-profiler.c:1453
+#: src/regex/gnunet-regex-profiler.c:1431
 msgid "No search strings file given. Exiting.\n"
 msgstr "No se ha proporcionado un fichero de cadenas de búsqueda. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1473
+#: src/regex/gnunet-regex-profiler.c:1451
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Error cargando cadenas de búsqueda. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1562
+#: src/regex/gnunet-regex-profiler.c:1540
 msgid "name of the file for writing statistics"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1569
+#: src/regex/gnunet-regex-profiler.c:1547
 #, fuzzy
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 "esperar «TIMEOUT» antes de considerar que una coincidencia de cadenas como "
 "fallida"
 
-#: src/regex/gnunet-regex-profiler.c:1575
+#: src/regex/gnunet-regex-profiler.c:1553
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1582
+#: src/regex/gnunet-regex-profiler.c:1560
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1589
+#: src/regex/gnunet-regex-profiler.c:1567
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1604
+#: src/regex/gnunet-regex-profiler.c:1582
 msgid "Profiler for regex"
 msgstr "Perfilador para expresiones regulares."
 
@@ -7134,7 +7129,7 @@ msgstr ""
 #: src/transport/gnunet-communicator-tcp.c:3342
 #: src/transport/gnunet-communicator-udp.c:3867
 #: src/transport/gnunet-service-tng.c:11039
-#: src/transport/gnunet-service-transport.c:2627
+#: src/transport/gnunet-service-transport.c:2622
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
@@ -7195,21 +7190,21 @@ msgid "# bytes payload received"
 msgstr "# bytes de «payload» recibidos"
 
 #: src/transport/gnunet-service-transport.c:2019
-#: src/transport/gnunet-service-transport.c:2453
+#: src/transport/gnunet-service-transport.c:2448
 msgid "# disconnects due to blacklist"
 msgstr "# desconexiones debido a la lista negra"
 
-#: src/transport/gnunet-service-transport.c:2457
+#: src/transport/gnunet-service-transport.c:2452
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
 
-#: src/transport/gnunet-service-transport.c:2552
+#: src/transport/gnunet-service-transport.c:2547
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
 
-#: src/transport/gnunet-service-transport.c:2561
+#: src/transport/gnunet-service-transport.c:2556
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
@@ -7759,26 +7754,26 @@ msgstr "enviar data para prueba a otro par (hasta 
CTRL-C)"
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2140
+#: src/transport/plugin_transport_http_client.c:2134
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 "¡No se pudo inicializar el multi-manejador de curl, no se pudo iniciar el "
 "módulo %s!\n"
 
-#: src/transport/plugin_transport_http_client.c:2189
+#: src/transport/plugin_transport_http_client.c:2183
 #: src/transport/plugin_transport_http_server.c:3276
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Finalizando el módulo «%s»\n"
 
-#: src/transport/plugin_transport_http_client.c:2206
+#: src/transport/plugin_transport_http_client.c:2200
 #: src/transport/plugin_transport_http_server.c:3346
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "Finalización del módulo «%s» completa\n"
 
-#: src/transport/plugin_transport_http_client.c:2240
+#: src/transport/plugin_transport_http_client.c:2234
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "El número máximo de conexiones es %u\n"
@@ -8316,81 +8311,81 @@ msgstr "No se pudo acceder al fichero de configuración 
«%s»\n"
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:227 src/util/bio.c:235
+#: src/util/bio.c:228 src/util/bio.c:236
 #, fuzzy, c-format
 msgid "Error reading `%s' from file: %s"
 msgstr "Error leyendo «%s»: %s"
 
-#: src/util/bio.c:237
+#: src/util/bio.c:238
 msgid "End of file"
 msgstr "Fin del fichero"
 
-#: src/util/bio.c:266
+#: src/util/bio.c:267
 #, fuzzy, c-format
 msgid "Error while reading `%s' from buffer: %s"
 msgstr "Error decodificando clave %u\n"
 
-#: src/util/bio.c:268
+#: src/util/bio.c:269
 msgid "Not enough data left"
 msgstr ""
 
-#: src/util/bio.c:308
+#: src/util/bio.c:309
 #, fuzzy, c-format
 msgid "Invalid handle type while reading `%s'"
 msgstr "Parámetro no válido «%s» en la línea de comandos\n"
 
-#: src/util/bio.c:335 src/util/bio.c:839
+#: src/util/bio.c:336 src/util/bio.c:840
 msgid "string length"
 msgstr ""
 
-#: src/util/bio.c:341
+#: src/util/bio.c:342
 #, fuzzy, c-format
 msgid "%s (while reading `%s')"
 msgstr "Error decodificando clave %u\n"
 
-#: src/util/bio.c:346
+#: src/util/bio.c:347
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr "Se produjo un error leyendo la cadena «%s»"
 
-#: src/util/bio.c:359
+#: src/util/bio.c:360
 #, fuzzy, c-format
 msgid "String `%s' longer than allowed (%u > %lu)"
 msgstr "La cadena «%s» es mayor de lo permitido (%u > %u)"
 
-#: src/util/bio.c:398 src/util/bio.c:864 src/util/bio.c:881
+#: src/util/bio.c:399 src/util/bio.c:865 src/util/bio.c:882
 msgid "metadata length"
 msgstr ""
 
-#: src/util/bio.c:410
+#: src/util/bio.c:411
 #, fuzzy, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
 msgstr "Los metadatos serializados «%s» son mayores de lo permitido (%u>%u)"
 
-#: src/util/bio.c:426
+#: src/util/bio.c:427
 #, fuzzy, c-format
 msgid "Failed to deserialize metadata `%s'"
 msgstr "Se produjo un fallo al serializar metadatos"
 
-#: src/util/bio.c:668
+#: src/util/bio.c:669
 msgid "Unable to flush buffer to file"
 msgstr ""
 
-#: src/util/bio.c:730 src/util/bio.c:751
+#: src/util/bio.c:731 src/util/bio.c:752
 #, fuzzy, c-format
 msgid "Error while writing `%s' to file: %s"
 msgstr "Error decodificando clave %u\n"
 
-#: src/util/bio.c:732
+#: src/util/bio.c:733
 msgid "No associated file"
 msgstr ""
 
-#: src/util/bio.c:816
+#: src/util/bio.c:817
 #, fuzzy, c-format
 msgid "Invalid handle type while writing `%s'"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/util/bio.c:876
+#: src/util/bio.c:877
 #, fuzzy, c-format
 msgid "Failed to serialize metadata `%s'"
 msgstr "Se produjo un fallo al serializar metadatos"
@@ -8399,7 +8394,7 @@ msgstr "Se produjo un fallo al serializar metadatos"
 msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:1106
+#: src/util/client.c:1095
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr "Se necesita un nombre de máquina no vacío para el servicio «%s».\n"
@@ -8409,53 +8404,53 @@ msgstr "Se necesita un nombre de máquina no vacío para 
el servicio «%s».\n"
 msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:926
+#: src/util/common_logging.c:911
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "Mensaje `%.*s» repetido %u veces en el último %s\n"
 
-#: src/util/common_logging.c:1131
+#: src/util/common_logging.c:1104
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/util/common_logging.c:1133
+#: src/util/common_logging.c:1106
 msgid "WARNING"
 msgstr "PELIGRO"
 
-#: src/util/common_logging.c:1135
+#: src/util/common_logging.c:1108
 msgid "MESSAGE"
 msgstr "MENSAJE"
 
-#: src/util/common_logging.c:1137
+#: src/util/common_logging.c:1110
 msgid "INFO"
 msgstr "INFORMACIÓN"
 
-#: src/util/common_logging.c:1139
+#: src/util/common_logging.c:1112
 msgid "DEBUG"
 msgstr "DEPURACIÓN"
 
-#: src/util/common_logging.c:1141
+#: src/util/common_logging.c:1114
 msgid "NONE"
 msgstr "NINGUNO"
 
-#: src/util/common_logging.c:1142
+#: src/util/common_logging.c:1115
 msgid "INVALID"
 msgstr "NO VÁLIDO"
 
-#: src/util/common_logging.c:1423
+#: src/util/common_logging.c:1396
 msgid "unknown address"
 msgstr "dirección desconocida"
 
-#: src/util/common_logging.c:1468
+#: src/util/common_logging.c:1441
 msgid "invalid address"
 msgstr "dirección no válida"
 
-#: src/util/common_logging.c:1487
+#: src/util/common_logging.c:1453
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "¡La configuración no especifica la opción «%s» en la sección «%s»!\n"
 
-#: src/util/common_logging.c:1510
+#: src/util/common_logging.c:1468
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8554,7 +8549,7 @@ msgstr "el parámetro --option es necesario para 
establecer un valor\n"
 msgid "failed to load configuration defaults"
 msgstr "Se produjo un fallo al cargar la configuración de %s\n"
 
-#: src/util/container_bloomfilter.c:542
+#: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -8568,17 +8563,17 @@ msgstr ""
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "El firmado ECC falló en %s:%d: %s\n"
 
-#: src/util/crypto_ecc.c:669
+#: src/util/crypto_ecc.c:689
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
 
-#: src/util/crypto_ecc_setup.c:280
+#: src/util/crypto_ecc_setup.c:272
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "No se pudo acceder a la clave de máquina.\n"
 
-#: src/util/crypto_random.c:385
+#: src/util/crypto_random.c:372
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt no tiene la versión esperada (se necesita la versión %s).\n"
@@ -9108,17 +9103,17 @@ msgstr ""
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "¡La inicialización del mecanismo de módulos falló: %s!\n"
 
-#: src/util/plugin.c:156
+#: src/util/plugin.c:157
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr "«%s» falló al resolver el método «%s» con error: %s\n"
 
-#: src/util/plugin.c:234
+#: src/util/plugin.c:214
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "Falló «%s» para la biblioteca «%s» con error: %s\n"
 
-#: src/util/plugin.c:414
+#: src/util/plugin.c:370
 msgid "Could not determine plugin installation path.\n"
 msgstr "No se pudo determinar la ruta de instalación de los módulos.\n"
 
@@ -9481,6 +9476,10 @@ msgstr "Configurar túneles vía VPN."
 msgid "Failed to connect to the namestore!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
+#, fuzzy, c-format
+#~ msgid "Invalid DID `%s'\n"
+#~ msgstr "URI no válida: «%s»\n"
+
 #, c-format
 #~ msgid "Block not of type %u\n"
 #~ msgstr "El bloque no es del tipo %u\n"
diff --git a/po/fr.po b/po/fr.po
index a16503e2f..e5daaad82 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-08-05 13:57+0200\n"
+"POT-Creation-Date: 2022-09-04 11:01+0200\n"
 "PO-Revision-Date: 2021-11-21 00:53+0100\n"
 "Last-Translator: Stéphane  Aulery <lkppo@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -652,25 +652,25 @@ msgstr ""
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:326
+#: src/ats/gnunet-service-ats_plugins.c:321
 #, c-format
 msgid ""
 "Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:336
+#: src/ats/gnunet-service-ats_plugins.c:331
 #, c-format
 msgid "%s quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:382
+#: src/ats/gnunet-service-ats_plugins.c:377
 #, c-format
 msgid ""
 "No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:474
+#: src/ats/gnunet-service-ats_plugins.c:462
 #, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr ""
@@ -1430,40 +1430,40 @@ msgstr ""
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1513
+#: src/core/gnunet-service-core_kx.c:1506
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1524
+#: src/core/gnunet-service-core_kx.c:1517
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1528
+#: src/core/gnunet-service-core_kx.c:1521
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1606
-#: src/core/gnunet-service-core_kx.c:1633
+#: src/core/gnunet-service-core_kx.c:1599
+#: src/core/gnunet-service-core_kx.c:1626
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1619
+#: src/core/gnunet-service-core_kx.c:1612
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1664
+#: src/core/gnunet-service-core_kx.c:1657
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1673
+#: src/core/gnunet-service-core_kx.c:1666
 msgid "# bytes of payload decrypted"
 msgstr ""
 
 #: src/core/gnunet-service-core_sessions.c:252
 #: src/core/gnunet-service-core_sessions.c:337
-#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1519
+#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1496
 #: src/topology/gnunet-daemon-topology.c:579
 #: src/topology/gnunet-daemon-topology.c:671
 #: src/transport/gnunet-service-transport_neighbours.c:723
@@ -1551,31 +1551,31 @@ msgstr ""
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1032
+#: src/datastore/datastore_api.c:1007
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1093
+#: src/datastore/datastore_api.c:1068
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1158
+#: src/datastore/datastore_api.c:1113
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1236
+#: src/datastore/datastore_api.c:1171
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1295
+#: src/datastore/datastore_api.c:1230
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1357
+#: src/datastore/datastore_api.c:1276
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1438
+#: src/datastore/datastore_api.c:1357
 msgid "# GET requests executed"
 msgstr ""
 
@@ -1904,46 +1904,46 @@ msgstr ""
 "Resultat %d, type %d :\n"
 "%.*s\n"
 
-#: src/dht/gnunet-dht-get.c:221
+#: src/dht/gnunet-dht-get.c:238
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:229 src/dht/gnunet-dht-hello.c:119
+#: src/dht/gnunet-dht-get.c:246 src/dht/gnunet-dht-hello.c:119
 #: src/dht/gnunet-dht-monitor.c:255
 #, c-format
 msgid "Failed to connect to DHT service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:239
+#: src/dht/gnunet-dht-get.c:256
 msgid "Issuing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:275 src/dht/gnunet-dht-monitor.c:302
+#: src/dht/gnunet-dht-get.c:292 src/dht/gnunet-dht-monitor.c:302
 #: src/dht/gnunet-dht-put.c:200
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:281
+#: src/dht/gnunet-dht-get.c:298
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:286 src/dht/gnunet-dht-put.c:217
+#: src/dht/gnunet-dht-get.c:303 src/dht/gnunet-dht-put.c:217
 msgid "use DHT's record route option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:292 src/dht/gnunet-dht-monitor.c:308
+#: src/dht/gnunet-dht-get.c:309 src/dht/gnunet-dht-monitor.c:308
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:298
+#: src/dht/gnunet-dht-get.c:315
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:304 src/dht/gnunet-dht-put.c:206
+#: src/dht/gnunet-dht-get.c:321 src/dht/gnunet-dht-put.c:206
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:321
+#: src/dht/gnunet-dht-get.c:338
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -2359,71 +2359,71 @@ msgstr ""
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/fs/fs_api.c:491
+#: src/fs/fs_api.c:480
 #, c-format
 msgid "Could not open file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_api.c:502
+#: src/fs/fs_api.c:491
 #, c-format
 msgid "Could not read file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_api.c:510
+#: src/fs/fs_api.c:499
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1173
+#: src/fs/fs_api.c:1156
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1724
+#: src/fs/fs_api.c:1707
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1739
+#: src/fs/fs_api.c:1722
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2468
+#: src/fs/fs_api.c:2451
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2479
+#: src/fs/fs_api.c:2462
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2627 src/fs/fs_api.c:2873
+#: src/fs/fs_api.c:2610 src/fs/fs_api.c:2856
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2645
+#: src/fs/fs_api.c:2628
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2661 src/fs/fs_api.c:2681 src/fs/fs_api.c:3180
+#: src/fs/fs_api.c:2644 src/fs/fs_api.c:2664 src/fs/fs_api.c:3163
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2863
+#: src/fs/fs_api.c:2846
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3124
+#: src/fs/fs_api.c:3107
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3219
+#: src/fs/fs_api.c:3202
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2458,37 +2458,37 @@ msgstr ""
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1053
+#: src/fs/fs_download.c:1044
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %lu bytes at depth %u and "
 "offset %llu/%llu, got %lu bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1075
+#: src/fs/fs_download.c:1066
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1098
+#: src/fs/fs_download.c:1089
 #, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1109
+#: src/fs/fs_download.c:1100
 #, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1119
+#: src/fs/fs_download.c:1110
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1227
+#: src/fs/fs_download.c:1218
 msgid "internal error decoding tree"
 msgstr ""
 
-#: src/fs/fs_download.c:1899
+#: src/fs/fs_download.c:1890
 msgid "Invalid URI"
 msgstr "URI invalide"
 
@@ -2598,11 +2598,11 @@ msgstr "pa_stream_new() échoué : %s\n"
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:218
+#: src/fs/fs_publish_ksk.c:212
 msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish_ublock.c:240
+#: src/fs/fs_publish_ublock.c:215
 msgid "Internal error."
 msgstr "Erreur interne."
 
@@ -3315,60 +3315,60 @@ msgstr ""
 msgid "# cadet connections active"
 msgstr "# Session TCP active"
 
-#: src/fs/gnunet-service-fs_cp.c:680
+#: src/fs/gnunet-service-fs_cp.c:665
 msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:684
+#: src/fs/gnunet-service-fs_cp.c:669
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:717 src/fs/gnunet-service-fs_cp.c:1342
+#: src/fs/gnunet-service-fs_cp.c:702 src/fs/gnunet-service-fs_cp.c:1327
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:812
+#: src/fs/gnunet-service-fs_cp.c:797
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1009
+#: src/fs/gnunet-service-fs_cp.c:994
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1034
+#: src/fs/gnunet-service-fs_cp.c:1019
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1044
+#: src/fs/gnunet-service-fs_cp.c:1029
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1141
+#: src/fs/gnunet-service-fs_cp.c:1126
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1199
+#: src/fs/gnunet-service-fs_cp.c:1184
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1223
+#: src/fs/gnunet-service-fs_cp.c:1208
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1237
+#: src/fs/gnunet-service-fs_cp.c:1222
 msgid "# requests dropped due to full reply queue"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1294
+#: src/fs/gnunet-service-fs_cp.c:1279
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1338
+#: src/fs/gnunet-service-fs_cp.c:1323
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1708
+#: src/fs/gnunet-service-fs_cp.c:1679
 msgid "# migration stop messages sent"
 msgstr ""
 
@@ -3388,25 +3388,25 @@ msgstr ""
 msgid "Failed to delete bogus block: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:317
+#: src/fs/gnunet-service-fs_indexing.c:297
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:331
+#: src/fs/gnunet-service-fs_indexing.c:311
 #, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:335
+#: src/fs/gnunet-service-fs_indexing.c:315
 msgid "not indexed"
 msgstr "non indexé"
 
-#: src/fs/gnunet-service-fs_indexing.c:349
+#: src/fs/gnunet-service-fs_indexing.c:329
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:455
+#: src/fs/gnunet-service-fs_indexing.c:435
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3442,97 +3442,97 @@ msgstr ""
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:325
+#: src/fs/gnunet-service-fs_pr.c:305
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:416 src/fs/gnunet-service-fs_pr.c:654
+#: src/fs/gnunet-service-fs_pr.c:396 src/fs/gnunet-service-fs_pr.c:626
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:829
+#: src/fs/gnunet-service-fs_pr.c:795
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:903
+#: src/fs/gnunet-service-fs_pr.c:869
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1037
+#: src/fs/gnunet-service-fs_pr.c:1003
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1066
+#: src/fs/gnunet-service-fs_pr.c:1032
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1107
+#: src/fs/gnunet-service-fs_pr.c:1073
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1262
+#: src/fs/gnunet-service-fs_pr.c:1228
 msgid "# Replies received from CADET"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1317
+#: src/fs/gnunet-service-fs_pr.c:1283
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1338
+#: src/fs/gnunet-service-fs_pr.c:1304
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1405
+#: src/fs/gnunet-service-fs_pr.c:1371
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1467
+#: src/fs/gnunet-service-fs_pr.c:1433
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1522
+#: src/fs/gnunet-service-fs_pr.c:1488
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1537
+#: src/fs/gnunet-service-fs_pr.c:1503
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1560
+#: src/fs/gnunet-service-fs_pr.c:1526
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1577
+#: src/fs/gnunet-service-fs_pr.c:1543
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1598
+#: src/fs/gnunet-service-fs_pr.c:1564
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1604
+#: src/fs/gnunet-service-fs_pr.c:1570
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1650
+#: src/fs/gnunet-service-fs_pr.c:1616
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1663
+#: src/fs/gnunet-service-fs_pr.c:1629
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1714
+#: src/fs/gnunet-service-fs_pr.c:1680
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1778
+#: src/fs/gnunet-service-fs_pr.c:1744
 msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:648
+#: src/fs/gnunet-service-fs_push.c:643
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -3653,11 +3653,11 @@ msgstr ""
 #: src/hostlist/gnunet-daemon-hostlist_client.c:544
 #: src/hostlist/gnunet-daemon-hostlist_client.c:772
 #: src/hostlist/gnunet-daemon-hostlist_client.c:781
-#: src/hostlist/gnunet-daemon-hostlist_client.c:836
-#: src/hostlist/gnunet-daemon-hostlist_client.c:848
-#: src/hostlist/gnunet-daemon-hostlist_client.c:964
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1066
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1074
+#: src/hostlist/gnunet-daemon-hostlist_client.c:835
+#: src/hostlist/gnunet-daemon-hostlist_client.c:847
+#: src/hostlist/gnunet-daemon-hostlist_client.c:957
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1059
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1067
 #: src/transport/plugin_transport_http_client.c:600
 #: src/transport/plugin_transport_http_client.c:618
 #, c-format
@@ -3709,58 +3709,58 @@ msgstr ""
 msgid "Unsupported HTTP method `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2658
+#: src/gns/gnunet-gns-proxy.c:2653
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2690
+#: src/gns/gnunet-gns-proxy.c:2685
 #, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2899
+#: src/gns/gnunet-gns-proxy.c:2894
 #, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2923 src/rest/gnunet-rest-server.c:917
+#: src/gns/gnunet-gns-proxy.c:2918 src/rest/gnunet-rest-server.c:917
 msgid "Failed to pass client to MHD\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3272
+#: src/gns/gnunet-gns-proxy.c:3267
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3304
+#: src/gns/gnunet-gns-proxy.c:3299
 #, c-format
 msgid "Unsupported socks command %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3390
+#: src/gns/gnunet-gns-proxy.c:3385
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3731
+#: src/gns/gnunet-gns-proxy.c:3726
 #, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3865
+#: src/gns/gnunet-gns-proxy.c:3860
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3870
+#: src/gns/gnunet-gns-proxy.c:3865
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3874
+#: src/gns/gnunet-gns-proxy.c:3869
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3900
+#: src/gns/gnunet-gns-proxy.c:3895
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -3825,7 +3825,7 @@ msgstr ""
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:386
+#: src/gns/gnunet-service-gns_interceptor.c:380
 msgid "Failed to connect to the DNS service!\n"
 msgstr ""
 
@@ -3844,49 +3844,49 @@ msgstr ""
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:904
+#: src/gns/gnunet-service-gns_resolver.c:903
 msgid "Failed to parse DNS response\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1095
+#: src/gns/gnunet-service-gns_resolver.c:1094
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1871
+#: src/gns/gnunet-service-gns_resolver.c:1870
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1886
+#: src/gns/gnunet-service-gns_resolver.c:1885
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1926
+#: src/gns/gnunet-service-gns_resolver.c:1918
 #, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2328
+#: src/gns/gnunet-service-gns_resolver.c:2320
 msgid "Unable to process critical delegation record\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2333
+#: src/gns/gnunet-service-gns_resolver.c:2325
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2356
+#: src/gns/gnunet-service-gns_resolver.c:2348
 #, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2523
+#: src/gns/gnunet-service-gns_resolver.c:2515
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2671
+#: src/gns/gnunet-service-gns_resolver.c:2663
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
@@ -4153,7 +4153,7 @@ msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:677
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1460
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4169,114 +4169,114 @@ msgid ""
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:893
+#: src/hostlist/gnunet-daemon-hostlist_client.c:886
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:908
+#: src/hostlist/gnunet-daemon-hostlist_client.c:901
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:928
+#: src/hostlist/gnunet-daemon-hostlist_client.c:921
 #, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:934
+#: src/hostlist/gnunet-daemon-hostlist_client.c:927
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:942
+#: src/hostlist/gnunet-daemon-hostlist_client.c:935
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:998
+#: src/hostlist/gnunet-daemon-hostlist_client.c:991
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1007
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1000
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1144
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1732
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1137
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1725
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1154
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1147
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1212
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1233
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1205
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1226
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1396
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1389
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1394
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1412
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1405
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1446
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1456
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1449
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1500
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1514
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1547
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1566
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1540
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1559
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1560
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1553
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1661
-#: src/transport/plugin_transport_http_client.c:2300
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1654
+#: src/transport/plugin_transport_http_client.c:2294
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1690
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1683
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1703
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1696
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1717
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1710
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4346,7 +4346,7 @@ msgid "# hostlist advertisements send"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:674
-#: src/transport/gnunet-service-transport.c:2662
+#: src/transport/gnunet-service-transport.c:2657
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
@@ -4511,7 +4511,7 @@ msgstr ""
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr ""
 
-#: src/identity/plugin_rest_identity.c:1401
+#: src/identity/plugin_rest_identity.c:1529
 msgid "Identity REST API initialized\n"
 msgstr ""
 
@@ -5242,7 +5242,7 @@ msgstr "Échec du démarrage de %s\n"
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_mini.c:607
+#: src/nat/gnunet-service-nat_mini.c:602
 msgid "`upnpc' command not found\n"
 msgstr ""
 
@@ -5522,51 +5522,46 @@ msgstr ""
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:209
-#, fuzzy, c-format
-msgid "Invalid DID `%s'\n"
-msgstr "URI invalide « %s »\n"
-
-#: src/reclaim/gnunet-did.c:835
+#: src/reclaim/gnunet-did.c:591
 msgid "Create a DID Document and display its DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:840
+#: src/reclaim/gnunet-did.c:596
 msgid "Get the DID Document associated with the given DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:844
-msgid "Show the DID for a given ego"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:849
+#: src/reclaim/gnunet-did.c:601
 msgid "Remove the DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:853 src/reclaim/gnunet-did.c:857
+#: src/reclaim/gnunet-did.c:605
 msgid "Replace the DID Document."
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:863
+#: src/reclaim/gnunet-did.c:609
+msgid "Show the DID for a given ego"
+msgstr ""
+
+#: src/reclaim/gnunet-did.c:613
+msgid "Show egos with DIDs"
+msgstr ""
+
+#: src/reclaim/gnunet-did.c:619
 msgid "The Decentralized Identity (DID)"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:869
+#: src/reclaim/gnunet-did.c:625
 msgid "The DID Document to store in GNUNET"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:874
+#: src/reclaim/gnunet-did.c:630
 msgid "The name of the EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:880
+#: src/reclaim/gnunet-did.c:636
 msgid "The time until the DID Document is going to expire (e.g. 5d)"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:889
-msgid "Manage Decentralized Identities (DIDs)"
-msgstr ""
-
 #: src/reclaim/gnunet-reclaim.c:802
 #, c-format
 msgid "Ego is required\n"
@@ -5672,56 +5667,56 @@ msgstr ""
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1388
+#: src/regex/gnunet-regex-profiler.c:1366
 msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1430
+#: src/regex/gnunet-regex-profiler.c:1408
 #: src/regex/gnunet-regex-simulation-profiler.c:631
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1436
+#: src/regex/gnunet-regex-profiler.c:1414
 #: src/regex/gnunet-regex-simulation-profiler.c:639
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1444
+#: src/regex/gnunet-regex-profiler.c:1422
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1453
+#: src/regex/gnunet-regex-profiler.c:1431
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1473
+#: src/regex/gnunet-regex-profiler.c:1451
 msgid "Error loading search strings. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1562
+#: src/regex/gnunet-regex-profiler.c:1540
 msgid "name of the file for writing statistics"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1569
+#: src/regex/gnunet-regex-profiler.c:1547
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1575
+#: src/regex/gnunet-regex-profiler.c:1553
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1582
+#: src/regex/gnunet-regex-profiler.c:1560
 msgid "name of file with input strings"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1589
+#: src/regex/gnunet-regex-profiler.c:1567
 msgid "name of file with hosts' names"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1604
+#: src/regex/gnunet-regex-profiler.c:1582
 msgid "Profiler for regex"
 msgstr ""
 
@@ -6640,7 +6635,7 @@ msgstr ""
 #: src/transport/gnunet-communicator-tcp.c:3342
 #: src/transport/gnunet-communicator-udp.c:3867
 #: src/transport/gnunet-service-tng.c:11039
-#: src/transport/gnunet-service-transport.c:2627
+#: src/transport/gnunet-service-transport.c:2622
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
@@ -6692,21 +6687,21 @@ msgid "# bytes payload received"
 msgstr ""
 
 #: src/transport/gnunet-service-transport.c:2019
-#: src/transport/gnunet-service-transport.c:2453
+#: src/transport/gnunet-service-transport.c:2448
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2457
+#: src/transport/gnunet-service-transport.c:2452
 #, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2552
+#: src/transport/gnunet-service-transport.c:2547
 #, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2561
+#: src/transport/gnunet-service-transport.c:2556
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
@@ -7201,24 +7196,24 @@ msgstr ""
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2140
+#: src/transport/plugin_transport_http_client.c:2134
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2189
+#: src/transport/plugin_transport_http_client.c:2183
 #: src/transport/plugin_transport_http_server.c:3276
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2206
+#: src/transport/plugin_transport_http_client.c:2200
 #: src/transport/plugin_transport_http_server.c:3346
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2240
+#: src/transport/plugin_transport_http_client.c:2234
 #, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr ""
@@ -7709,81 +7704,81 @@ msgstr ""
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:227 src/util/bio.c:235
+#: src/util/bio.c:228 src/util/bio.c:236
 #, fuzzy, c-format
 msgid "Error reading `%s' from file: %s"
 msgstr "Erreur de lecture : « %s » : %s"
 
-#: src/util/bio.c:237
+#: src/util/bio.c:238
 msgid "End of file"
 msgstr "Fin de fichier"
 
-#: src/util/bio.c:266
+#: src/util/bio.c:267
 #, fuzzy, c-format
 msgid "Error while reading `%s' from buffer: %s"
 msgstr "Erreur de lecture : « %s » : %s"
 
-#: src/util/bio.c:268
+#: src/util/bio.c:269
 msgid "Not enough data left"
 msgstr ""
 
-#: src/util/bio.c:308
+#: src/util/bio.c:309
 #, c-format
 msgid "Invalid handle type while reading `%s'"
 msgstr ""
 
-#: src/util/bio.c:335 src/util/bio.c:839
+#: src/util/bio.c:336 src/util/bio.c:840
 msgid "string length"
 msgstr ""
 
-#: src/util/bio.c:341
+#: src/util/bio.c:342
 #, c-format
 msgid "%s (while reading `%s')"
 msgstr ""
 
-#: src/util/bio.c:346
+#: src/util/bio.c:347
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:359
+#: src/util/bio.c:360
 #, c-format
 msgid "String `%s' longer than allowed (%u > %lu)"
 msgstr ""
 
-#: src/util/bio.c:398 src/util/bio.c:864 src/util/bio.c:881
+#: src/util/bio.c:399 src/util/bio.c:865 src/util/bio.c:882
 msgid "metadata length"
 msgstr ""
 
-#: src/util/bio.c:410
+#: src/util/bio.c:411
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:426
+#: src/util/bio.c:427
 #, fuzzy, c-format
 msgid "Failed to deserialize metadata `%s'"
 msgstr "Résolution de « %s » échouée\n"
 
-#: src/util/bio.c:668
+#: src/util/bio.c:669
 msgid "Unable to flush buffer to file"
 msgstr ""
 
-#: src/util/bio.c:730 src/util/bio.c:751
+#: src/util/bio.c:731 src/util/bio.c:752
 #, fuzzy, c-format
 msgid "Error while writing `%s' to file: %s"
 msgstr "Erreur de lecture : « %s » : %s"
 
-#: src/util/bio.c:732
+#: src/util/bio.c:733
 msgid "No associated file"
 msgstr ""
 
-#: src/util/bio.c:816
+#: src/util/bio.c:817
 #, c-format
 msgid "Invalid handle type while writing `%s'"
 msgstr ""
 
-#: src/util/bio.c:876
+#: src/util/bio.c:877
 #, fuzzy, c-format
 msgid "Failed to serialize metadata `%s'"
 msgstr "Échec du démarrage de %s\n"
@@ -7792,7 +7787,7 @@ msgstr "Échec du démarrage de %s\n"
 msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:1106
+#: src/util/client.c:1095
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -7802,53 +7797,53 @@ msgstr ""
 msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:926
+#: src/util/common_logging.c:911
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1131
+#: src/util/common_logging.c:1104
 msgid "ERROR"
 msgstr "ERREUR"
 
-#: src/util/common_logging.c:1133
+#: src/util/common_logging.c:1106
 msgid "WARNING"
 msgstr "AVERTISSEMENT"
 
-#: src/util/common_logging.c:1135
+#: src/util/common_logging.c:1108
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:1137
+#: src/util/common_logging.c:1110
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:1139
+#: src/util/common_logging.c:1112
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:1141
+#: src/util/common_logging.c:1114
 msgid "NONE"
 msgstr "AUCUN"
 
-#: src/util/common_logging.c:1142
+#: src/util/common_logging.c:1115
 msgid "INVALID"
 msgstr "INVALIDE"
 
-#: src/util/common_logging.c:1423
+#: src/util/common_logging.c:1396
 msgid "unknown address"
 msgstr "adresse inconnue"
 
-#: src/util/common_logging.c:1468
+#: src/util/common_logging.c:1441
 msgid "invalid address"
 msgstr "adresse invalide"
 
-#: src/util/common_logging.c:1487
+#: src/util/common_logging.c:1453
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/util/common_logging.c:1510
+#: src/util/common_logging.c:1468
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -7942,7 +7937,7 @@ msgstr ""
 msgid "failed to load configuration defaults"
 msgstr ""
 
-#: src/util/container_bloomfilter.c:542
+#: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -7954,16 +7949,16 @@ msgstr ""
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:669
+#: src/util/crypto_ecc.c:689
 #, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:280
+#: src/util/crypto_ecc_setup.c:272
 msgid "Could not load peer's private key\n"
 msgstr ""
 
-#: src/util/crypto_random.c:385
+#: src/util/crypto_random.c:372
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
@@ -8478,17 +8473,17 @@ msgstr ""
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr ""
 
-#: src/util/plugin.c:156
+#: src/util/plugin.c:157
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:234
+#: src/util/plugin.c:214
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:414
+#: src/util/plugin.c:370
 msgid "Could not determine plugin installation path.\n"
 msgstr ""
 
@@ -8821,6 +8816,10 @@ msgstr "Configurer des tunnels via VPN."
 msgid "Failed to connect to the namestore!\n"
 msgstr ""
 
+#, fuzzy, c-format
+#~ msgid "Invalid DID `%s'\n"
+#~ msgstr "URI invalide « %s »\n"
+
 #~ msgid "ARM API is busy"
 #~ msgstr "API ARM occupé"
 
diff --git a/po/it.po b/po/it.po
index 561691c39..6c54d9caa 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-08-05 13:57+0200\n"
+"POT-Creation-Date: 2022-09-04 11:01+0200\n"
 "PO-Revision-Date: 2019-10-16 11:00+0200\n"
 "Last-Translator: Sebastiano Pistore <sebastianopistore.info@protonmail.ch>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -653,25 +653,25 @@ msgstr ""
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:326
+#: src/ats/gnunet-service-ats_plugins.c:321
 #, c-format
 msgid ""
 "Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:336
+#: src/ats/gnunet-service-ats_plugins.c:331
 #, c-format
 msgid "%s quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:382
+#: src/ats/gnunet-service-ats_plugins.c:377
 #, c-format
 msgid ""
 "No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:474
+#: src/ats/gnunet-service-ats_plugins.c:462
 #, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr ""
@@ -1436,40 +1436,40 @@ msgstr ""
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1513
+#: src/core/gnunet-service-core_kx.c:1506
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1524
+#: src/core/gnunet-service-core_kx.c:1517
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1528
+#: src/core/gnunet-service-core_kx.c:1521
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1606
-#: src/core/gnunet-service-core_kx.c:1633
+#: src/core/gnunet-service-core_kx.c:1599
+#: src/core/gnunet-service-core_kx.c:1626
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1619
+#: src/core/gnunet-service-core_kx.c:1612
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1664
+#: src/core/gnunet-service-core_kx.c:1657
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1673
+#: src/core/gnunet-service-core_kx.c:1666
 msgid "# bytes of payload decrypted"
 msgstr ""
 
 #: src/core/gnunet-service-core_sessions.c:252
 #: src/core/gnunet-service-core_sessions.c:337
-#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1519
+#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1496
 #: src/topology/gnunet-daemon-topology.c:579
 #: src/topology/gnunet-daemon-topology.c:671
 #: src/transport/gnunet-service-transport_neighbours.c:723
@@ -1557,31 +1557,31 @@ msgstr ""
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1032
+#: src/datastore/datastore_api.c:1007
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1093
+#: src/datastore/datastore_api.c:1068
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1158
+#: src/datastore/datastore_api.c:1113
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1236
+#: src/datastore/datastore_api.c:1171
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1295
+#: src/datastore/datastore_api.c:1230
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1357
+#: src/datastore/datastore_api.c:1276
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1438
+#: src/datastore/datastore_api.c:1357
 msgid "# GET requests executed"
 msgstr ""
 
@@ -1908,46 +1908,46 @@ msgstr ""
 msgid "Result %d, type %d:\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:221
+#: src/dht/gnunet-dht-get.c:238
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:229 src/dht/gnunet-dht-hello.c:119
+#: src/dht/gnunet-dht-get.c:246 src/dht/gnunet-dht-hello.c:119
 #: src/dht/gnunet-dht-monitor.c:255
 #, c-format
 msgid "Failed to connect to DHT service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:239
+#: src/dht/gnunet-dht-get.c:256
 msgid "Issuing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:275 src/dht/gnunet-dht-monitor.c:302
+#: src/dht/gnunet-dht-get.c:292 src/dht/gnunet-dht-monitor.c:302
 #: src/dht/gnunet-dht-put.c:200
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:281
+#: src/dht/gnunet-dht-get.c:298
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:286 src/dht/gnunet-dht-put.c:217
+#: src/dht/gnunet-dht-get.c:303 src/dht/gnunet-dht-put.c:217
 msgid "use DHT's record route option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:292 src/dht/gnunet-dht-monitor.c:308
+#: src/dht/gnunet-dht-get.c:309 src/dht/gnunet-dht-monitor.c:308
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:298
+#: src/dht/gnunet-dht-get.c:315
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:304 src/dht/gnunet-dht-put.c:206
+#: src/dht/gnunet-dht-get.c:321 src/dht/gnunet-dht-put.c:206
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:321
+#: src/dht/gnunet-dht-get.c:338
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -2372,71 +2372,71 @@ msgstr ""
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/fs/fs_api.c:491
+#: src/fs/fs_api.c:480
 #, c-format
 msgid "Could not open file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_api.c:502
+#: src/fs/fs_api.c:491
 #, c-format
 msgid "Could not read file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_api.c:510
+#: src/fs/fs_api.c:499
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1173
+#: src/fs/fs_api.c:1156
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1724
+#: src/fs/fs_api.c:1707
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1739
+#: src/fs/fs_api.c:1722
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2468
+#: src/fs/fs_api.c:2451
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2479
+#: src/fs/fs_api.c:2462
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2627 src/fs/fs_api.c:2873
+#: src/fs/fs_api.c:2610 src/fs/fs_api.c:2856
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2645
+#: src/fs/fs_api.c:2628
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2661 src/fs/fs_api.c:2681 src/fs/fs_api.c:3180
+#: src/fs/fs_api.c:2644 src/fs/fs_api.c:2664 src/fs/fs_api.c:3163
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2863
+#: src/fs/fs_api.c:2846
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3124
+#: src/fs/fs_api.c:3107
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3219
+#: src/fs/fs_api.c:3202
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2471,37 +2471,37 @@ msgstr ""
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1053
+#: src/fs/fs_download.c:1044
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %lu bytes at depth %u and "
 "offset %llu/%llu, got %lu bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1075
+#: src/fs/fs_download.c:1066
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1098
+#: src/fs/fs_download.c:1089
 #, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1109
+#: src/fs/fs_download.c:1100
 #, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1119
+#: src/fs/fs_download.c:1110
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1227
+#: src/fs/fs_download.c:1218
 msgid "internal error decoding tree"
 msgstr ""
 
-#: src/fs/fs_download.c:1899
+#: src/fs/fs_download.c:1890
 msgid "Invalid URI"
 msgstr ""
 
@@ -2612,11 +2612,11 @@ msgstr ""
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:218
+#: src/fs/fs_publish_ksk.c:212
 msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish_ublock.c:240
+#: src/fs/fs_publish_ublock.c:215
 msgid "Internal error."
 msgstr "Errore interno."
 
@@ -3337,60 +3337,60 @@ msgstr "# connessioni attive"
 msgid "# cadet connections active"
 msgstr "# connessioni attive"
 
-#: src/fs/gnunet-service-fs_cp.c:680
+#: src/fs/gnunet-service-fs_cp.c:665
 msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:684
+#: src/fs/gnunet-service-fs_cp.c:669
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:717 src/fs/gnunet-service-fs_cp.c:1342
+#: src/fs/gnunet-service-fs_cp.c:702 src/fs/gnunet-service-fs_cp.c:1327
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:812
+#: src/fs/gnunet-service-fs_cp.c:797
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1009
+#: src/fs/gnunet-service-fs_cp.c:994
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1034
+#: src/fs/gnunet-service-fs_cp.c:1019
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1044
+#: src/fs/gnunet-service-fs_cp.c:1029
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1141
+#: src/fs/gnunet-service-fs_cp.c:1126
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1199
+#: src/fs/gnunet-service-fs_cp.c:1184
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1223
+#: src/fs/gnunet-service-fs_cp.c:1208
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1237
+#: src/fs/gnunet-service-fs_cp.c:1222
 msgid "# requests dropped due to full reply queue"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1294
+#: src/fs/gnunet-service-fs_cp.c:1279
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1338
+#: src/fs/gnunet-service-fs_cp.c:1323
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1708
+#: src/fs/gnunet-service-fs_cp.c:1679
 msgid "# migration stop messages sent"
 msgstr ""
 
@@ -3410,25 +3410,25 @@ msgstr "Errore durante la scrittura di `%s'.\n"
 msgid "Failed to delete bogus block: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:317
+#: src/fs/gnunet-service-fs_indexing.c:297
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:331
+#: src/fs/gnunet-service-fs_indexing.c:311
 #, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:335
+#: src/fs/gnunet-service-fs_indexing.c:315
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:349
+#: src/fs/gnunet-service-fs_indexing.c:329
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:455
+#: src/fs/gnunet-service-fs_indexing.c:435
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3464,97 +3464,97 @@ msgstr ""
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:325
+#: src/fs/gnunet-service-fs_pr.c:305
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:416 src/fs/gnunet-service-fs_pr.c:654
+#: src/fs/gnunet-service-fs_pr.c:396 src/fs/gnunet-service-fs_pr.c:626
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:829
+#: src/fs/gnunet-service-fs_pr.c:795
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:903
+#: src/fs/gnunet-service-fs_pr.c:869
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1037
+#: src/fs/gnunet-service-fs_pr.c:1003
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1066
+#: src/fs/gnunet-service-fs_pr.c:1032
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1107
+#: src/fs/gnunet-service-fs_pr.c:1073
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1262
+#: src/fs/gnunet-service-fs_pr.c:1228
 msgid "# Replies received from CADET"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1317
+#: src/fs/gnunet-service-fs_pr.c:1283
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1338
+#: src/fs/gnunet-service-fs_pr.c:1304
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1405
+#: src/fs/gnunet-service-fs_pr.c:1371
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1467
+#: src/fs/gnunet-service-fs_pr.c:1433
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1522
+#: src/fs/gnunet-service-fs_pr.c:1488
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1537
+#: src/fs/gnunet-service-fs_pr.c:1503
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1560
+#: src/fs/gnunet-service-fs_pr.c:1526
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1577
+#: src/fs/gnunet-service-fs_pr.c:1543
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1598
+#: src/fs/gnunet-service-fs_pr.c:1564
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1604
+#: src/fs/gnunet-service-fs_pr.c:1570
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1650
+#: src/fs/gnunet-service-fs_pr.c:1616
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1663
+#: src/fs/gnunet-service-fs_pr.c:1629
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1714
+#: src/fs/gnunet-service-fs_pr.c:1680
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1778
+#: src/fs/gnunet-service-fs_pr.c:1744
 msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:648
+#: src/fs/gnunet-service-fs_push.c:643
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -3676,11 +3676,11 @@ msgstr ""
 #: src/hostlist/gnunet-daemon-hostlist_client.c:544
 #: src/hostlist/gnunet-daemon-hostlist_client.c:772
 #: src/hostlist/gnunet-daemon-hostlist_client.c:781
-#: src/hostlist/gnunet-daemon-hostlist_client.c:836
-#: src/hostlist/gnunet-daemon-hostlist_client.c:848
-#: src/hostlist/gnunet-daemon-hostlist_client.c:964
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1066
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1074
+#: src/hostlist/gnunet-daemon-hostlist_client.c:835
+#: src/hostlist/gnunet-daemon-hostlist_client.c:847
+#: src/hostlist/gnunet-daemon-hostlist_client.c:957
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1059
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1067
 #: src/transport/plugin_transport_http_client.c:600
 #: src/transport/plugin_transport_http_client.c:618
 #, c-format
@@ -3732,58 +3732,58 @@ msgstr ""
 msgid "Unsupported HTTP method `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2658
+#: src/gns/gnunet-gns-proxy.c:2653
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2690
+#: src/gns/gnunet-gns-proxy.c:2685
 #, fuzzy, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr "Generazione statistiche fallita\n"
 
-#: src/gns/gnunet-gns-proxy.c:2899
+#: src/gns/gnunet-gns-proxy.c:2894
 #, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2923 src/rest/gnunet-rest-server.c:917
+#: src/gns/gnunet-gns-proxy.c:2918 src/rest/gnunet-rest-server.c:917
 msgid "Failed to pass client to MHD\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3272
+#: src/gns/gnunet-gns-proxy.c:3267
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3304
+#: src/gns/gnunet-gns-proxy.c:3299
 #, c-format
 msgid "Unsupported socks command %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3390
+#: src/gns/gnunet-gns-proxy.c:3385
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3731
+#: src/gns/gnunet-gns-proxy.c:3726
 #, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3865
+#: src/gns/gnunet-gns-proxy.c:3860
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3870
+#: src/gns/gnunet-gns-proxy.c:3865
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3874
+#: src/gns/gnunet-gns-proxy.c:3869
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3900
+#: src/gns/gnunet-gns-proxy.c:3895
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -3849,7 +3849,7 @@ msgstr ""
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:386
+#: src/gns/gnunet-service-gns_interceptor.c:380
 msgid "Failed to connect to the DNS service!\n"
 msgstr ""
 
@@ -3868,49 +3868,49 @@ msgstr ""
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:904
+#: src/gns/gnunet-service-gns_resolver.c:903
 msgid "Failed to parse DNS response\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1095
+#: src/gns/gnunet-service-gns_resolver.c:1094
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1871
+#: src/gns/gnunet-service-gns_resolver.c:1870
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1886
+#: src/gns/gnunet-service-gns_resolver.c:1885
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1926
+#: src/gns/gnunet-service-gns_resolver.c:1918
 #, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2328
+#: src/gns/gnunet-service-gns_resolver.c:2320
 msgid "Unable to process critical delegation record\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2333
+#: src/gns/gnunet-service-gns_resolver.c:2325
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2356
+#: src/gns/gnunet-service-gns_resolver.c:2348
 #, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2523
+#: src/gns/gnunet-service-gns_resolver.c:2515
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2671
+#: src/gns/gnunet-service-gns_resolver.c:2663
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
@@ -4177,7 +4177,7 @@ msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:677
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1460
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4193,114 +4193,114 @@ msgid ""
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:893
+#: src/hostlist/gnunet-daemon-hostlist_client.c:886
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:908
+#: src/hostlist/gnunet-daemon-hostlist_client.c:901
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:928
+#: src/hostlist/gnunet-daemon-hostlist_client.c:921
 #, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:934
+#: src/hostlist/gnunet-daemon-hostlist_client.c:927
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:942
+#: src/hostlist/gnunet-daemon-hostlist_client.c:935
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:998
+#: src/hostlist/gnunet-daemon-hostlist_client.c:991
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1007
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1000
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1144
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1732
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1137
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1725
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1154
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1147
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1212
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1233
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1205
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1226
 msgid "# active connections"
 msgstr "# connessioni attive"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1396
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1389
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1394
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1412
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1405
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1446
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1456
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1449
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1500
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1514
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1547
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1566
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1540
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1559
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1560
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1553
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1661
-#: src/transport/plugin_transport_http_client.c:2300
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1654
+#: src/transport/plugin_transport_http_client.c:2294
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1690
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1683
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1703
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1696
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1717
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1710
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4370,7 +4370,7 @@ msgid "# hostlist advertisements send"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:674
-#: src/transport/gnunet-service-transport.c:2662
+#: src/transport/gnunet-service-transport.c:2657
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
@@ -4536,7 +4536,7 @@ msgstr ""
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr ""
 
-#: src/identity/plugin_rest_identity.c:1401
+#: src/identity/plugin_rest_identity.c:1529
 msgid "Identity REST API initialized\n"
 msgstr ""
 
@@ -5268,7 +5268,7 @@ msgstr ""
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_mini.c:607
+#: src/nat/gnunet-service-nat_mini.c:602
 msgid "`upnpc' command not found\n"
 msgstr ""
 
@@ -5548,51 +5548,46 @@ msgstr ""
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:209
-#, c-format
-msgid "Invalid DID `%s'\n"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:835
+#: src/reclaim/gnunet-did.c:591
 msgid "Create a DID Document and display its DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:840
+#: src/reclaim/gnunet-did.c:596
 msgid "Get the DID Document associated with the given DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:844
-msgid "Show the DID for a given ego"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:849
+#: src/reclaim/gnunet-did.c:601
 msgid "Remove the DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:853 src/reclaim/gnunet-did.c:857
+#: src/reclaim/gnunet-did.c:605
 msgid "Replace the DID Document."
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:863
+#: src/reclaim/gnunet-did.c:609
+msgid "Show the DID for a given ego"
+msgstr ""
+
+#: src/reclaim/gnunet-did.c:613
+msgid "Show egos with DIDs"
+msgstr ""
+
+#: src/reclaim/gnunet-did.c:619
 msgid "The Decentralized Identity (DID)"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:869
+#: src/reclaim/gnunet-did.c:625
 msgid "The DID Document to store in GNUNET"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:874
+#: src/reclaim/gnunet-did.c:630
 msgid "The name of the EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:880
+#: src/reclaim/gnunet-did.c:636
 msgid "The time until the DID Document is going to expire (e.g. 5d)"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:889
-msgid "Manage Decentralized Identities (DIDs)"
-msgstr ""
-
 #: src/reclaim/gnunet-reclaim.c:802
 #, c-format
 msgid "Ego is required\n"
@@ -5698,56 +5693,56 @@ msgstr ""
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1388
+#: src/regex/gnunet-regex-profiler.c:1366
 msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1430
+#: src/regex/gnunet-regex-profiler.c:1408
 #: src/regex/gnunet-regex-simulation-profiler.c:631
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1436
+#: src/regex/gnunet-regex-profiler.c:1414
 #: src/regex/gnunet-regex-simulation-profiler.c:639
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1444
+#: src/regex/gnunet-regex-profiler.c:1422
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1453
+#: src/regex/gnunet-regex-profiler.c:1431
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1473
+#: src/regex/gnunet-regex-profiler.c:1451
 msgid "Error loading search strings. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1562
+#: src/regex/gnunet-regex-profiler.c:1540
 msgid "name of the file for writing statistics"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1569
+#: src/regex/gnunet-regex-profiler.c:1547
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1575
+#: src/regex/gnunet-regex-profiler.c:1553
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1582
+#: src/regex/gnunet-regex-profiler.c:1560
 msgid "name of file with input strings"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1589
+#: src/regex/gnunet-regex-profiler.c:1567
 msgid "name of file with hosts' names"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1604
+#: src/regex/gnunet-regex-profiler.c:1582
 msgid "Profiler for regex"
 msgstr ""
 
@@ -6669,7 +6664,7 @@ msgstr ""
 #: src/transport/gnunet-communicator-tcp.c:3342
 #: src/transport/gnunet-communicator-udp.c:3867
 #: src/transport/gnunet-service-tng.c:11039
-#: src/transport/gnunet-service-transport.c:2627
+#: src/transport/gnunet-service-transport.c:2622
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
@@ -6721,21 +6716,21 @@ msgid "# bytes payload received"
 msgstr ""
 
 #: src/transport/gnunet-service-transport.c:2019
-#: src/transport/gnunet-service-transport.c:2453
+#: src/transport/gnunet-service-transport.c:2448
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2457
+#: src/transport/gnunet-service-transport.c:2452
 #, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2552
+#: src/transport/gnunet-service-transport.c:2547
 #, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2561
+#: src/transport/gnunet-service-transport.c:2556
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
@@ -7244,24 +7239,24 @@ msgstr ""
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2140
+#: src/transport/plugin_transport_http_client.c:2134
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2189
+#: src/transport/plugin_transport_http_client.c:2183
 #: src/transport/plugin_transport_http_server.c:3276
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2206
+#: src/transport/plugin_transport_http_client.c:2200
 #: src/transport/plugin_transport_http_server.c:3346
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2240
+#: src/transport/plugin_transport_http_client.c:2234
 #, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr ""
@@ -7760,81 +7755,81 @@ msgstr ""
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:227 src/util/bio.c:235
+#: src/util/bio.c:228 src/util/bio.c:236
 #, fuzzy, c-format
 msgid "Error reading `%s' from file: %s"
 msgstr "Errore di lettura da '%s': %s\n"
 
-#: src/util/bio.c:237
+#: src/util/bio.c:238
 msgid "End of file"
 msgstr "Fine del file"
 
-#: src/util/bio.c:266
+#: src/util/bio.c:267
 #, fuzzy, c-format
 msgid "Error while reading `%s' from buffer: %s"
 msgstr "Errore di lettura del file `%s'\n"
 
-#: src/util/bio.c:268
+#: src/util/bio.c:269
 msgid "Not enough data left"
 msgstr ""
 
-#: src/util/bio.c:308
+#: src/util/bio.c:309
 #, c-format
 msgid "Invalid handle type while reading `%s'"
 msgstr ""
 
-#: src/util/bio.c:335 src/util/bio.c:839
+#: src/util/bio.c:336 src/util/bio.c:840
 msgid "string length"
 msgstr ""
 
-#: src/util/bio.c:341
+#: src/util/bio.c:342
 #, fuzzy, c-format
 msgid "%s (while reading `%s')"
 msgstr "Errore di lettura del file `%s'\n"
 
-#: src/util/bio.c:346
+#: src/util/bio.c:347
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:359
+#: src/util/bio.c:360
 #, c-format
 msgid "String `%s' longer than allowed (%u > %lu)"
 msgstr ""
 
-#: src/util/bio.c:398 src/util/bio.c:864 src/util/bio.c:881
+#: src/util/bio.c:399 src/util/bio.c:865 src/util/bio.c:882
 msgid "metadata length"
 msgstr ""
 
-#: src/util/bio.c:410
+#: src/util/bio.c:411
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:426
+#: src/util/bio.c:427
 #, fuzzy, c-format
 msgid "Failed to deserialize metadata `%s'"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/util/bio.c:668
+#: src/util/bio.c:669
 msgid "Unable to flush buffer to file"
 msgstr ""
 
-#: src/util/bio.c:730 src/util/bio.c:751
+#: src/util/bio.c:731 src/util/bio.c:752
 #, fuzzy, c-format
 msgid "Error while writing `%s' to file: %s"
 msgstr "Errore di lettura del file `%s'\n"
 
-#: src/util/bio.c:732
+#: src/util/bio.c:733
 msgid "No associated file"
 msgstr ""
 
-#: src/util/bio.c:816
+#: src/util/bio.c:817
 #, c-format
 msgid "Invalid handle type while writing `%s'"
 msgstr ""
 
-#: src/util/bio.c:876
+#: src/util/bio.c:877
 #, fuzzy, c-format
 msgid "Failed to serialize metadata `%s'"
 msgstr "Impossibile avviare il servizio ' %s'\n"
@@ -7843,7 +7838,7 @@ msgstr "Impossibile avviare il servizio ' %s'\n"
 msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:1106
+#: src/util/client.c:1095
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -7853,53 +7848,53 @@ msgstr ""
 msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:926
+#: src/util/common_logging.c:911
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1131
+#: src/util/common_logging.c:1104
 msgid "ERROR"
 msgstr "ERRORE"
 
-#: src/util/common_logging.c:1133
+#: src/util/common_logging.c:1106
 msgid "WARNING"
 msgstr "ATTENZIONE"
 
-#: src/util/common_logging.c:1135
+#: src/util/common_logging.c:1108
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:1137
+#: src/util/common_logging.c:1110
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:1139
+#: src/util/common_logging.c:1112
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:1141
+#: src/util/common_logging.c:1114
 msgid "NONE"
 msgstr "NESSUNA"
 
-#: src/util/common_logging.c:1142
+#: src/util/common_logging.c:1115
 msgid "INVALID"
 msgstr "NON VALIDO"
 
-#: src/util/common_logging.c:1423
+#: src/util/common_logging.c:1396
 msgid "unknown address"
 msgstr "indirizzo sconosciuto"
 
-#: src/util/common_logging.c:1468
+#: src/util/common_logging.c:1441
 msgid "invalid address"
 msgstr "indirizzo non valido"
 
-#: src/util/common_logging.c:1487
+#: src/util/common_logging.c:1453
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/util/common_logging.c:1510
+#: src/util/common_logging.c:1468
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -7993,7 +7988,7 @@ msgstr ""
 msgid "failed to load configuration defaults"
 msgstr ""
 
-#: src/util/container_bloomfilter.c:542
+#: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -8005,16 +8000,16 @@ msgstr ""
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:669
+#: src/util/crypto_ecc.c:689
 #, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:280
+#: src/util/crypto_ecc_setup.c:272
 msgid "Could not load peer's private key\n"
 msgstr ""
 
-#: src/util/crypto_random.c:385
+#: src/util/crypto_random.c:372
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
@@ -8529,17 +8524,17 @@ msgstr ""
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr ""
 
-#: src/util/plugin.c:156
+#: src/util/plugin.c:157
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:234
+#: src/util/plugin.c:214
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:414
+#: src/util/plugin.c:370
 msgid "Could not determine plugin installation path.\n"
 msgstr ""
 
diff --git a/po/sr.po b/po/sr.po
index 458337d68..5cfa9f99b 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-08-05 13:57+0200\n"
+"POT-Creation-Date: 2022-09-04 11:01+0200\n"
 "PO-Revision-Date: 2020-10-23 18:39+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
@@ -675,7 +675,7 @@ msgstr ""
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:326
+#: src/ats/gnunet-service-ats_plugins.c:321
 #, fuzzy, c-format
 msgid ""
 "Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
@@ -684,12 +684,12 @@ msgstr ""
 "Не могу да учитам квоту за мрежу „%s“:  „%s“, додељујем основни пропусни "
 "опсег %llu\n"
 
-#: src/ats/gnunet-service-ats_plugins.c:336
+#: src/ats/gnunet-service-ats_plugins.c:331
 #, fuzzy, c-format
 msgid "%s quota configured for network `%s' is %llu\n"
 msgstr "Квота долазности подешена за мрежу „%s“ је %llu\n"
 
-#: src/ats/gnunet-service-ats_plugins.c:382
+#: src/ats/gnunet-service-ats_plugins.c:377
 #, fuzzy, c-format
 msgid ""
 "No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
@@ -697,7 +697,7 @@ msgstr ""
 "Нема подешене одлазне квоте за мрежу „%s“, додељујем основни пропусни опсег "
 "%llu\n"
 
-#: src/ats/gnunet-service-ats_plugins.c:474
+#: src/ats/gnunet-service-ats_plugins.c:462
 #, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "Нисам успео да покренем решавача „%s“!\n"
@@ -1495,41 +1495,41 @@ msgstr "# временски истеци су спречени путем ПО
 msgid "# rekey operations confirmed via PONG"
 msgstr "# операције рекључа су потврђене путем ПОНГ-а"
 
-#: src/core/gnunet-service-core_kx.c:1513
+#: src/core/gnunet-service-core_kx.c:1506
 msgid "# DATA message dropped (out of order)"
 msgstr "# ПОДАТАКА порука је одбачена (ван поретка)"
 
-#: src/core/gnunet-service-core_kx.c:1524
+#: src/core/gnunet-service-core_kx.c:1517
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 "Сесија за парњака „%s“ је пала услед истека кључа (није требало да се деси)\n"
 
-#: src/core/gnunet-service-core_kx.c:1528
+#: src/core/gnunet-service-core_kx.c:1521
 msgid "# sessions terminated by key expiration"
 msgstr "# сесије су окончане истеком кључа"
 
-#: src/core/gnunet-service-core_kx.c:1606
-#: src/core/gnunet-service-core_kx.c:1633
+#: src/core/gnunet-service-core_kx.c:1599
+#: src/core/gnunet-service-core_kx.c:1626
 msgid "# bytes dropped (duplicates)"
 msgstr "# бајтови одбачени (удвострученост)"
 
-#: src/core/gnunet-service-core_kx.c:1619
+#: src/core/gnunet-service-core_kx.c:1612
 msgid "# bytes dropped (out of sequence)"
 msgstr "# бајтови одбачени (ван низа)"
 
-#: src/core/gnunet-service-core_kx.c:1664
+#: src/core/gnunet-service-core_kx.c:1657
 msgid "# bytes dropped (ancient message)"
 msgstr "# бајтови одбачени (стара порука)"
 
-#: src/core/gnunet-service-core_kx.c:1673
+#: src/core/gnunet-service-core_kx.c:1666
 msgid "# bytes of payload decrypted"
 msgstr "# бајтови утовара су дешифровани"
 
 #: src/core/gnunet-service-core_sessions.c:252
 #: src/core/gnunet-service-core_sessions.c:337
-#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1519
+#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1496
 #: src/topology/gnunet-daemon-topology.c:579
 #: src/topology/gnunet-daemon-topology.c:671
 #: src/transport/gnunet-service-transport_neighbours.c:723
@@ -1619,31 +1619,31 @@ msgstr "# Резултати су примљени"
 msgid "# datastore connections (re)created"
 msgstr "# везе смештаја података су (поново) створене"
 
-#: src/datastore/datastore_api.c:1032
+#: src/datastore/datastore_api.c:1007
 msgid "# PUT requests executed"
 msgstr "# захтеви СТАВИ су извршени"
 
-#: src/datastore/datastore_api.c:1093
+#: src/datastore/datastore_api.c:1068
 msgid "# RESERVE requests executed"
 msgstr "# захтеви РЕЗЕРВИШИ су извршени"
 
-#: src/datastore/datastore_api.c:1158
+#: src/datastore/datastore_api.c:1113
 msgid "# RELEASE RESERVE requests executed"
 msgstr "# захтеви ОТПУСТИ РЕЗЕРВИШИ су извршени"
 
-#: src/datastore/datastore_api.c:1236
+#: src/datastore/datastore_api.c:1171
 msgid "# REMOVE requests executed"
 msgstr "# захтеви УКЛОНИ су извршени"
 
-#: src/datastore/datastore_api.c:1295
+#: src/datastore/datastore_api.c:1230
 msgid "# GET REPLICATION requests executed"
 msgstr "# захтеви ДОБАВИ ПРЕСЛИКАНОСТ су изршени"
 
-#: src/datastore/datastore_api.c:1357
+#: src/datastore/datastore_api.c:1276
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr "# захтеви ДОБАВИ НУЛТУ АНОНИМНОСТ су извршени"
 
-#: src/datastore/datastore_api.c:1438
+#: src/datastore/datastore_api.c:1357
 msgid "# GET requests executed"
 msgstr "# захтеви ДОБАВИ су извршени"
 
@@ -1986,48 +1986,48 @@ msgstr ""
 "Резултат %d, врста %d:\n"
 "%.*s\n"
 
-#: src/dht/gnunet-dht-get.c:221
+#: src/dht/gnunet-dht-get.c:238
 msgid "Must provide key for DHT GET!\n"
 msgstr "Морате доставити кључ за ДХТ ДОБАВИ!\n"
 
-#: src/dht/gnunet-dht-get.c:229 src/dht/gnunet-dht-hello.c:119
+#: src/dht/gnunet-dht-get.c:246 src/dht/gnunet-dht-hello.c:119
 #: src/dht/gnunet-dht-monitor.c:255
 #, c-format
 msgid "Failed to connect to DHT service!\n"
 msgstr "Нисам успео да се повежем са „DHT“ услугом!\n"
 
-#: src/dht/gnunet-dht-get.c:239
+#: src/dht/gnunet-dht-get.c:256
 #, fuzzy
 msgid "Issuing DHT GET with key"
 msgstr "Издајем ДХТ ДОБАВИ са кључем"
 
-#: src/dht/gnunet-dht-get.c:275 src/dht/gnunet-dht-monitor.c:302
+#: src/dht/gnunet-dht-get.c:292 src/dht/gnunet-dht-monitor.c:302
 #: src/dht/gnunet-dht-put.c:200
 msgid "the query key"
 msgstr "кључ упита"
 
-#: src/dht/gnunet-dht-get.c:281
+#: src/dht/gnunet-dht-get.c:298
 msgid "how many parallel requests (replicas) to create"
 msgstr "колико паралелних захтева (реплика) да направи"
 
-#: src/dht/gnunet-dht-get.c:286 src/dht/gnunet-dht-put.c:217
+#: src/dht/gnunet-dht-get.c:303 src/dht/gnunet-dht-put.c:217
 #, fuzzy
 msgid "use DHT's record route option"
 msgstr "користи опцију ДХТ-а демултиплексирај свуда"
 
-#: src/dht/gnunet-dht-get.c:292 src/dht/gnunet-dht-monitor.c:308
+#: src/dht/gnunet-dht-get.c:309 src/dht/gnunet-dht-monitor.c:308
 msgid "the type of data to look for"
 msgstr "врста података за тражење"
 
-#: src/dht/gnunet-dht-get.c:298
+#: src/dht/gnunet-dht-get.c:315
 msgid "how long to execute this query before giving up?"
 msgstr "колико дуго да извршава овај упит пре одустајања?"
 
-#: src/dht/gnunet-dht-get.c:304 src/dht/gnunet-dht-put.c:206
+#: src/dht/gnunet-dht-get.c:321 src/dht/gnunet-dht-put.c:206
 msgid "use DHT's demultiplex everywhere option"
 msgstr "користи опцију ДХТ-а демултиплексирај свуда"
 
-#: src/dht/gnunet-dht-get.c:321
+#: src/dht/gnunet-dht-get.c:338
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr "Издаје ДОБАВИ захтев ГНУнет ДХТ-у, исписује резултате."
 
@@ -2465,76 +2465,76 @@ msgstr "# битови су уклоњени из АЦК-ова расцепка
 msgid "# fragmentation transmissions completed"
 msgstr "# преноси расцепканости су завршени"
 
-#: src/fs/fs_api.c:491
+#: src/fs/fs_api.c:480
 #, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Не могу да отворим датотеку „%s“: %s"
 
-#: src/fs/fs_api.c:502
+#: src/fs/fs_api.c:491
 #, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Не могу да читам датотеку „%s“: %s"
 
-#: src/fs/fs_api.c:510
+#: src/fs/fs_api.c:499
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr "Кратко читање читајући из датотеке „%s“!"
 
-#: src/fs/fs_api.c:1173
+#: src/fs/fs_api.c:1156
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Нисам успео да наставим са подацима објављивања „%s“: %s\n"
 
-#: src/fs/fs_api.c:1724
+#: src/fs/fs_api.c:1707
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr "Неуспех приликом настављања са радњом објављивања „%s“: %s\n"
 
-#: src/fs/fs_api.c:1739
+#: src/fs/fs_api.c:1722
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Нисам успео да наставим са радњом објављивања „%s“: %s\n"
 
-#: src/fs/fs_api.c:2468
+#: src/fs/fs_api.c:2451
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 "Неуспех приликом настављања са радњом поништавања индексирања „%s“: %s\n"
 
-#: src/fs/fs_api.c:2479
+#: src/fs/fs_api.c:2462
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Нисам успео да наставим са радњом поништавања индексирања „%s“: %s\n"
 
-#: src/fs/fs_api.c:2627 src/fs/fs_api.c:2873
+#: src/fs/fs_api.c:2610 src/fs/fs_api.c:2856
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Нисам успео да наставим са садржаним преузимањем „%s“: %s\n"
 
-#: src/fs/fs_api.c:2645
+#: src/fs/fs_api.c:2628
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Нисам успео да наставим са садржаном претрагом „%s“: %s\n"
 
-#: src/fs/fs_api.c:2661 src/fs/fs_api.c:2681 src/fs/fs_api.c:3180
+#: src/fs/fs_api.c:2644 src/fs/fs_api.c:2664 src/fs/fs_api.c:3163
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr "Неуспех приликом настављања са радњом претраге „%s“: %s\n"
 
-#: src/fs/fs_api.c:2863
+#: src/fs/fs_api.c:2846
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 "Нисам успео да наставим са садржаним преузимањем „%s“: не могу да отворим "
 "датотеку „%s“\n"
 
-#: src/fs/fs_api.c:3124
+#: src/fs/fs_api.c:3107
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 "Не могу да наставим са покренутом претрагом, наставићу као са паузираном "
 "претрагом\n"
 
-#: src/fs/fs_api.c:3219
+#: src/fs/fs_api.c:3202
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr "Неуспех приликом настављања са радњом преузимања „%s“: %s\n"
@@ -2571,7 +2571,7 @@ msgstr "Нисам успео да отворим датотеку „%s“ за
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Нисам успео да направим директоријум за дубинско преузимање „%s“\n"
 
-#: src/fs/fs_download.c:1053
+#: src/fs/fs_download.c:1044
 #, fuzzy, c-format
 msgid ""
 "Internal error or bogus download URI (expected %lu bytes at depth %u and "
@@ -2580,31 +2580,31 @@ msgstr ""
 "Унутрашња грешка или лажна путања преузимања (очекивах %u бајта на дубини %u "
 "и померају %llu/%llu, добих %u бајта)"
 
-#: src/fs/fs_download.c:1075
+#: src/fs/fs_download.c:1066
 msgid "internal error decrypting content"
 msgstr "унутрашња грешка дешифровања садржаја"
 
-#: src/fs/fs_download.c:1098
+#: src/fs/fs_download.c:1089
 #, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Преузимање није успело: не могу да отворим датотеку „%s“: %s"
 
-#: src/fs/fs_download.c:1109
+#: src/fs/fs_download.c:1100
 #, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Нисам успео да пређем на померај %llu у датотеци „%s“: %s"
 
-#: src/fs/fs_download.c:1119
+#: src/fs/fs_download.c:1110
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
 "Нисам успео да запишем блок од %u бајта на померају %llu у датотеци „%s“: %s"
 
-#: src/fs/fs_download.c:1227
+#: src/fs/fs_download.c:1218
 msgid "internal error decoding tree"
 msgstr "унутрашња грешка декодирања стабла"
 
-#: src/fs/fs_download.c:1899
+#: src/fs/fs_download.c:1890
 msgid "Invalid URI"
 msgstr "Неисправан УРИ"
 
@@ -2717,11 +2717,11 @@ msgstr "# Неуспеси „СТАВИ“ смештаја података"
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr "Резервишем простор за %u уноса и %llu бајта за објављивање\n"
 
-#: src/fs/fs_publish_ksk.c:218
+#: src/fs/fs_publish_ksk.c:212
 msgid "Could not connect to datastore."
 msgstr "Не могу да се повежем са смештајем података."
 
-#: src/fs/fs_publish_ublock.c:240
+#: src/fs/fs_publish_ublock.c:215
 msgid "Internal error."
 msgstr "Унутрашња грешка."
 
@@ -3488,61 +3488,61 @@ msgstr "# везе меш клијента су одбијене"
 msgid "# cadet connections active"
 msgstr "# меш везе су радне"
 
-#: src/fs/gnunet-service-fs_cp.c:680
+#: src/fs/gnunet-service-fs_cp.c:665
 msgid "# migration stop messages received"
 msgstr "# поруке заустављања миграције су примљене"
 
-#: src/fs/gnunet-service-fs_cp.c:684
+#: src/fs/gnunet-service-fs_cp.c:669
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr "Премештање садржаја за парњака „%s“ је блокирано за %s\n"
 
-#: src/fs/gnunet-service-fs_cp.c:717 src/fs/gnunet-service-fs_cp.c:1342
+#: src/fs/gnunet-service-fs_cp.c:702 src/fs/gnunet-service-fs_cp.c:1327
 msgid "# P2P searches active"
 msgstr "# П2П претраге су активне"
 
-#: src/fs/gnunet-service-fs_cp.c:812
+#: src/fs/gnunet-service-fs_cp.c:797
 msgid "# artificial delays introduced (ms)"
 msgstr "# вештачка кашњења су уведена (ms)"
 
-#: src/fs/gnunet-service-fs_cp.c:1009
+#: src/fs/gnunet-service-fs_cp.c:994
 msgid "# requests done for free (low load)"
 msgstr "# захтева је готово за џабе (слабо учитавање)"
 
-#: src/fs/gnunet-service-fs_cp.c:1034
+#: src/fs/gnunet-service-fs_cp.c:1019
 msgid "# request dropped, priority insufficient"
 msgstr "# захтева је одбачено, недовољно хитности"
 
-#: src/fs/gnunet-service-fs_cp.c:1044
+#: src/fs/gnunet-service-fs_cp.c:1029
 msgid "# requests done for a price (normal load)"
 msgstr "# захтева је готово за цену (нормално учитавање)"
 
-#: src/fs/gnunet-service-fs_cp.c:1141
+#: src/fs/gnunet-service-fs_cp.c:1126
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# захтеви су одбачени услед вишег-ТТЛ захтева"
 
-#: src/fs/gnunet-service-fs_cp.c:1199
+#: src/fs/gnunet-service-fs_cp.c:1184
 msgid "# GET requests received (from other peers)"
 msgstr "# „GET“ захтеви су примљени (од других парњака)"
 
-#: src/fs/gnunet-service-fs_cp.c:1223
+#: src/fs/gnunet-service-fs_cp.c:1208
 msgid "# requests dropped due to missing reverse route"
 msgstr "# захтеви су одбачени јер недостаје повратна рута"
 
-#: src/fs/gnunet-service-fs_cp.c:1237
+#: src/fs/gnunet-service-fs_cp.c:1222
 #, fuzzy
 msgid "# requests dropped due to full reply queue"
 msgstr "# П2П поруке су одбачене због пуног реда"
 
-#: src/fs/gnunet-service-fs_cp.c:1294
+#: src/fs/gnunet-service-fs_cp.c:1279
 msgid "# requests dropped due TTL underflow"
 msgstr "# захтеви су одбачени услед ниског ТТЛ тока"
 
-#: src/fs/gnunet-service-fs_cp.c:1338
+#: src/fs/gnunet-service-fs_cp.c:1323
 msgid "# P2P query messages received and processed"
 msgstr "# поруке П2П упита су примљене и обрађене"
 
-#: src/fs/gnunet-service-fs_cp.c:1708
+#: src/fs/gnunet-service-fs_cp.c:1679
 msgid "# migration stop messages sent"
 msgstr "# поруке зауставља миграције су послате"
 
@@ -3562,26 +3562,26 @@ msgstr "Грешка писања „%s“.\n"
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Нисам успео да обришем лажни блок: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:317
+#: src/fs/gnunet-service-fs_indexing.c:297
 msgid "# index blocks removed: original file inaccessible"
 msgstr "# блокови индекси су уклоњени: изворна датотека је неприступачна"
 
-#: src/fs/gnunet-service-fs_indexing.c:331
+#: src/fs/gnunet-service-fs_indexing.c:311
 #, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
 "Не могу да приступим индексираној датотеци „%s“ (%s) на померају %llu: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:335
+#: src/fs/gnunet-service-fs_indexing.c:315
 msgid "not indexed"
 msgstr "није индексирано"
 
-#: src/fs/gnunet-service-fs_indexing.c:349
+#: src/fs/gnunet-service-fs_indexing.c:329
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Индексирана датотека „%s“ је измењена на померају %llu\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:455
+#: src/fs/gnunet-service-fs_indexing.c:435
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3619,98 +3619,98 @@ msgstr "# захтеви су освежени"
 msgid "# query plan entries"
 msgstr "# пропитује обичне уносе"
 
-#: src/fs/gnunet-service-fs_pr.c:325
+#: src/fs/gnunet-service-fs_pr.c:305
 msgid "# Pending requests created"
 msgstr "# Захтеви на чекању су створени"
 
-#: src/fs/gnunet-service-fs_pr.c:416 src/fs/gnunet-service-fs_pr.c:654
+#: src/fs/gnunet-service-fs_pr.c:396 src/fs/gnunet-service-fs_pr.c:626
 msgid "# Pending requests active"
 msgstr "# Захтеви на чекању су активни"
 
-#: src/fs/gnunet-service-fs_pr.c:829
+#: src/fs/gnunet-service-fs_pr.c:795
 msgid "# replies received and matched"
 msgstr "# одговори су примљени и подударени"
 
-#: src/fs/gnunet-service-fs_pr.c:903
+#: src/fs/gnunet-service-fs_pr.c:869
 msgid "# results found locally"
 msgstr "# резултати су пронађени локално"
 
-#: src/fs/gnunet-service-fs_pr.c:1037
+#: src/fs/gnunet-service-fs_pr.c:1003
 msgid "# Datastore `PUT' failures"
 msgstr "# Неуспеси „СТАВИ“ смештаја података"
 
-#: src/fs/gnunet-service-fs_pr.c:1066
+#: src/fs/gnunet-service-fs_pr.c:1032
 msgid "# storage requests dropped due to high load"
 msgstr "# захтеви смештаја су одбачени услед високог утовара"
 
-#: src/fs/gnunet-service-fs_pr.c:1107
+#: src/fs/gnunet-service-fs_pr.c:1073
 msgid "# Replies received from DHT"
 msgstr "# Одговори су примљени од DHT-а"
 
-#: src/fs/gnunet-service-fs_pr.c:1262
+#: src/fs/gnunet-service-fs_pr.c:1228
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# Одговори су примљени од DHT-а"
 
-#: src/fs/gnunet-service-fs_pr.c:1317
+#: src/fs/gnunet-service-fs_pr.c:1283
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr "Претрага смештаја података је већ узела „%s“!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1338
+#: src/fs/gnunet-service-fs_pr.c:1304
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr "Претрага на-захтев је већ узела „%s“!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1405
+#: src/fs/gnunet-service-fs_pr.c:1371
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr "# захтевани DBLOCK или IBLOCK нису нађени"
 
-#: src/fs/gnunet-service-fs_pr.c:1467
+#: src/fs/gnunet-service-fs_pr.c:1433
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr "# Претраге смештаја података су закључене (грешка стављања у ред)"
 
-#: src/fs/gnunet-service-fs_pr.c:1522
+#: src/fs/gnunet-service-fs_pr.c:1488
 msgid "# Datastore lookups concluded (no results)"
 msgstr "# Претраге смештаја података су закључене (нема резултата)"
 
-#: src/fs/gnunet-service-fs_pr.c:1537
+#: src/fs/gnunet-service-fs_pr.c:1503
 msgid "# Datastore lookups concluded (seen all)"
 msgstr "# Претраге смештаја података су закључене (видех све)"
 
-#: src/fs/gnunet-service-fs_pr.c:1560
+#: src/fs/gnunet-service-fs_pr.c:1526
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr "# Претраге смештаја података су прекинуте (више од „MAX_RESULTS“)"
 
-#: src/fs/gnunet-service-fs_pr.c:1577
+#: src/fs/gnunet-service-fs_pr.c:1543
 msgid "# on-demand blocks matched requests"
 msgstr "# блокови на-захтев одговарају захтевима"
 
-#: src/fs/gnunet-service-fs_pr.c:1598
+#: src/fs/gnunet-service-fs_pr.c:1564
 msgid "# on-demand lookups performed successfully"
 msgstr "# претраге на-захтев су обављене успешно"
 
-#: src/fs/gnunet-service-fs_pr.c:1604
+#: src/fs/gnunet-service-fs_pr.c:1570
 msgid "# on-demand lookups failed"
 msgstr "# претраге на-захтев нису успеле"
 
-#: src/fs/gnunet-service-fs_pr.c:1650
+#: src/fs/gnunet-service-fs_pr.c:1616
 msgid "# Datastore lookups concluded (found last result)"
 msgstr "# Претраге смештаја података су закључене (нађох последњи резултат)"
 
-#: src/fs/gnunet-service-fs_pr.c:1663
+#: src/fs/gnunet-service-fs_pr.c:1629
 msgid "# Datastore lookups concluded (load too high)"
 msgstr "# Претраге смештаја података су закључене (утовар је превелик)"
 
-#: src/fs/gnunet-service-fs_pr.c:1714
+#: src/fs/gnunet-service-fs_pr.c:1680
 msgid "# Datastore lookups initiated"
 msgstr "# Претраге смештаја података су покренуте"
 
-#: src/fs/gnunet-service-fs_pr.c:1778
+#: src/fs/gnunet-service-fs_pr.c:1744
 msgid "# GAP PUT messages received"
 msgstr "# поруке ЈАЗ СТАВИ су примљене"
 
-#: src/fs/gnunet-service-fs_push.c:648
+#: src/fs/gnunet-service-fs_push.c:643
 msgid "time required, content pushing disabled"
 msgstr "време је затражено, гурање садржаја је искључено"
 
@@ -3840,11 +3840,11 @@ msgstr "Овај програм ће увести неке ГНС ауторит
 #: src/hostlist/gnunet-daemon-hostlist_client.c:544
 #: src/hostlist/gnunet-daemon-hostlist_client.c:772
 #: src/hostlist/gnunet-daemon-hostlist_client.c:781
-#: src/hostlist/gnunet-daemon-hostlist_client.c:836
-#: src/hostlist/gnunet-daemon-hostlist_client.c:848
-#: src/hostlist/gnunet-daemon-hostlist_client.c:964
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1066
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1074
+#: src/hostlist/gnunet-daemon-hostlist_client.c:835
+#: src/hostlist/gnunet-daemon-hostlist_client.c:847
+#: src/hostlist/gnunet-daemon-hostlist_client.c:957
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1059
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1067
 #: src/transport/plugin_transport_http_client.c:600
 #: src/transport/plugin_transport_http_client.c:618
 #, c-format
@@ -3896,58 +3896,58 @@ msgstr "Домен колачића „%s“ које је доставио се
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Неподржан ХТТП метод „%s“\n"
 
-#: src/gns/gnunet-gns-proxy.c:2658
+#: src/gns/gnunet-gns-proxy.c:2653
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Не могу да увезем приватни кључ из датотеке „%s“\n"
 
-#: src/gns/gnunet-gns-proxy.c:2690
+#: src/gns/gnunet-gns-proxy.c:2685
 #, fuzzy, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr "Не могу да увезем уверење „%s“\n"
 
-#: src/gns/gnunet-gns-proxy.c:2899
+#: src/gns/gnunet-gns-proxy.c:2894
 #, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Нисам успео да покренем ХТТПС сервер за „%s“\n"
 
-#: src/gns/gnunet-gns-proxy.c:2923 src/rest/gnunet-rest-server.c:917
+#: src/gns/gnunet-gns-proxy.c:2918 src/rest/gnunet-rest-server.c:917
 msgid "Failed to pass client to MHD\n"
 msgstr "Нисам успео да проследим клијента МХД-у\n"
 
-#: src/gns/gnunet-gns-proxy.c:3272
+#: src/gns/gnunet-gns-proxy.c:3267
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Неподржано издање прикључнице %d\n"
 
-#: src/gns/gnunet-gns-proxy.c:3304
+#: src/gns/gnunet-gns-proxy.c:3299
 #, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Неподржана наредба прикључнице %d\n"
 
-#: src/gns/gnunet-gns-proxy.c:3390
+#: src/gns/gnunet-gns-proxy.c:3385
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Неподржана врста адресе прикључнице %d\n"
 
-#: src/gns/gnunet-gns-proxy.c:3731
+#: src/gns/gnunet-gns-proxy.c:3726
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Нисам успео да учитам ССЛ/ТЛС кључ и уверење из „%s“\n"
 
-#: src/gns/gnunet-gns-proxy.c:3865
+#: src/gns/gnunet-gns-proxy.c:3860
 msgid "listen on specified port (default: 7777)"
 msgstr "ослушкиван на наведеном прикључнику (основно: 7777)"
 
-#: src/gns/gnunet-gns-proxy.c:3870
+#: src/gns/gnunet-gns-proxy.c:3865
 msgid "pem file to use as CA"
 msgstr "пем датотека за коришћење као издавач уверења"
 
-#: src/gns/gnunet-gns-proxy.c:3874
+#: src/gns/gnunet-gns-proxy.c:3869
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3900
+#: src/gns/gnunet-gns-proxy.c:3895
 msgid "GNUnet GNS proxy"
 msgstr "ГНУнет ГНС посредник"
 
@@ -4014,7 +4014,7 @@ msgstr "Не могу да се повежем на ДХТ!\n"
 msgid "Error converting GNS response to DNS response!\n"
 msgstr "Грешка претварања ГНС одговора у ДНС одговор!\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:386
+#: src/gns/gnunet-service-gns_interceptor.c:380
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Нисам успео да се повежем са ДНС услугом!\n"
 
@@ -4033,49 +4033,49 @@ msgstr ""
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:904
+#: src/gns/gnunet-service-gns_resolver.c:903
 msgid "Failed to parse DNS response\n"
 msgstr "Нисам успео да обрадим ДНС одговор\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1095
+#: src/gns/gnunet-service-gns_resolver.c:1094
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr "Прескачем запис неподржане врсте %d\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1871
+#: src/gns/gnunet-service-gns_resolver.c:1870
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1886
+#: src/gns/gnunet-service-gns_resolver.c:1885
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr "ГНС претраживање је резултирало ДНС називом који је предуг („%s“)\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1926
+#: src/gns/gnunet-service-gns_resolver.c:1918
 #, fuzzy, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr "Дубачење ГНС претраге није успело (нисам нашао запис изасланства)\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2328
+#: src/gns/gnunet-service-gns_resolver.c:2320
 msgid "Unable to process critical delegation record\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2333
+#: src/gns/gnunet-service-gns_resolver.c:2325
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr "Дубачење ГНС претраге није успело (нисам нашао запис изасланства)\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2356
+#: src/gns/gnunet-service-gns_resolver.c:2348
 #, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Нисам успео да сместим у оставу ГНС резолуцију: %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2523
+#: src/gns/gnunet-service-gns_resolver.c:2515
 #, fuzzy, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr "АТС је вратио резултате за %u адресе\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2671
+#: src/gns/gnunet-service-gns_resolver.c:2663
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr "Зона %s је опозвана, резолуција није успела\n"
@@ -4348,7 +4348,7 @@ msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# исправни „HELLO“-и су преузети са сервера списка домаћина"
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:677
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1460
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
 msgid "# advertised hostlist URIs"
 msgstr "# рекламиране путање списка домаћина"
 
@@ -4366,118 +4366,118 @@ msgstr ""
 "Рекламирани списак домаћина са путањом „%s“ се не може преузети. Рекламирана "
 "путања је одбачена.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:893
+#: src/hostlist/gnunet-daemon-hostlist_client.c:886
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Време је истекло у покушају преузимања списка домаћина са „%s“\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:908
+#: src/hostlist/gnunet-daemon-hostlist_client.c:901
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 "Ограничење преузимања од %u бајта је премашено, заустављам преузимање\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:928
+#: src/hostlist/gnunet-daemon-hostlist_client.c:921
 #, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "Преузимање списка доамаћина са „%s“ није успело: „%s“\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:934
+#: src/hostlist/gnunet-daemon-hostlist_client.c:927
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr "Преузимање списка домаћина „%s“ је завршено.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:942
+#: src/hostlist/gnunet-daemon-hostlist_client.c:935
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr "Додаје успешно тестирани смештај података „%s“ списка домаћина.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:998
+#: src/hostlist/gnunet-daemon-hostlist_client.c:991
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr "Вршим почетно подизање помоћу списка домаћина на „%s“.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1007
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1000
 msgid "# hostlist downloads initiated"
 msgstr "# преузимања списка домаћина су започета"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1144
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1732
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1137
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1725
 msgid "# milliseconds between hostlist downloads"
 msgstr "# милисекунди између преузимања списка домаћина"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1154
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1147
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr "Имам %u/%u везе.  Размотрићу преузимање списка домаћина за %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1212
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1233
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1205
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1226
 msgid "# active connections"
 msgstr "# активних веза"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1396
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1389
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Учитавам сачуване уносе списка домаћина из датотеке „%s“ \n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1394
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Датотека списка домаћина „%s“ не постоји\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1412
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1405
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 "Не могу да отворим датотеку „%s“ за читање да утоварим спискове домаћина: "
 "%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1446
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr "УРИ-и %u списка домаћина су учитани из датотеке\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1456
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1449
 msgid "# hostlist URIs read from file"
 msgstr "# УРИ-и списка домаћина су учитани из датотеке"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1500
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 "Не могу да отворим датотеку „%s“ за писање да сачувам спискове домаћина: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1514
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Уписујем УРИ-је %u списка домаћина у „%s“\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1547
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1566
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1540
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1559
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr "Грешка писања УРИ-а списка домаћина у датотеку „%s“\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1560
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1553
 msgid "# hostlist URIs written to file"
 msgstr "# УРИ-и списка домаћина су записани у датотеку"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1661
-#: src/transport/plugin_transport_http_client.c:2300
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1654
+#: src/transport/plugin_transport_http_client.c:2294
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1690
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1683
 msgid "Learning is enabled on this peer\n"
 msgstr "Учење је укључено на овом парњаку\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1703
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1696
 msgid "Learning is not enabled on this peer\n"
 msgstr "Учење није укључено на овом парњаку\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1717
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1710
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4549,7 +4549,7 @@ msgid "# hostlist advertisements send"
 msgstr "# рекламе списка домаћина су послате"
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:674
-#: src/transport/gnunet-service-transport.c:2662
+#: src/transport/gnunet-service-transport.c:2657
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Не могу да приступим услузи ИНФО_ПАРЊАКА.  Излазим.\n"
 
@@ -4724,7 +4724,7 @@ msgstr ""
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Нисам успео да направим директоријум „%s“ за смештајне егое\n"
 
-#: src/identity/plugin_rest_identity.c:1401
+#: src/identity/plugin_rest_identity.c:1529
 msgid "Identity REST API initialized\n"
 msgstr ""
 
@@ -5482,7 +5482,7 @@ msgstr "Нисам успео да покренем „%s“\n"
 msgid "`external-ip' command not found\n"
 msgstr "нисам нашао наредбу „external-ip“\n"
 
-#: src/nat/gnunet-service-nat_mini.c:607
+#: src/nat/gnunet-service-nat_mini.c:602
 msgid "`upnpc' command not found\n"
 msgstr "нисам нашао „upnpc“ наредбу\n"
 
@@ -5770,51 +5770,46 @@ msgstr "Нисам успео да се повежем са „%s“ услуг
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr "Демон за покретање за обављање превода ИП протокола у ГНУнет"
 
-#: src/reclaim/gnunet-did.c:209
-#, fuzzy, c-format
-msgid "Invalid DID `%s'\n"
-msgstr "Неисправан УРИ „%s“\n"
-
-#: src/reclaim/gnunet-did.c:835
+#: src/reclaim/gnunet-did.c:591
 msgid "Create a DID Document and display its DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:840
+#: src/reclaim/gnunet-did.c:596
 msgid "Get the DID Document associated with the given DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:844
-msgid "Show the DID for a given ego"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:849
+#: src/reclaim/gnunet-did.c:601
 msgid "Remove the DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:853 src/reclaim/gnunet-did.c:857
+#: src/reclaim/gnunet-did.c:605
 msgid "Replace the DID Document."
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:863
+#: src/reclaim/gnunet-did.c:609
+msgid "Show the DID for a given ego"
+msgstr ""
+
+#: src/reclaim/gnunet-did.c:613
+msgid "Show egos with DIDs"
+msgstr ""
+
+#: src/reclaim/gnunet-did.c:619
 msgid "The Decentralized Identity (DID)"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:869
+#: src/reclaim/gnunet-did.c:625
 msgid "The DID Document to store in GNUNET"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:874
+#: src/reclaim/gnunet-did.c:630
 msgid "The name of the EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:880
+#: src/reclaim/gnunet-did.c:636
 msgid "The time until the DID Document is going to expire (e.g. 5d)"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:889
-msgid "Manage Decentralized Identities (DIDs)"
-msgstr ""
-
 #: src/reclaim/gnunet-reclaim.c:802
 #, fuzzy, c-format
 msgid "Ego is required\n"
@@ -5921,56 +5916,56 @@ msgstr "„%s“ услузи недостају поставке подешав
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr "Демон за најаву регуларних израза за парњака који користи меш."
 
-#: src/regex/gnunet-regex-profiler.c:1388
+#: src/regex/gnunet-regex-profiler.c:1366
 msgid "No configuration file given. Exiting\n"
 msgstr "Није дата датотека подешавања. Излазим\n"
 
-#: src/regex/gnunet-regex-profiler.c:1430
+#: src/regex/gnunet-regex-profiler.c:1408
 #: src/regex/gnunet-regex-simulation-profiler.c:631
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr "На линији наредби није наведен директоријум политике. Излазим.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1436
+#: src/regex/gnunet-regex-profiler.c:1414
 #: src/regex/gnunet-regex-simulation-profiler.c:639
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr "Наведени директоријум политике не постоји. Излазим.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1444
+#: src/regex/gnunet-regex-profiler.c:1422
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr "Нисам нашао датотеке у „%s“\n"
 
-#: src/regex/gnunet-regex-profiler.c:1453
+#: src/regex/gnunet-regex-profiler.c:1431
 msgid "No search strings file given. Exiting.\n"
 msgstr "Није дата датотека ниски претраге. Излазим.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1473
+#: src/regex/gnunet-regex-profiler.c:1451
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Грешка учитавања ниски претраге. Излазим.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1562
+#: src/regex/gnunet-regex-profiler.c:1540
 msgid "name of the file for writing statistics"
 msgstr "назив датотеке за записивање статистике"
 
-#: src/regex/gnunet-regex-profiler.c:1569
+#: src/regex/gnunet-regex-profiler.c:1547
 msgid "wait TIMEOUT before ending the experiment"
 msgstr "чека ВРЕМЕ_ИСТЕКА пре завршавања експеримента"
 
-#: src/regex/gnunet-regex-profiler.c:1575
+#: src/regex/gnunet-regex-profiler.c:1553
 msgid "directory with policy files"
 msgstr "директоријум са датотекама политике"
 
-#: src/regex/gnunet-regex-profiler.c:1582
+#: src/regex/gnunet-regex-profiler.c:1560
 msgid "name of file with input strings"
 msgstr "назив датотеке са улазним нискама"
 
-#: src/regex/gnunet-regex-profiler.c:1589
+#: src/regex/gnunet-regex-profiler.c:1567
 msgid "name of file with hosts' names"
 msgstr "назив датотеке са називима домаћина"
 
-#: src/regex/gnunet-regex-profiler.c:1604
+#: src/regex/gnunet-regex-profiler.c:1582
 msgid "Profiler for regex"
 msgstr "Профилатор за регуларни израз"
 
@@ -6964,7 +6959,7 @@ msgstr ""
 #: src/transport/gnunet-communicator-tcp.c:3342
 #: src/transport/gnunet-communicator-udp.c:3867
 #: src/transport/gnunet-service-tng.c:11039
-#: src/transport/gnunet-service-transport.c:2627
+#: src/transport/gnunet-service-transport.c:2622
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "Услузи преноса недостају поставке подешавања кључа. Излазим.\n"
 
@@ -7018,21 +7013,21 @@ msgid "# bytes payload received"
 msgstr "# бајтови утовара су примљени"
 
 #: src/transport/gnunet-service-transport.c:2019
-#: src/transport/gnunet-service-transport.c:2453
+#: src/transport/gnunet-service-transport.c:2448
 msgid "# disconnects due to blacklist"
 msgstr "# прекиди везе због списка забрана"
 
-#: src/transport/gnunet-service-transport.c:2457
+#: src/transport/gnunet-service-transport.c:2452
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "Недостаје функција „%s“ у прикључку преноса за „%s“\n"
 
-#: src/transport/gnunet-service-transport.c:2552
+#: src/transport/gnunet-service-transport.c:2547
 #, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "Додајем унос списка забрана за парњака „%s“\n"
 
-#: src/transport/gnunet-service-transport.c:2561
+#: src/transport/gnunet-service-transport.c:2556
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr "Додајем унос списка забрана за парњака „%s“:„%s“\n"
@@ -7572,26 +7567,26 @@ msgstr "шаље податке за оцењивање другим парња
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2140
+#: src/transport/plugin_transport_http_client.c:2134
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 "Не могу да покренем мулти ручку „curl“-а, нисам успео да покренем „%s“ "
 "прикључак!\n"
 
-#: src/transport/plugin_transport_http_client.c:2189
+#: src/transport/plugin_transport_http_client.c:2183
 #: src/transport/plugin_transport_http_server.c:3276
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Гасим прикључак „%s“\n"
 
-#: src/transport/plugin_transport_http_client.c:2206
+#: src/transport/plugin_transport_http_client.c:2200
 #: src/transport/plugin_transport_http_server.c:3346
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "Гашење за прикључак „%s“ је завршено\n"
 
-#: src/transport/plugin_transport_http_client.c:2240
+#: src/transport/plugin_transport_http_client.c:2234
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "Највећи број веза је %u\n"
@@ -8113,81 +8108,81 @@ msgstr "Не могу да приступим датотеци подешава
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:227 src/util/bio.c:235
+#: src/util/bio.c:228 src/util/bio.c:236
 #, fuzzy, c-format
 msgid "Error reading `%s' from file: %s"
 msgstr "Грешка при читању „%s“: %s"
 
-#: src/util/bio.c:237
+#: src/util/bio.c:238
 msgid "End of file"
 msgstr "Крај датотеке"
 
-#: src/util/bio.c:266
+#: src/util/bio.c:267
 #, fuzzy, c-format
 msgid "Error while reading `%s' from buffer: %s"
 msgstr "Грешка при читању „%s“: %s"
 
-#: src/util/bio.c:268
+#: src/util/bio.c:269
 msgid "Not enough data left"
 msgstr ""
 
-#: src/util/bio.c:308
+#: src/util/bio.c:309
 #, fuzzy, c-format
 msgid "Invalid handle type while reading `%s'"
 msgstr "Неисправан аргумент линије наредби „%s“\n"
 
-#: src/util/bio.c:335 src/util/bio.c:839
+#: src/util/bio.c:336 src/util/bio.c:840
 msgid "string length"
 msgstr ""
 
-#: src/util/bio.c:341
+#: src/util/bio.c:342
 #, c-format
 msgid "%s (while reading `%s')"
 msgstr ""
 
-#: src/util/bio.c:346
+#: src/util/bio.c:347
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr "Грешка читања дужине ниске „%s“"
 
-#: src/util/bio.c:359
+#: src/util/bio.c:360
 #, fuzzy, c-format
 msgid "String `%s' longer than allowed (%u > %lu)"
 msgstr "Ниска „%s“ је дужа од дозвољеног (%u > %u)"
 
-#: src/util/bio.c:398 src/util/bio.c:864 src/util/bio.c:881
+#: src/util/bio.c:399 src/util/bio.c:865 src/util/bio.c:882
 msgid "metadata length"
 msgstr ""
 
-#: src/util/bio.c:410
+#: src/util/bio.c:411
 #, fuzzy, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
 msgstr "Серијализовани метаподаци „%s“ су већи од дозвољеног (%u>%u)"
 
-#: src/util/bio.c:426
+#: src/util/bio.c:427
 #, fuzzy, c-format
 msgid "Failed to deserialize metadata `%s'"
 msgstr "Нисам успео да серијализујем НС запис са вредношћу „%s“\n"
 
-#: src/util/bio.c:668
+#: src/util/bio.c:669
 msgid "Unable to flush buffer to file"
 msgstr ""
 
-#: src/util/bio.c:730 src/util/bio.c:751
+#: src/util/bio.c:731 src/util/bio.c:752
 #, fuzzy, c-format
 msgid "Error while writing `%s' to file: %s"
 msgstr "Грешка писања „HELLO“-а у датотеку „%s“: %s\n"
 
-#: src/util/bio.c:732
+#: src/util/bio.c:733
 msgid "No associated file"
 msgstr ""
 
-#: src/util/bio.c:816
+#: src/util/bio.c:817
 #, fuzzy, c-format
 msgid "Invalid handle type while writing `%s'"
 msgstr "Неисправан формат времена „%s“\n"
 
-#: src/util/bio.c:876
+#: src/util/bio.c:877
 #, fuzzy, c-format
 msgid "Failed to serialize metadata `%s'"
 msgstr "Нисам успео да серијализујем НС запис са вредношћу „%s“\n"
@@ -8196,7 +8191,7 @@ msgstr "Нисам успео да серијализујем НС запис с
 msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:1106
+#: src/util/client.c:1095
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr "Потребан је не-празан назив домаћина за услугу „%s“.\n"
@@ -8206,53 +8201,53 @@ msgstr "Потребан је не-празан назив домаћина за
 msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:926
+#: src/util/common_logging.c:911
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "Порука „%.*s“ је поновљена %u пута у прошлости %s\n"
 
-#: src/util/common_logging.c:1131
+#: src/util/common_logging.c:1104
 msgid "ERROR"
 msgstr "ГРЕШКА"
 
-#: src/util/common_logging.c:1133
+#: src/util/common_logging.c:1106
 msgid "WARNING"
 msgstr "УПОЗОРЕЊЕ"
 
-#: src/util/common_logging.c:1135
+#: src/util/common_logging.c:1108
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:1137
+#: src/util/common_logging.c:1110
 msgid "INFO"
 msgstr "ПОДАЦИ"
 
-#: src/util/common_logging.c:1139
+#: src/util/common_logging.c:1112
 msgid "DEBUG"
 msgstr "ПРОЧИШЋАВАЊЕ"
 
-#: src/util/common_logging.c:1141
+#: src/util/common_logging.c:1114
 msgid "NONE"
 msgstr "НИШТА"
 
-#: src/util/common_logging.c:1142
+#: src/util/common_logging.c:1115
 msgid "INVALID"
 msgstr "НЕИСПРАВНО"
 
-#: src/util/common_logging.c:1423
+#: src/util/common_logging.c:1396
 msgid "unknown address"
 msgstr "непозната адреса"
 
-#: src/util/common_logging.c:1468
+#: src/util/common_logging.c:1441
 msgid "invalid address"
 msgstr "неисправна адреса"
 
-#: src/util/common_logging.c:1487
+#: src/util/common_logging.c:1453
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "Подешавање није успело да наведе опцију „%s“ у одељку „%s“!\n"
 
-#: src/util/common_logging.c:1510
+#: src/util/common_logging.c:1468
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8351,7 +8346,7 @@ msgstr "аргумент „--option“ је потребан за постав
 msgid "failed to load configuration defaults"
 msgstr "Нисам успео да учитам подешавање за „%s“\n"
 
-#: src/util/container_bloomfilter.c:542
+#: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -8365,16 +8360,16 @@ msgstr ""
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "„ECC“ потписивање није успело на %s:%d: %s\n"
 
-#: src/util/crypto_ecc.c:669
+#: src/util/crypto_ecc.c:689
 #, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "Провера „ECDSA“ потписа није успела на %s:%d: %s\n"
 
-#: src/util/crypto_ecc_setup.c:280
+#: src/util/crypto_ecc_setup.c:272
 msgid "Could not load peer's private key\n"
 msgstr "Не могу да учитам лични кључ парњака\n"
 
-#: src/util/crypto_random.c:385
+#: src/util/crypto_random.c:372
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "„libgcrypt“ није очекиваног издања (издање %s је потребно).\n"
@@ -8903,17 +8898,17 @@ msgstr ""
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Покретање механизма прикључка није успело: %s!\n"
 
-#: src/util/plugin.c:156
+#: src/util/plugin.c:157
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr "„%s“ није успело да реши метод '%s' са грешком: %s\n"
 
-#: src/util/plugin.c:234
+#: src/util/plugin.c:214
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "„%s“ није успело за библиотеку '%s' са грешком: %s\n"
 
-#: src/util/plugin.c:414
+#: src/util/plugin.c:370
 msgid "Could not determine plugin installation path.\n"
 msgstr "Не могу да одредим путању инсталирања прикључка.\n"
 
@@ -9258,6 +9253,10 @@ msgstr "Поставља тунеле путем ВПН-а."
 msgid "Failed to connect to the namestore!\n"
 msgstr "Нисам успео да се повежем са смештајем назива!\n"
 
+#, fuzzy, c-format
+#~ msgid "Invalid DID `%s'\n"
+#~ msgstr "Неисправан УРИ „%s“\n"
+
 #, c-format
 #~ msgid "Block not of type %u\n"
 #~ msgstr "Блок није врсте %u\n"
diff --git a/po/sv.po b/po/sv.po
index 4e5b9c56c..b03d19411 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-08-05 13:57+0200\n"
+"POT-Creation-Date: 2022-09-04 11:01+0200\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -670,25 +670,25 @@ msgstr ""
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:326
+#: src/ats/gnunet-service-ats_plugins.c:321
 #, c-format
 msgid ""
 "Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:336
+#: src/ats/gnunet-service-ats_plugins.c:331
 #, c-format
 msgid "%s quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:382
+#: src/ats/gnunet-service-ats_plugins.c:377
 #, c-format
 msgid ""
 "No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:474
+#: src/ats/gnunet-service-ats_plugins.c:462
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "Kunde inte initiera SQLite.\n"
@@ -1496,46 +1496,46 @@ msgstr "# byte mottogs via TCP"
 msgid "# rekey operations confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1513
+#: src/core/gnunet-service-core_kx.c:1506
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1524
+#: src/core/gnunet-service-core_kx.c:1517
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1528
+#: src/core/gnunet-service-core_kx.c:1521
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1606
-#: src/core/gnunet-service-core_kx.c:1633
+#: src/core/gnunet-service-core_kx.c:1599
+#: src/core/gnunet-service-core_kx.c:1626
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1619
+#: src/core/gnunet-service-core_kx.c:1612
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1664
+#: src/core/gnunet-service-core_kx.c:1657
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1673
+#: src/core/gnunet-service-core_kx.c:1666
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
 #: src/core/gnunet-service-core_sessions.c:252
 #: src/core/gnunet-service-core_sessions.c:337
-#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1519
+#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1496
 #: src/topology/gnunet-daemon-topology.c:579
 #: src/topology/gnunet-daemon-topology.c:671
 #: src/transport/gnunet-service-transport_neighbours.c:723
@@ -1631,31 +1631,31 @@ msgstr "# byte mottogs via TCP"
 msgid "# datastore connections (re)created"
 msgstr "Nätverksanslutning"
 
-#: src/datastore/datastore_api.c:1032
+#: src/datastore/datastore_api.c:1007
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1093
+#: src/datastore/datastore_api.c:1068
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1158
+#: src/datastore/datastore_api.c:1113
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1236
+#: src/datastore/datastore_api.c:1171
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1295
+#: src/datastore/datastore_api.c:1230
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1357
+#: src/datastore/datastore_api.c:1276
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1438
+#: src/datastore/datastore_api.c:1357
 msgid "# GET requests executed"
 msgstr ""
 
@@ -1993,46 +1993,46 @@ msgstr ""
 msgid "Result %d, type %d:\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:221
+#: src/dht/gnunet-dht-get.c:238
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:229 src/dht/gnunet-dht-hello.c:119
+#: src/dht/gnunet-dht-get.c:246 src/dht/gnunet-dht-hello.c:119
 #: src/dht/gnunet-dht-monitor.c:255
 #, fuzzy, c-format
 msgid "Failed to connect to DHT service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-dht-get.c:239
+#: src/dht/gnunet-dht-get.c:256
 msgid "Issuing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:275 src/dht/gnunet-dht-monitor.c:302
+#: src/dht/gnunet-dht-get.c:292 src/dht/gnunet-dht-monitor.c:302
 #: src/dht/gnunet-dht-put.c:200
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:281
+#: src/dht/gnunet-dht-get.c:298
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:286 src/dht/gnunet-dht-put.c:217
+#: src/dht/gnunet-dht-get.c:303 src/dht/gnunet-dht-put.c:217
 msgid "use DHT's record route option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:292 src/dht/gnunet-dht-monitor.c:308
+#: src/dht/gnunet-dht-get.c:309 src/dht/gnunet-dht-monitor.c:308
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:298
+#: src/dht/gnunet-dht-get.c:315
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:304 src/dht/gnunet-dht-put.c:206
+#: src/dht/gnunet-dht-get.c:321 src/dht/gnunet-dht-put.c:206
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:321
+#: src/dht/gnunet-dht-get.c:338
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -2473,71 +2473,71 @@ msgstr ""
 msgid "# fragmentation transmissions completed"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/fs_api.c:491
+#: src/fs/fs_api.c:480
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_api.c:502
+#: src/fs/fs_api.c:491
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_api.c:510
+#: src/fs/fs_api.c:499
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1173
+#: src/fs/fs_api.c:1156
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:1724
+#: src/fs/fs_api.c:1707
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1739
+#: src/fs/fs_api.c:1722
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2468
+#: src/fs/fs_api.c:2451
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2479
+#: src/fs/fs_api.c:2462
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2627 src/fs/fs_api.c:2873
+#: src/fs/fs_api.c:2610 src/fs/fs_api.c:2856
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2645
+#: src/fs/fs_api.c:2628
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2661 src/fs/fs_api.c:2681 src/fs/fs_api.c:3180
+#: src/fs/fs_api.c:2644 src/fs/fs_api.c:2664 src/fs/fs_api.c:3163
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2863
+#: src/fs/fs_api.c:2846
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3124
+#: src/fs/fs_api.c:3107
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3219
+#: src/fs/fs_api.c:3202
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2573,38 +2573,38 @@ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_download.c:1053
+#: src/fs/fs_download.c:1044
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %lu bytes at depth %u and "
 "offset %llu/%llu, got %lu bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1075
+#: src/fs/fs_download.c:1066
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1098
+#: src/fs/fs_download.c:1089
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_download.c:1109
+#: src/fs/fs_download.c:1100
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:1119
+#: src/fs/fs_download.c:1110
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:1227
+#: src/fs/fs_download.c:1218
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/fs_download.c:1899
+#: src/fs/fs_download.c:1890
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ogiltiga argument: "
@@ -2722,12 +2722,12 @@ msgstr " Anslutning misslyckades (fel?)\n"
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:218
+#: src/fs/fs_publish_ksk.c:212
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish_ublock.c:240
+#: src/fs/fs_publish_ublock.c:215
 #, fuzzy
 msgid "Internal error."
 msgstr "Okänt fel.\n"
@@ -3477,63 +3477,63 @@ msgstr "Nätverksanslutning"
 msgid "# cadet connections active"
 msgstr "Nätverksanslutning"
 
-#: src/fs/gnunet-service-fs_cp.c:680
+#: src/fs/gnunet-service-fs_cp.c:665
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:684
+#: src/fs/gnunet-service-fs_cp.c:669
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:717 src/fs/gnunet-service-fs_cp.c:1342
+#: src/fs/gnunet-service-fs_cp.c:702 src/fs/gnunet-service-fs_cp.c:1327
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:812
+#: src/fs/gnunet-service-fs_cp.c:797
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1009
+#: src/fs/gnunet-service-fs_cp.c:994
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1034
+#: src/fs/gnunet-service-fs_cp.c:1019
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1044
+#: src/fs/gnunet-service-fs_cp.c:1029
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1141
+#: src/fs/gnunet-service-fs_cp.c:1126
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1199
+#: src/fs/gnunet-service-fs_cp.c:1184
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1223
+#: src/fs/gnunet-service-fs_cp.c:1208
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1237
+#: src/fs/gnunet-service-fs_cp.c:1222
 #, fuzzy
 msgid "# requests dropped due to full reply queue"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/fs/gnunet-service-fs_cp.c:1294
+#: src/fs/gnunet-service-fs_cp.c:1279
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1338
+#: src/fs/gnunet-service-fs_cp.c:1323
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:1708
+#: src/fs/gnunet-service-fs_cp.c:1679
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -3554,26 +3554,26 @@ msgstr "Fel vid skapandet av användare"
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:317
+#: src/fs/gnunet-service-fs_indexing.c:297
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:331
+#: src/fs/gnunet-service-fs_indexing.c:311
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:335
+#: src/fs/gnunet-service-fs_indexing.c:315
 #, fuzzy
 msgid "not indexed"
 msgstr "Avindexering misslyckades."
 
-#: src/fs/gnunet-service-fs_indexing.c:349
+#: src/fs/gnunet-service-fs_indexing.c:329
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indexering av data misslyckades vid position %i.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:455
+#: src/fs/gnunet-service-fs_indexing.c:435
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3612,103 +3612,103 @@ msgstr "# byte mottogs via TCP"
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:325
+#: src/fs/gnunet-service-fs_pr.c:305
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:416 src/fs/gnunet-service-fs_pr.c:654
+#: src/fs/gnunet-service-fs_pr.c:396 src/fs/gnunet-service-fs_pr.c:626
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:829
+#: src/fs/gnunet-service-fs_pr.c:795
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_pr.c:903
+#: src/fs/gnunet-service-fs_pr.c:869
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1037
+#: src/fs/gnunet-service-fs_pr.c:1003
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1066
+#: src/fs/gnunet-service-fs_pr.c:1032
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1107
+#: src/fs/gnunet-service-fs_pr.c:1073
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1262
+#: src/fs/gnunet-service-fs_pr.c:1228
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1317
+#: src/fs/gnunet-service-fs_pr.c:1283
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1338
+#: src/fs/gnunet-service-fs_pr.c:1304
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1405
+#: src/fs/gnunet-service-fs_pr.c:1371
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1467
+#: src/fs/gnunet-service-fs_pr.c:1433
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1522
+#: src/fs/gnunet-service-fs_pr.c:1488
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1537
+#: src/fs/gnunet-service-fs_pr.c:1503
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1560
+#: src/fs/gnunet-service-fs_pr.c:1526
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1577
+#: src/fs/gnunet-service-fs_pr.c:1543
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1598
+#: src/fs/gnunet-service-fs_pr.c:1564
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1604
+#: src/fs/gnunet-service-fs_pr.c:1570
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1650
+#: src/fs/gnunet-service-fs_pr.c:1616
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1663
+#: src/fs/gnunet-service-fs_pr.c:1629
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1714
+#: src/fs/gnunet-service-fs_pr.c:1680
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1778
+#: src/fs/gnunet-service-fs_pr.c:1744
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_push.c:648
+#: src/fs/gnunet-service-fs_push.c:643
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -3837,11 +3837,11 @@ msgstr ""
 #: src/hostlist/gnunet-daemon-hostlist_client.c:544
 #: src/hostlist/gnunet-daemon-hostlist_client.c:772
 #: src/hostlist/gnunet-daemon-hostlist_client.c:781
-#: src/hostlist/gnunet-daemon-hostlist_client.c:836
-#: src/hostlist/gnunet-daemon-hostlist_client.c:848
-#: src/hostlist/gnunet-daemon-hostlist_client.c:964
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1066
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1074
+#: src/hostlist/gnunet-daemon-hostlist_client.c:835
+#: src/hostlist/gnunet-daemon-hostlist_client.c:847
+#: src/hostlist/gnunet-daemon-hostlist_client.c:957
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1059
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1067
 #: src/transport/plugin_transport_http_client.c:600
 #: src/transport/plugin_transport_http_client.c:618
 #, fuzzy, c-format
@@ -3893,59 +3893,59 @@ msgstr ""
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2658
+#: src/gns/gnunet-gns-proxy.c:2653
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/gns/gnunet-gns-proxy.c:2690
+#: src/gns/gnunet-gns-proxy.c:2685
 #, fuzzy, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/gns/gnunet-gns-proxy.c:2899
+#: src/gns/gnunet-gns-proxy.c:2894
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2923 src/rest/gnunet-rest-server.c:917
+#: src/gns/gnunet-gns-proxy.c:2918 src/rest/gnunet-rest-server.c:917
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3272
+#: src/gns/gnunet-gns-proxy.c:3267
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3304
+#: src/gns/gnunet-gns-proxy.c:3299
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3390
+#: src/gns/gnunet-gns-proxy.c:3385
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3731
+#: src/gns/gnunet-gns-proxy.c:3726
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/gnunet-gns-proxy.c:3865
+#: src/gns/gnunet-gns-proxy.c:3860
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3870
+#: src/gns/gnunet-gns-proxy.c:3865
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3874
+#: src/gns/gnunet-gns-proxy.c:3869
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3900
+#: src/gns/gnunet-gns-proxy.c:3895
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -4016,7 +4016,7 @@ msgstr "Kunde inte ansluta till gnunetd.\n"
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:386
+#: src/gns/gnunet-service-gns_interceptor.c:380
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -4036,50 +4036,50 @@ msgstr ""
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:904
+#: src/gns/gnunet-service-gns_resolver.c:903
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1095
+#: src/gns/gnunet-service-gns_resolver.c:1094
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1871
+#: src/gns/gnunet-service-gns_resolver.c:1870
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1886
+#: src/gns/gnunet-service-gns_resolver.c:1885
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1926
+#: src/gns/gnunet-service-gns_resolver.c:1918
 #, fuzzy, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2328
+#: src/gns/gnunet-service-gns_resolver.c:2320
 msgid "Unable to process critical delegation record\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2333
+#: src/gns/gnunet-service-gns_resolver.c:2325
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2356
+#: src/gns/gnunet-service-gns_resolver.c:2348
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2523
+#: src/gns/gnunet-service-gns_resolver.c:2515
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2671
+#: src/gns/gnunet-service-gns_resolver.c:2663
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
@@ -4351,7 +4351,7 @@ msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:677
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1460
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4367,117 +4367,117 @@ msgid ""
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:893
+#: src/hostlist/gnunet-daemon-hostlist_client.c:886
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:908
+#: src/hostlist/gnunet-daemon-hostlist_client.c:901
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:928
+#: src/hostlist/gnunet-daemon-hostlist_client.c:921
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:934
+#: src/hostlist/gnunet-daemon-hostlist_client.c:927
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:942
+#: src/hostlist/gnunet-daemon-hostlist_client.c:935
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:998
+#: src/hostlist/gnunet-daemon-hostlist_client.c:991
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1007
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1000
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1144
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1732
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1137
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1725
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1154
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1147
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1212
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1233
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1205
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1226
 #, fuzzy
 msgid "# active connections"
 msgstr "Nätverksanslutning"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1396
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1389
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1394
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1412
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1405
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1446
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1456
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1449
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1500
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1514
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1547
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1566
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1540
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1559
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1560
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1553
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1661
-#: src/transport/plugin_transport_http_client.c:2300
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1654
+#: src/transport/plugin_transport_http_client.c:2294
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1690
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1683
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1703
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1696
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1717
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1710
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4548,7 +4548,7 @@ msgid "# hostlist advertisements send"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:674
-#: src/transport/gnunet-service-transport.c:2662
+#: src/transport/gnunet-service-transport.c:2657
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
@@ -4715,7 +4715,7 @@ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/identity/plugin_rest_identity.c:1401
+#: src/identity/plugin_rest_identity.c:1529
 #, fuzzy
 msgid "Identity REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
@@ -5483,7 +5483,7 @@ msgstr "Misslyckades att starta samling.\n"
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_mini.c:607
+#: src/nat/gnunet-service-nat_mini.c:602
 msgid "`upnpc' command not found\n"
 msgstr ""
 
@@ -5780,51 +5780,46 @@ msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:209
-#, fuzzy, c-format
-msgid "Invalid DID `%s'\n"
-msgstr "Ogiltiga argument: "
-
-#: src/reclaim/gnunet-did.c:835
+#: src/reclaim/gnunet-did.c:591
 msgid "Create a DID Document and display its DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:840
+#: src/reclaim/gnunet-did.c:596
 msgid "Get the DID Document associated with the given DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:844
-msgid "Show the DID for a given ego"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:849
+#: src/reclaim/gnunet-did.c:601
 msgid "Remove the DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:853 src/reclaim/gnunet-did.c:857
+#: src/reclaim/gnunet-did.c:605
 msgid "Replace the DID Document."
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:863
+#: src/reclaim/gnunet-did.c:609
+msgid "Show the DID for a given ego"
+msgstr ""
+
+#: src/reclaim/gnunet-did.c:613
+msgid "Show egos with DIDs"
+msgstr ""
+
+#: src/reclaim/gnunet-did.c:619
 msgid "The Decentralized Identity (DID)"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:869
+#: src/reclaim/gnunet-did.c:625
 msgid "The DID Document to store in GNUNET"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:874
+#: src/reclaim/gnunet-did.c:630
 msgid "The name of the EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:880
+#: src/reclaim/gnunet-did.c:636
 msgid "The time until the DID Document is going to expire (e.g. 5d)"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:889
-msgid "Manage Decentralized Identities (DIDs)"
-msgstr ""
-
 #: src/reclaim/gnunet-reclaim.c:802
 #, fuzzy, c-format
 msgid "Ego is required\n"
@@ -5933,61 +5928,61 @@ msgstr "GNUnet-konfiguration"
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1388
+#: src/regex/gnunet-regex-profiler.c:1366
 #, fuzzy
 msgid "No configuration file given. Exiting\n"
 msgstr "använd konfigurationsfil FILNAMN"
 
-#: src/regex/gnunet-regex-profiler.c:1430
+#: src/regex/gnunet-regex-profiler.c:1408
 #: src/regex/gnunet-regex-simulation-profiler.c:631
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1436
+#: src/regex/gnunet-regex-profiler.c:1414
 #: src/regex/gnunet-regex-simulation-profiler.c:639
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1444
+#: src/regex/gnunet-regex-profiler.c:1422
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1453
+#: src/regex/gnunet-regex-profiler.c:1431
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1473
+#: src/regex/gnunet-regex-profiler.c:1451
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Fel vid lämning av DHT.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1562
+#: src/regex/gnunet-regex-profiler.c:1540
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1569
+#: src/regex/gnunet-regex-profiler.c:1547
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1575
+#: src/regex/gnunet-regex-profiler.c:1553
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1582
+#: src/regex/gnunet-regex-profiler.c:1560
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1589
+#: src/regex/gnunet-regex-profiler.c:1567
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1604
+#: src/regex/gnunet-regex-profiler.c:1582
 msgid "Profiler for regex"
 msgstr ""
 
@@ -6940,7 +6935,7 @@ msgstr ""
 #: src/transport/gnunet-communicator-tcp.c:3342
 #: src/transport/gnunet-communicator-udp.c:3867
 #: src/transport/gnunet-service-tng.c:11039
-#: src/transport/gnunet-service-transport.c:2627
+#: src/transport/gnunet-service-transport.c:2622
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet-konfiguration"
@@ -6998,21 +6993,21 @@ msgid "# bytes payload received"
 msgstr "# byte dekrypterade"
 
 #: src/transport/gnunet-service-transport.c:2019
-#: src/transport/gnunet-service-transport.c:2453
+#: src/transport/gnunet-service-transport.c:2448
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2457
+#: src/transport/gnunet-service-transport.c:2452
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport.c:2552
+#: src/transport/gnunet-service-transport.c:2547
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/transport/gnunet-service-transport.c:2561
+#: src/transport/gnunet-service-transport.c:2556
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
@@ -7552,25 +7547,25 @@ msgstr ""
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2140
+#: src/transport/plugin_transport_http_client.c:2134
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2189
+#: src/transport/plugin_transport_http_client.c:2183
 #: src/transport/plugin_transport_http_server.c:3276
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:2206
+#: src/transport/plugin_transport_http_client.c:2200
 #: src/transport/plugin_transport_http_server.c:3346
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/transport/plugin_transport_http_client.c:2240
+#: src/transport/plugin_transport_http_client.c:2234
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
@@ -8097,82 +8092,82 @@ msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:227 src/util/bio.c:235
+#: src/util/bio.c:228 src/util/bio.c:236
 #, fuzzy, c-format
 msgid "Error reading `%s' from file: %s"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/bio.c:237
+#: src/util/bio.c:238
 #, fuzzy
 msgid "End of file"
 msgstr "Läs in en konfigurationsfil"
 
-#: src/util/bio.c:266
+#: src/util/bio.c:267
 #, fuzzy, c-format
 msgid "Error while reading `%s' from buffer: %s"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/util/bio.c:268
+#: src/util/bio.c:269
 msgid "Not enough data left"
 msgstr ""
 
-#: src/util/bio.c:308
+#: src/util/bio.c:309
 #, fuzzy, c-format
 msgid "Invalid handle type while reading `%s'"
 msgstr "Ogiltiga kommandoradsargument:\n"
 
-#: src/util/bio.c:335 src/util/bio.c:839
+#: src/util/bio.c:336 src/util/bio.c:840
 msgid "string length"
 msgstr ""
 
-#: src/util/bio.c:341
+#: src/util/bio.c:342
 #, fuzzy, c-format
 msgid "%s (while reading `%s')"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/util/bio.c:346
+#: src/util/bio.c:347
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:359
+#: src/util/bio.c:360
 #, c-format
 msgid "String `%s' longer than allowed (%u > %lu)"
 msgstr ""
 
-#: src/util/bio.c:398 src/util/bio.c:864 src/util/bio.c:881
+#: src/util/bio.c:399 src/util/bio.c:865 src/util/bio.c:882
 msgid "metadata length"
 msgstr ""
 
-#: src/util/bio.c:410
+#: src/util/bio.c:411
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:426
+#: src/util/bio.c:427
 #, fuzzy, c-format
 msgid "Failed to deserialize metadata `%s'"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/util/bio.c:668
+#: src/util/bio.c:669
 msgid "Unable to flush buffer to file"
 msgstr ""
 
-#: src/util/bio.c:730 src/util/bio.c:751
+#: src/util/bio.c:731 src/util/bio.c:752
 #, fuzzy, c-format
 msgid "Error while writing `%s' to file: %s"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/util/bio.c:732
+#: src/util/bio.c:733
 msgid "No associated file"
 msgstr ""
 
-#: src/util/bio.c:816
+#: src/util/bio.c:817
 #, fuzzy, c-format
 msgid "Invalid handle type while writing `%s'"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/bio.c:876
+#: src/util/bio.c:877
 #, fuzzy, c-format
 msgid "Failed to serialize metadata `%s'"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -8181,7 +8176,7 @@ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:1106
+#: src/util/client.c:1095
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -8191,53 +8186,53 @@ msgstr ""
 msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:926
+#: src/util/common_logging.c:911
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1131
+#: src/util/common_logging.c:1104
 msgid "ERROR"
 msgstr "FEL"
 
-#: src/util/common_logging.c:1133
+#: src/util/common_logging.c:1106
 msgid "WARNING"
 msgstr "VARNING"
 
-#: src/util/common_logging.c:1135
+#: src/util/common_logging.c:1108
 msgid "MESSAGE"
 msgstr "MEDDELANDE"
 
-#: src/util/common_logging.c:1137
+#: src/util/common_logging.c:1110
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:1139
+#: src/util/common_logging.c:1112
 msgid "DEBUG"
 msgstr "FELSÖKNING"
 
-#: src/util/common_logging.c:1141
+#: src/util/common_logging.c:1114
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:1142
+#: src/util/common_logging.c:1115
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1423
+#: src/util/common_logging.c:1396
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1468
+#: src/util/common_logging.c:1441
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1487
+#: src/util/common_logging.c:1453
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/common_logging.c:1510
+#: src/util/common_logging.c:1468
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8332,7 +8327,7 @@ msgstr ""
 msgid "failed to load configuration defaults"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/util/container_bloomfilter.c:542
+#: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -8344,17 +8339,17 @@ msgstr ""
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_ecc.c:669
+#: src/util/crypto_ecc.c:689
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_ecc_setup.c:280
+#: src/util/crypto_ecc_setup.c:272
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/util/crypto_random.c:385
+#: src/util/crypto_random.c:372
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
@@ -8873,17 +8868,17 @@ msgstr ""
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
 
-#: src/util/plugin.c:156
+#: src/util/plugin.c:157
 #, fuzzy, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
-#: src/util/plugin.c:234
+#: src/util/plugin.c:214
 #, fuzzy, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/util/plugin.c:414
+#: src/util/plugin.c:370
 #, fuzzy
 msgid "Could not determine plugin installation path.\n"
 msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
@@ -9235,6 +9230,10 @@ msgstr ""
 msgid "Failed to connect to the namestore!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
+#, fuzzy, c-format
+#~ msgid "Invalid DID `%s'\n"
+#~ msgstr "Ogiltiga argument: "
+
 #, fuzzy, c-format
 #~ msgid "Block not of type %u\n"
 #~ msgstr "Ingen transport av typ %d är känd.\n"
diff --git a/po/vi.po b/po/vi.po
index 9daac4094..3ee472184 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-08-05 13:57+0200\n"
+"POT-Creation-Date: 2022-09-04 11:01+0200\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -678,25 +678,25 @@ msgstr ""
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:326
+#: src/ats/gnunet-service-ats_plugins.c:321
 #, c-format
 msgid ""
 "Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:336
+#: src/ats/gnunet-service-ats_plugins.c:331
 #, c-format
 msgid "%s quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:382
+#: src/ats/gnunet-service-ats_plugins.c:377
 #, c-format
 msgid ""
 "No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:474
+#: src/ats/gnunet-service-ats_plugins.c:462
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
@@ -1503,46 +1503,46 @@ msgstr "# các byte đã nhận qua TCP"
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG"
 
-#: src/core/gnunet-service-core_kx.c:1513
+#: src/core/gnunet-service-core_kx.c:1506
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1524
+#: src/core/gnunet-service-core_kx.c:1517
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1528
+#: src/core/gnunet-service-core_kx.c:1521
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1606
-#: src/core/gnunet-service-core_kx.c:1633
+#: src/core/gnunet-service-core_kx.c:1599
+#: src/core/gnunet-service-core_kx.c:1626
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1619
+#: src/core/gnunet-service-core_kx.c:1612
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1664
+#: src/core/gnunet-service-core_kx.c:1657
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1673
+#: src/core/gnunet-service-core_kx.c:1666
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
 
 #: src/core/gnunet-service-core_sessions.c:252
 #: src/core/gnunet-service-core_sessions.c:337
-#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1519
+#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1496
 #: src/topology/gnunet-daemon-topology.c:579
 #: src/topology/gnunet-daemon-topology.c:671
 #: src/transport/gnunet-service-transport_neighbours.c:723
@@ -1640,34 +1640,34 @@ msgstr "# các kết quả dht được nhận"
 msgid "# datastore connections (re)created"
 msgstr "# các kết nối dht"
 
-#: src/datastore/datastore_api.c:1032
+#: src/datastore/datastore_api.c:1007
 #, fuzzy
 msgid "# PUT requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1093
+#: src/datastore/datastore_api.c:1068
 #, fuzzy
 msgid "# RESERVE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1158
+#: src/datastore/datastore_api.c:1113
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1236
+#: src/datastore/datastore_api.c:1171
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1295
+#: src/datastore/datastore_api.c:1230
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1357
+#: src/datastore/datastore_api.c:1276
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1438
+#: src/datastore/datastore_api.c:1357
 #, fuzzy
 msgid "# GET requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
@@ -2014,46 +2014,46 @@ msgstr ""
 msgid "Result %d, type %d:\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:221
+#: src/dht/gnunet-dht-get.c:238
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:229 src/dht/gnunet-dht-hello.c:119
+#: src/dht/gnunet-dht-get.c:246 src/dht/gnunet-dht-hello.c:119
 #: src/dht/gnunet-dht-monitor.c:255
 #, fuzzy, c-format
 msgid "Failed to connect to DHT service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/dht/gnunet-dht-get.c:239
+#: src/dht/gnunet-dht-get.c:256
 msgid "Issuing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:275 src/dht/gnunet-dht-monitor.c:302
+#: src/dht/gnunet-dht-get.c:292 src/dht/gnunet-dht-monitor.c:302
 #: src/dht/gnunet-dht-put.c:200
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:281
+#: src/dht/gnunet-dht-get.c:298
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:286 src/dht/gnunet-dht-put.c:217
+#: src/dht/gnunet-dht-get.c:303 src/dht/gnunet-dht-put.c:217
 msgid "use DHT's record route option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:292 src/dht/gnunet-dht-monitor.c:308
+#: src/dht/gnunet-dht-get.c:309 src/dht/gnunet-dht-monitor.c:308
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:298
+#: src/dht/gnunet-dht-get.c:315
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:304 src/dht/gnunet-dht-put.c:206
+#: src/dht/gnunet-dht-get.c:321 src/dht/gnunet-dht-put.c:206
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:321
+#: src/dht/gnunet-dht-get.c:338
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -2495,71 +2495,71 @@ msgstr ""
 msgid "# fragmentation transmissions completed"
 msgstr "# các sự truyền PONG bị lỗi"
 
-#: src/fs/fs_api.c:491
+#: src/fs/fs_api.c:480
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs_api.c:502
+#: src/fs/fs_api.c:491
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs_api.c:510
+#: src/fs/fs_api.c:499
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1173
+#: src/fs/fs_api.c:1156
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:1724
+#: src/fs/fs_api.c:1707
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1739
+#: src/fs/fs_api.c:1722
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2468
+#: src/fs/fs_api.c:2451
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2479
+#: src/fs/fs_api.c:2462
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2627 src/fs/fs_api.c:2873
+#: src/fs/fs_api.c:2610 src/fs/fs_api.c:2856
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2645
+#: src/fs/fs_api.c:2628
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2661 src/fs/fs_api.c:2681 src/fs/fs_api.c:3180
+#: src/fs/fs_api.c:2644 src/fs/fs_api.c:2664 src/fs/fs_api.c:3163
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2863
+#: src/fs/fs_api.c:2846
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3124
+#: src/fs/fs_api.c:3107
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3219
+#: src/fs/fs_api.c:3202
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2595,38 +2595,38 @@ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/fs_download.c:1053
+#: src/fs/fs_download.c:1044
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %lu bytes at depth %u and "
 "offset %llu/%llu, got %lu bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1075
+#: src/fs/fs_download.c:1066
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1098
+#: src/fs/fs_download.c:1089
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs_download.c:1109
+#: src/fs/fs_download.c:1100
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_download.c:1119
+#: src/fs/fs_download.c:1110
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_download.c:1227
+#: src/fs/fs_download.c:1218
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/fs_download.c:1899
+#: src/fs/fs_download.c:1890
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
@@ -2744,12 +2744,12 @@ msgstr "Kho dữ liệu đầy.\n"
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:218
+#: src/fs/fs_publish_ksk.c:212
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "« %s »: Không thể kết nối.\n"
 
-#: src/fs/fs_publish_ublock.c:240
+#: src/fs/fs_publish_ublock.c:215
 #, fuzzy
 msgid "Internal error."
 msgstr "Lỗi VR."
@@ -3515,68 +3515,68 @@ msgstr "# các kết nối dht"
 msgid "# cadet connections active"
 msgstr "# các kết nối dht"
 
-#: src/fs/gnunet-service-fs_cp.c:680
+#: src/fs/gnunet-service-fs_cp.c:665
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:684
+#: src/fs/gnunet-service-fs_cp.c:669
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:717 src/fs/gnunet-service-fs_cp.c:1342
+#: src/fs/gnunet-service-fs_cp.c:702 src/fs/gnunet-service-fs_cp.c:1327
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:812
+#: src/fs/gnunet-service-fs_cp.c:797
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1009
+#: src/fs/gnunet-service-fs_cp.c:994
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1034
+#: src/fs/gnunet-service-fs_cp.c:1019
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1044
+#: src/fs/gnunet-service-fs_cp.c:1029
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1141
+#: src/fs/gnunet-service-fs_cp.c:1126
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1199
+#: src/fs/gnunet-service-fs_cp.c:1184
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1223
+#: src/fs/gnunet-service-fs_cp.c:1208
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1237
+#: src/fs/gnunet-service-fs_cp.c:1222
 #, fuzzy
 msgid "# requests dropped due to full reply queue"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1294
+#: src/fs/gnunet-service-fs_cp.c:1279
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1338
+#: src/fs/gnunet-service-fs_cp.c:1323
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:1708
+#: src/fs/gnunet-service-fs_cp.c:1679
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# các thông báo phát hiện dht được nhận"
@@ -3597,25 +3597,25 @@ msgstr "Gặp lỗi khi tạo người dùng"
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:317
+#: src/fs/gnunet-service-fs_indexing.c:297
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:331
+#: src/fs/gnunet-service-fs_indexing.c:311
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:335
+#: src/fs/gnunet-service-fs_indexing.c:315
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:349
+#: src/fs/gnunet-service-fs_indexing.c:329
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Đánh chỉ mục dữ liệu của tập tin « %s » bị lỗi tại vị tri %llu.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:455
+#: src/fs/gnunet-service-fs_indexing.c:435
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3656,105 +3656,105 @@ msgstr "# các yêu cầu get (lấy) dht được nhận"
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:325
+#: src/fs/gnunet-service-fs_pr.c:305
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:416 src/fs/gnunet-service-fs_pr.c:654
+#: src/fs/gnunet-service-fs_pr.c:396 src/fs/gnunet-service-fs_pr.c:626
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:829
+#: src/fs/gnunet-service-fs_pr.c:795
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:903
+#: src/fs/gnunet-service-fs_pr.c:869
 #, fuzzy
 msgid "# results found locally"
 msgstr "# nội dung lỗ hổng được tìm cục bộ"
 
-#: src/fs/gnunet-service-fs_pr.c:1037
+#: src/fs/gnunet-service-fs_pr.c:1003
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1066
+#: src/fs/gnunet-service-fs_pr.c:1032
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_pr.c:1107
+#: src/fs/gnunet-service-fs_pr.c:1073
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1262
+#: src/fs/gnunet-service-fs_pr.c:1228
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1317
+#: src/fs/gnunet-service-fs_pr.c:1283
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1338
+#: src/fs/gnunet-service-fs_pr.c:1304
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1405
+#: src/fs/gnunet-service-fs_pr.c:1371
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1467
+#: src/fs/gnunet-service-fs_pr.c:1433
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1522
+#: src/fs/gnunet-service-fs_pr.c:1488
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1537
+#: src/fs/gnunet-service-fs_pr.c:1503
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1560
+#: src/fs/gnunet-service-fs_pr.c:1526
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1577
+#: src/fs/gnunet-service-fs_pr.c:1543
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1598
+#: src/fs/gnunet-service-fs_pr.c:1564
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1604
+#: src/fs/gnunet-service-fs_pr.c:1570
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1650
+#: src/fs/gnunet-service-fs_pr.c:1616
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1663
+#: src/fs/gnunet-service-fs_pr.c:1629
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1714
+#: src/fs/gnunet-service-fs_pr.c:1680
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1778
+#: src/fs/gnunet-service-fs_pr.c:1744
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/fs/gnunet-service-fs_push.c:648
+#: src/fs/gnunet-service-fs_push.c:643
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -3883,11 +3883,11 @@ msgstr ""
 #: src/hostlist/gnunet-daemon-hostlist_client.c:544
 #: src/hostlist/gnunet-daemon-hostlist_client.c:772
 #: src/hostlist/gnunet-daemon-hostlist_client.c:781
-#: src/hostlist/gnunet-daemon-hostlist_client.c:836
-#: src/hostlist/gnunet-daemon-hostlist_client.c:848
-#: src/hostlist/gnunet-daemon-hostlist_client.c:964
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1066
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1074
+#: src/hostlist/gnunet-daemon-hostlist_client.c:835
+#: src/hostlist/gnunet-daemon-hostlist_client.c:847
+#: src/hostlist/gnunet-daemon-hostlist_client.c:957
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1059
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1067
 #: src/transport/plugin_transport_http_client.c:600
 #: src/transport/plugin_transport_http_client.c:618
 #, c-format
@@ -3939,59 +3939,59 @@ msgstr ""
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2658
+#: src/gns/gnunet-gns-proxy.c:2653
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Không thể tạo tài khoản người dùng:"
 
-#: src/gns/gnunet-gns-proxy.c:2690
+#: src/gns/gnunet-gns-proxy.c:2685
 #, fuzzy, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/gns/gnunet-gns-proxy.c:2899
+#: src/gns/gnunet-gns-proxy.c:2894
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2923 src/rest/gnunet-rest-server.c:917
+#: src/gns/gnunet-gns-proxy.c:2918 src/rest/gnunet-rest-server.c:917
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3272
+#: src/gns/gnunet-gns-proxy.c:3267
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3304
+#: src/gns/gnunet-gns-proxy.c:3299
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3390
+#: src/gns/gnunet-gns-proxy.c:3385
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3731
+#: src/gns/gnunet-gns-proxy.c:3726
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gns/gnunet-gns-proxy.c:3865
+#: src/gns/gnunet-gns-proxy.c:3860
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3870
+#: src/gns/gnunet-gns-proxy.c:3865
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3874
+#: src/gns/gnunet-gns-proxy.c:3869
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3900
+#: src/gns/gnunet-gns-proxy.c:3895
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -4063,7 +4063,7 @@ msgstr "Không thể kết nối tới %s:%u: %s\n"
 msgid "Error converting GNS response to DNS response!\n"
 msgstr "Gặp lỗi khi chuyển đổi các đối số sang URI.\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:386
+#: src/gns/gnunet-service-gns_interceptor.c:380
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
@@ -4083,50 +4083,50 @@ msgstr ""
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:904
+#: src/gns/gnunet-service-gns_resolver.c:903
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1095
+#: src/gns/gnunet-service-gns_resolver.c:1094
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1871
+#: src/gns/gnunet-service-gns_resolver.c:1870
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1886
+#: src/gns/gnunet-service-gns_resolver.c:1885
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1926
+#: src/gns/gnunet-service-gns_resolver.c:1918
 #, fuzzy, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2328
+#: src/gns/gnunet-service-gns_resolver.c:2320
 msgid "Unable to process critical delegation record\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2333
+#: src/gns/gnunet-service-gns_resolver.c:2325
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2356
+#: src/gns/gnunet-service-gns_resolver.c:2348
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2523
+#: src/gns/gnunet-service-gns_resolver.c:2515
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2671
+#: src/gns/gnunet-service-gns_resolver.c:2663
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
@@ -4404,7 +4404,7 @@ msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# các HELLO tải xuống qua HTTP"
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:677
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1460
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4420,117 +4420,117 @@ msgid ""
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:893
+#: src/hostlist/gnunet-daemon-hostlist_client.c:886
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:908
+#: src/hostlist/gnunet-daemon-hostlist_client.c:901
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:928
+#: src/hostlist/gnunet-daemon-hostlist_client.c:921
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:934
+#: src/hostlist/gnunet-daemon-hostlist_client.c:927
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:942
+#: src/hostlist/gnunet-daemon-hostlist_client.c:935
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:998
+#: src/hostlist/gnunet-daemon-hostlist_client.c:991
 #, fuzzy, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1007
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1000
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1144
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1732
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1137
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1725
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1154
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1147
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1212
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1233
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1205
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1226
 #, fuzzy
 msgid "# active connections"
 msgstr "# các kết nối dht"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1396
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1389
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1394
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1412
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1405
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1446
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1456
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1449
 #, fuzzy
 msgid "# hostlist URIs read from file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1500
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1514
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1547
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1566
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1540
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1559
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1560
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1553
 #, fuzzy
 msgid "# hostlist URIs written to file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1661
-#: src/transport/plugin_transport_http_client.c:2300
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1654
+#: src/transport/plugin_transport_http_client.c:2294
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1690
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1683
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1703
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1696
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1717
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1710
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4607,7 +4607,7 @@ msgid "# hostlist advertisements send"
 msgstr "# Các quảng cáo ngoại được chuyển tiếp"
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:674
-#: src/transport/gnunet-service-transport.c:2662
+#: src/transport/gnunet-service-transport.c:2657
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
@@ -4775,7 +4775,7 @@ msgstr "Không thể lưu tập tin cấu hình « %s »:"
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/identity/plugin_rest_identity.c:1401
+#: src/identity/plugin_rest_identity.c:1529
 #, fuzzy
 msgid "Identity REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
@@ -5534,7 +5534,7 @@ msgstr "Lỗi bắt đầu thu thập.\n"
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_mini.c:607
+#: src/nat/gnunet-service-nat_mini.c:602
 msgid "`upnpc' command not found\n"
 msgstr ""
 
@@ -5836,51 +5836,46 @@ msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:209
-#, fuzzy, c-format
-msgid "Invalid DID `%s'\n"
-msgstr "Dữ liệu nhập không hợp lệ.\n"
-
-#: src/reclaim/gnunet-did.c:835
+#: src/reclaim/gnunet-did.c:591
 msgid "Create a DID Document and display its DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:840
+#: src/reclaim/gnunet-did.c:596
 msgid "Get the DID Document associated with the given DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:844
-msgid "Show the DID for a given ego"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:849
+#: src/reclaim/gnunet-did.c:601
 msgid "Remove the DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:853 src/reclaim/gnunet-did.c:857
+#: src/reclaim/gnunet-did.c:605
 msgid "Replace the DID Document."
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:863
+#: src/reclaim/gnunet-did.c:609
+msgid "Show the DID for a given ego"
+msgstr ""
+
+#: src/reclaim/gnunet-did.c:613
+msgid "Show egos with DIDs"
+msgstr ""
+
+#: src/reclaim/gnunet-did.c:619
 msgid "The Decentralized Identity (DID)"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:869
+#: src/reclaim/gnunet-did.c:625
 msgid "The DID Document to store in GNUNET"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:874
+#: src/reclaim/gnunet-did.c:630
 msgid "The name of the EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:880
+#: src/reclaim/gnunet-did.c:636
 msgid "The time until the DID Document is going to expire (e.g. 5d)"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:889
-msgid "Manage Decentralized Identities (DIDs)"
-msgstr ""
-
 #: src/reclaim/gnunet-reclaim.c:802
 #, fuzzy, c-format
 msgid "Ego is required\n"
@@ -5989,61 +5984,61 @@ msgstr "Lưu cấu hình ngay bây giờ không?"
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1388
+#: src/regex/gnunet-regex-profiler.c:1366
 #, fuzzy
 msgid "No configuration file given. Exiting\n"
 msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
 
-#: src/regex/gnunet-regex-profiler.c:1430
+#: src/regex/gnunet-regex-profiler.c:1408
 #: src/regex/gnunet-regex-simulation-profiler.c:631
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1436
+#: src/regex/gnunet-regex-profiler.c:1414
 #: src/regex/gnunet-regex-simulation-profiler.c:639
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1444
+#: src/regex/gnunet-regex-profiler.c:1422
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/regex/gnunet-regex-profiler.c:1453
+#: src/regex/gnunet-regex-profiler.c:1431
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1473
+#: src/regex/gnunet-regex-profiler.c:1451
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/regex/gnunet-regex-profiler.c:1562
+#: src/regex/gnunet-regex-profiler.c:1540
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1569
+#: src/regex/gnunet-regex-profiler.c:1547
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1575
+#: src/regex/gnunet-regex-profiler.c:1553
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1582
+#: src/regex/gnunet-regex-profiler.c:1560
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1589
+#: src/regex/gnunet-regex-profiler.c:1567
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1604
+#: src/regex/gnunet-regex-profiler.c:1582
 msgid "Profiler for regex"
 msgstr ""
 
@@ -7001,7 +6996,7 @@ msgstr ""
 #: src/transport/gnunet-communicator-tcp.c:3342
 #: src/transport/gnunet-communicator-udp.c:3867
 #: src/transport/gnunet-service-tng.c:11039
-#: src/transport/gnunet-service-transport.c:2627
+#: src/transport/gnunet-service-transport.c:2622
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
@@ -7060,21 +7055,21 @@ msgid "# bytes payload received"
 msgstr "# các byte đã giải mã"
 
 #: src/transport/gnunet-service-transport.c:2019
-#: src/transport/gnunet-service-transport.c:2453
+#: src/transport/gnunet-service-transport.c:2448
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2457
+#: src/transport/gnunet-service-transport.c:2452
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/transport/gnunet-service-transport.c:2552
+#: src/transport/gnunet-service-transport.c:2547
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-service-transport.c:2561
+#: src/transport/gnunet-service-transport.c:2556
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
@@ -7617,24 +7612,24 @@ msgstr ""
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2140
+#: src/transport/plugin_transport_http_client.c:2134
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2189
+#: src/transport/plugin_transport_http_client.c:2183
 #: src/transport/plugin_transport_http_server.c:3276
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/transport/plugin_transport_http_client.c:2206
+#: src/transport/plugin_transport_http_client.c:2200
 #: src/transport/plugin_transport_http_server.c:3346
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/transport/plugin_transport_http_client.c:2240
+#: src/transport/plugin_transport_http_client.c:2234
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "tăng sổ tối đa các kết nối TCP/IP"
@@ -8152,81 +8147,81 @@ msgstr "Không thể truy cập đến tập tin gnunet-directory 
« %s »\n"
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:227 src/util/bio.c:235
+#: src/util/bio.c:228 src/util/bio.c:236
 #, fuzzy, c-format
 msgid "Error reading `%s' from file: %s"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/bio.c:237
+#: src/util/bio.c:238
 msgid "End of file"
 msgstr ""
 
-#: src/util/bio.c:266
+#: src/util/bio.c:267
 #, fuzzy, c-format
 msgid "Error while reading `%s' from buffer: %s"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/util/bio.c:268
+#: src/util/bio.c:269
 msgid "Not enough data left"
 msgstr ""
 
-#: src/util/bio.c:308
+#: src/util/bio.c:309
 #, fuzzy, c-format
 msgid "Invalid handle type while reading `%s'"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/util/bio.c:335 src/util/bio.c:839
+#: src/util/bio.c:336 src/util/bio.c:840
 msgid "string length"
 msgstr ""
 
-#: src/util/bio.c:341
+#: src/util/bio.c:342
 #, fuzzy, c-format
 msgid "%s (while reading `%s')"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/util/bio.c:346
+#: src/util/bio.c:347
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:359
+#: src/util/bio.c:360
 #, c-format
 msgid "String `%s' longer than allowed (%u > %lu)"
 msgstr ""
 
-#: src/util/bio.c:398 src/util/bio.c:864 src/util/bio.c:881
+#: src/util/bio.c:399 src/util/bio.c:865 src/util/bio.c:882
 msgid "metadata length"
 msgstr ""
 
-#: src/util/bio.c:410
+#: src/util/bio.c:411
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:426
+#: src/util/bio.c:427
 #, fuzzy, c-format
 msgid "Failed to deserialize metadata `%s'"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/util/bio.c:668
+#: src/util/bio.c:669
 msgid "Unable to flush buffer to file"
 msgstr ""
 
-#: src/util/bio.c:730 src/util/bio.c:751
+#: src/util/bio.c:731 src/util/bio.c:752
 #, fuzzy, c-format
 msgid "Error while writing `%s' to file: %s"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/util/bio.c:732
+#: src/util/bio.c:733
 msgid "No associated file"
 msgstr ""
 
-#: src/util/bio.c:816
+#: src/util/bio.c:817
 #, fuzzy, c-format
 msgid "Invalid handle type while writing `%s'"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/bio.c:876
+#: src/util/bio.c:877
 #, fuzzy, c-format
 msgid "Failed to serialize metadata `%s'"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
@@ -8235,7 +8230,7 @@ msgstr "Lỗi lấy thông kê về truyền tải.\n"
 msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:1106
+#: src/util/client.c:1095
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -8245,54 +8240,54 @@ msgstr ""
 msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:926
+#: src/util/common_logging.c:911
 #, fuzzy, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "Thông điệp « %.*s » đã lặp lại %u lần trong %llu giây trước\n"
 
-#: src/util/common_logging.c:1131
+#: src/util/common_logging.c:1104
 msgid "ERROR"
 msgstr "LỖI"
 
-#: src/util/common_logging.c:1133
+#: src/util/common_logging.c:1106
 msgid "WARNING"
 msgstr "CẢNH BÁO"
 
-#: src/util/common_logging.c:1135
+#: src/util/common_logging.c:1108
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:1137
+#: src/util/common_logging.c:1110
 msgid "INFO"
 msgstr "TIN"
 
-#: src/util/common_logging.c:1139
+#: src/util/common_logging.c:1112
 msgid "DEBUG"
 msgstr "GỠ LỖI"
 
-#: src/util/common_logging.c:1141
+#: src/util/common_logging.c:1114
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:1142
+#: src/util/common_logging.c:1115
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1423
+#: src/util/common_logging.c:1396
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1468
+#: src/util/common_logging.c:1441
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1487
+#: src/util/common_logging.c:1453
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n"
 
-#: src/util/common_logging.c:1510
+#: src/util/common_logging.c:1468
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8390,7 +8385,7 @@ msgstr ""
 msgid "failed to load configuration defaults"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/util/container_bloomfilter.c:542
+#: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -8402,17 +8397,17 @@ msgstr ""
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/util/crypto_ecc.c:669
+#: src/util/crypto_ecc.c:689
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
 
-#: src/util/crypto_ecc_setup.c:280
+#: src/util/crypto_ecc_setup.c:272
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/util/crypto_random.c:385
+#: src/util/crypto_random.c:372
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n"
@@ -8932,17 +8927,17 @@ msgstr ""
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Lỗi sơ khởi cơ chế phần bổ sung: %s\n"
 
-#: src/util/plugin.c:156
+#: src/util/plugin.c:157
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr "« %s » không giải quyết được phương pháp « %s », với lỗi: %s\n"
 
-#: src/util/plugin.c:234
+#: src/util/plugin.c:214
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "« %s » thất bại cho thư viện « %s » với lỗi: %s\n"
 
-#: src/util/plugin.c:414
+#: src/util/plugin.c:370
 #, fuzzy
 msgid "Could not determine plugin installation path.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
@@ -9293,6 +9288,10 @@ msgstr ""
 msgid "Failed to connect to the namestore!\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
+#, fuzzy, c-format
+#~ msgid "Invalid DID `%s'\n"
+#~ msgstr "Dữ liệu nhập không hợp lệ.\n"
+
 #, fuzzy, c-format
 #~ msgid "Block not of type %u\n"
 #~ msgstr "Không biết truyền tải nào kiểu %d.\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6be8601c7..98b1d7d80 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2022-08-05 13:57+0200\n"
+"POT-Creation-Date: 2022-09-04 11:01+0200\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -661,25 +661,25 @@ msgstr ""
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:326
+#: src/ats/gnunet-service-ats_plugins.c:321
 #, c-format
 msgid ""
 "Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:336
+#: src/ats/gnunet-service-ats_plugins.c:331
 #, c-format
 msgid "%s quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:382
+#: src/ats/gnunet-service-ats_plugins.c:377
 #, c-format
 msgid ""
 "No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_plugins.c:474
+#: src/ats/gnunet-service-ats_plugins.c:462
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "无法初始化 SQLite:%s。\n"
@@ -1458,40 +1458,40 @@ msgstr ""
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1513
+#: src/core/gnunet-service-core_kx.c:1506
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1524
+#: src/core/gnunet-service-core_kx.c:1517
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1528
+#: src/core/gnunet-service-core_kx.c:1521
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1606
-#: src/core/gnunet-service-core_kx.c:1633
+#: src/core/gnunet-service-core_kx.c:1599
+#: src/core/gnunet-service-core_kx.c:1626
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1619
+#: src/core/gnunet-service-core_kx.c:1612
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1664
+#: src/core/gnunet-service-core_kx.c:1657
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1673
+#: src/core/gnunet-service-core_kx.c:1666
 msgid "# bytes of payload decrypted"
 msgstr ""
 
 #: src/core/gnunet-service-core_sessions.c:252
 #: src/core/gnunet-service-core_sessions.c:337
-#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1519
+#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1496
 #: src/topology/gnunet-daemon-topology.c:579
 #: src/topology/gnunet-daemon-topology.c:671
 #: src/transport/gnunet-service-transport_neighbours.c:723
@@ -1582,31 +1582,31 @@ msgstr ""
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1032
+#: src/datastore/datastore_api.c:1007
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1093
+#: src/datastore/datastore_api.c:1068
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1158
+#: src/datastore/datastore_api.c:1113
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1236
+#: src/datastore/datastore_api.c:1171
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1295
+#: src/datastore/datastore_api.c:1230
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1357
+#: src/datastore/datastore_api.c:1276
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1438
+#: src/datastore/datastore_api.c:1357
 msgid "# GET requests executed"
 msgstr ""
 
@@ -1939,46 +1939,46 @@ msgstr ""
 msgid "Result %d, type %d:\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:221
+#: src/dht/gnunet-dht-get.c:238
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:229 src/dht/gnunet-dht-hello.c:119
+#: src/dht/gnunet-dht-get.c:246 src/dht/gnunet-dht-hello.c:119
 #: src/dht/gnunet-dht-monitor.c:255
 #, fuzzy, c-format
 msgid "Failed to connect to DHT service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/dht/gnunet-dht-get.c:239
+#: src/dht/gnunet-dht-get.c:256
 msgid "Issuing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:275 src/dht/gnunet-dht-monitor.c:302
+#: src/dht/gnunet-dht-get.c:292 src/dht/gnunet-dht-monitor.c:302
 #: src/dht/gnunet-dht-put.c:200
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:281
+#: src/dht/gnunet-dht-get.c:298
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:286 src/dht/gnunet-dht-put.c:217
+#: src/dht/gnunet-dht-get.c:303 src/dht/gnunet-dht-put.c:217
 msgid "use DHT's record route option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:292 src/dht/gnunet-dht-monitor.c:308
+#: src/dht/gnunet-dht-get.c:309 src/dht/gnunet-dht-monitor.c:308
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:298
+#: src/dht/gnunet-dht-get.c:315
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:304 src/dht/gnunet-dht-put.c:206
+#: src/dht/gnunet-dht-get.c:321 src/dht/gnunet-dht-put.c:206
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:321
+#: src/dht/gnunet-dht-get.c:338
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -2402,71 +2402,71 @@ msgstr ""
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/fs/fs_api.c:491
+#: src/fs/fs_api.c:480
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:502
+#: src/fs/fs_api.c:491
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/fs_api.c:510
+#: src/fs/fs_api.c:499
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1173
+#: src/fs/fs_api.c:1156
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:1724
+#: src/fs/fs_api.c:1707
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1739
+#: src/fs/fs_api.c:1722
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2468
+#: src/fs/fs_api.c:2451
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2479
+#: src/fs/fs_api.c:2462
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2627 src/fs/fs_api.c:2873
+#: src/fs/fs_api.c:2610 src/fs/fs_api.c:2856
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:2645
+#: src/fs/fs_api.c:2628
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:2661 src/fs/fs_api.c:2681 src/fs/fs_api.c:3180
+#: src/fs/fs_api.c:2644 src/fs/fs_api.c:2664 src/fs/fs_api.c:3163
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2863
+#: src/fs/fs_api.c:2846
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:3124
+#: src/fs/fs_api.c:3107
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3219
+#: src/fs/fs_api.c:3202
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2501,38 +2501,38 @@ msgstr "打开日志文件“%s”失败:%s\n"
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1053
+#: src/fs/fs_download.c:1044
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %lu bytes at depth %u and "
 "offset %llu/%llu, got %lu bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1075
+#: src/fs/fs_download.c:1066
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1098
+#: src/fs/fs_download.c:1089
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_download.c:1109
+#: src/fs/fs_download.c:1100
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_download.c:1119
+#: src/fs/fs_download.c:1110
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_download.c:1227
+#: src/fs/fs_download.c:1218
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "未知错误。\n"
 
-#: src/fs/fs_download.c:1899
+#: src/fs/fs_download.c:1890
 #, fuzzy
 msgid "Invalid URI"
 msgstr "无效条目。\n"
@@ -2644,11 +2644,11 @@ msgstr "“%s”已连接到“%s”。\n"
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:218
+#: src/fs/fs_publish_ksk.c:212
 msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish_ublock.c:240
+#: src/fs/fs_publish_ublock.c:215
 #, fuzzy
 msgid "Internal error."
 msgstr "未知错误。\n"
@@ -3379,60 +3379,60 @@ msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/fs/gnunet-service-fs_cp.c:680
+#: src/fs/gnunet-service-fs_cp.c:665
 msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:684
+#: src/fs/gnunet-service-fs_cp.c:669
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:717 src/fs/gnunet-service-fs_cp.c:1342
+#: src/fs/gnunet-service-fs_cp.c:702 src/fs/gnunet-service-fs_cp.c:1327
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:812
+#: src/fs/gnunet-service-fs_cp.c:797
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1009
+#: src/fs/gnunet-service-fs_cp.c:994
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1034
+#: src/fs/gnunet-service-fs_cp.c:1019
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1044
+#: src/fs/gnunet-service-fs_cp.c:1029
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1141
+#: src/fs/gnunet-service-fs_cp.c:1126
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1199
+#: src/fs/gnunet-service-fs_cp.c:1184
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1223
+#: src/fs/gnunet-service-fs_cp.c:1208
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1237
+#: src/fs/gnunet-service-fs_cp.c:1222
 msgid "# requests dropped due to full reply queue"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1294
+#: src/fs/gnunet-service-fs_cp.c:1279
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1338
+#: src/fs/gnunet-service-fs_cp.c:1323
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1708
+#: src/fs/gnunet-service-fs_cp.c:1679
 msgid "# migration stop messages sent"
 msgstr ""
 
@@ -3452,25 +3452,25 @@ msgstr "创建用户出错"
 msgid "Failed to delete bogus block: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:317
+#: src/fs/gnunet-service-fs_indexing.c:297
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:331
+#: src/fs/gnunet-service-fs_indexing.c:311
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:335
+#: src/fs/gnunet-service-fs_indexing.c:315
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:349
+#: src/fs/gnunet-service-fs_indexing.c:329
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:455
+#: src/fs/gnunet-service-fs_indexing.c:435
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3506,97 +3506,97 @@ msgstr ""
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:325
+#: src/fs/gnunet-service-fs_pr.c:305
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:416 src/fs/gnunet-service-fs_pr.c:654
+#: src/fs/gnunet-service-fs_pr.c:396 src/fs/gnunet-service-fs_pr.c:626
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:829
+#: src/fs/gnunet-service-fs_pr.c:795
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:903
+#: src/fs/gnunet-service-fs_pr.c:869
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1037
+#: src/fs/gnunet-service-fs_pr.c:1003
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1066
+#: src/fs/gnunet-service-fs_pr.c:1032
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1107
+#: src/fs/gnunet-service-fs_pr.c:1073
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1262
+#: src/fs/gnunet-service-fs_pr.c:1228
 msgid "# Replies received from CADET"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1317
+#: src/fs/gnunet-service-fs_pr.c:1283
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1338
+#: src/fs/gnunet-service-fs_pr.c:1304
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1405
+#: src/fs/gnunet-service-fs_pr.c:1371
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1467
+#: src/fs/gnunet-service-fs_pr.c:1433
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1522
+#: src/fs/gnunet-service-fs_pr.c:1488
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1537
+#: src/fs/gnunet-service-fs_pr.c:1503
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1560
+#: src/fs/gnunet-service-fs_pr.c:1526
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1577
+#: src/fs/gnunet-service-fs_pr.c:1543
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1598
+#: src/fs/gnunet-service-fs_pr.c:1564
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1604
+#: src/fs/gnunet-service-fs_pr.c:1570
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1650
+#: src/fs/gnunet-service-fs_pr.c:1616
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1663
+#: src/fs/gnunet-service-fs_pr.c:1629
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1714
+#: src/fs/gnunet-service-fs_pr.c:1680
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1778
+#: src/fs/gnunet-service-fs_pr.c:1744
 msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:648
+#: src/fs/gnunet-service-fs_push.c:643
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -3720,11 +3720,11 @@ msgstr ""
 #: src/hostlist/gnunet-daemon-hostlist_client.c:544
 #: src/hostlist/gnunet-daemon-hostlist_client.c:772
 #: src/hostlist/gnunet-daemon-hostlist_client.c:781
-#: src/hostlist/gnunet-daemon-hostlist_client.c:836
-#: src/hostlist/gnunet-daemon-hostlist_client.c:848
-#: src/hostlist/gnunet-daemon-hostlist_client.c:964
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1066
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1074
+#: src/hostlist/gnunet-daemon-hostlist_client.c:835
+#: src/hostlist/gnunet-daemon-hostlist_client.c:847
+#: src/hostlist/gnunet-daemon-hostlist_client.c:957
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1059
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1067
 #: src/transport/plugin_transport_http_client.c:600
 #: src/transport/plugin_transport_http_client.c:618
 #, c-format
@@ -3776,59 +3776,59 @@ msgstr ""
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2658
+#: src/gns/gnunet-gns-proxy.c:2653
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "无法创建用户账户:"
 
-#: src/gns/gnunet-gns-proxy.c:2690
+#: src/gns/gnunet-gns-proxy.c:2685
 #, fuzzy, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr "无法保存配置文件“%s”:"
 
-#: src/gns/gnunet-gns-proxy.c:2899
+#: src/gns/gnunet-gns-proxy.c:2894
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2923 src/rest/gnunet-rest-server.c:917
+#: src/gns/gnunet-gns-proxy.c:2918 src/rest/gnunet-rest-server.c:917
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3272
+#: src/gns/gnunet-gns-proxy.c:3267
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3304
+#: src/gns/gnunet-gns-proxy.c:3299
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3390
+#: src/gns/gnunet-gns-proxy.c:3385
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3731
+#: src/gns/gnunet-gns-proxy.c:3726
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:3865
+#: src/gns/gnunet-gns-proxy.c:3860
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3870
+#: src/gns/gnunet-gns-proxy.c:3865
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3874
+#: src/gns/gnunet-gns-proxy.c:3869
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3900
+#: src/gns/gnunet-gns-proxy.c:3895
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -3897,7 +3897,7 @@ msgstr "无法连接到 %s:%u:%s\n"
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:386
+#: src/gns/gnunet-service-gns_interceptor.c:380
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -3917,50 +3917,50 @@ msgstr ""
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:904
+#: src/gns/gnunet-service-gns_resolver.c:903
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1095
+#: src/gns/gnunet-service-gns_resolver.c:1094
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1871
+#: src/gns/gnunet-service-gns_resolver.c:1870
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1886
+#: src/gns/gnunet-service-gns_resolver.c:1885
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1926
+#: src/gns/gnunet-service-gns_resolver.c:1918
 #, fuzzy, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2328
+#: src/gns/gnunet-service-gns_resolver.c:2320
 msgid "Unable to process critical delegation record\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2333
+#: src/gns/gnunet-service-gns_resolver.c:2325
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2356
+#: src/gns/gnunet-service-gns_resolver.c:2348
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2523
+#: src/gns/gnunet-service-gns_resolver.c:2515
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2671
+#: src/gns/gnunet-service-gns_resolver.c:2663
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
@@ -4230,7 +4230,7 @@ msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:677
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1460
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4246,114 +4246,114 @@ msgid ""
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:893
+#: src/hostlist/gnunet-daemon-hostlist_client.c:886
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:908
+#: src/hostlist/gnunet-daemon-hostlist_client.c:901
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:928
+#: src/hostlist/gnunet-daemon-hostlist_client.c:921
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:934
+#: src/hostlist/gnunet-daemon-hostlist_client.c:927
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:942
+#: src/hostlist/gnunet-daemon-hostlist_client.c:935
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:998
+#: src/hostlist/gnunet-daemon-hostlist_client.c:991
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1007
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1000
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1144
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1732
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1137
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1725
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1154
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1147
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1212
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1233
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1205
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1226
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1396
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1389
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1394
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1412
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1405
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址:%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1453
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1446
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1456
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1449
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1500
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址:%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1514
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1507
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1547
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1566
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1540
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1559
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1560
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1553
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1661
-#: src/transport/plugin_transport_http_client.c:2300
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1654
+#: src/transport/plugin_transport_http_client.c:2294
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1690
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1683
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1703
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1696
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1717
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1710
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4423,7 +4423,7 @@ msgid "# hostlist advertisements send"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:674
-#: src/transport/gnunet-service-transport.c:2662
+#: src/transport/gnunet-service-transport.c:2657
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
@@ -4590,7 +4590,7 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/plugin_rest_identity.c:1401
+#: src/identity/plugin_rest_identity.c:1529
 msgid "Identity REST API initialized\n"
 msgstr ""
 
@@ -5343,7 +5343,7 @@ msgstr "运行 %s失败:%s %d\n"
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_mini.c:607
+#: src/nat/gnunet-service-nat_mini.c:602
 msgid "`upnpc' command not found\n"
 msgstr ""
 
@@ -5629,51 +5629,46 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:209
-#, fuzzy, c-format
-msgid "Invalid DID `%s'\n"
-msgstr "无效条目。\n"
-
-#: src/reclaim/gnunet-did.c:835
+#: src/reclaim/gnunet-did.c:591
 msgid "Create a DID Document and display its DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:840
+#: src/reclaim/gnunet-did.c:596
 msgid "Get the DID Document associated with the given DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:844
-msgid "Show the DID for a given ego"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:849
+#: src/reclaim/gnunet-did.c:601
 msgid "Remove the DID"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:853 src/reclaim/gnunet-did.c:857
+#: src/reclaim/gnunet-did.c:605
 msgid "Replace the DID Document."
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:863
+#: src/reclaim/gnunet-did.c:609
+msgid "Show the DID for a given ego"
+msgstr ""
+
+#: src/reclaim/gnunet-did.c:613
+msgid "Show egos with DIDs"
+msgstr ""
+
+#: src/reclaim/gnunet-did.c:619
 msgid "The Decentralized Identity (DID)"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:869
+#: src/reclaim/gnunet-did.c:625
 msgid "The DID Document to store in GNUNET"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:874
+#: src/reclaim/gnunet-did.c:630
 msgid "The name of the EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:880
+#: src/reclaim/gnunet-did.c:636
 msgid "The time until the DID Document is going to expire (e.g. 5d)"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:889
-msgid "Manage Decentralized Identities (DIDs)"
-msgstr ""
-
 #: src/reclaim/gnunet-reclaim.c:802
 #, fuzzy, c-format
 msgid "Ego is required\n"
@@ -5780,60 +5775,60 @@ msgstr "立即保存配置?"
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1388
+#: src/regex/gnunet-regex-profiler.c:1366
 msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1430
+#: src/regex/gnunet-regex-profiler.c:1408
 #: src/regex/gnunet-regex-simulation-profiler.c:631
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1436
+#: src/regex/gnunet-regex-profiler.c:1414
 #: src/regex/gnunet-regex-simulation-profiler.c:639
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1444
+#: src/regex/gnunet-regex-profiler.c:1422
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/regex/gnunet-regex-profiler.c:1453
+#: src/regex/gnunet-regex-profiler.c:1431
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1473
+#: src/regex/gnunet-regex-profiler.c:1451
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "创建用户出错"
 
-#: src/regex/gnunet-regex-profiler.c:1562
+#: src/regex/gnunet-regex-profiler.c:1540
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1569
+#: src/regex/gnunet-regex-profiler.c:1547
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1575
+#: src/regex/gnunet-regex-profiler.c:1553
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1582
+#: src/regex/gnunet-regex-profiler.c:1560
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1589
+#: src/regex/gnunet-regex-profiler.c:1567
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1604
+#: src/regex/gnunet-regex-profiler.c:1582
 msgid "Profiler for regex"
 msgstr ""
 
@@ -6780,7 +6775,7 @@ msgstr ""
 #: src/transport/gnunet-communicator-tcp.c:3342
 #: src/transport/gnunet-communicator-udp.c:3867
 #: src/transport/gnunet-service-tng.c:11039
-#: src/transport/gnunet-service-transport.c:2627
+#: src/transport/gnunet-service-transport.c:2622
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "立即保存配置?"
@@ -6835,21 +6830,21 @@ msgid "# bytes payload received"
 msgstr ""
 
 #: src/transport/gnunet-service-transport.c:2019
-#: src/transport/gnunet-service-transport.c:2453
+#: src/transport/gnunet-service-transport.c:2448
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2457
+#: src/transport/gnunet-service-transport.c:2452
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport.c:2552
+#: src/transport/gnunet-service-transport.c:2547
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/transport/gnunet-service-transport.c:2561
+#: src/transport/gnunet-service-transport.c:2556
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
@@ -7356,24 +7351,24 @@ msgstr ""
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2140
+#: src/transport/plugin_transport_http_client.c:2134
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2189
+#: src/transport/plugin_transport_http_client.c:2183
 #: src/transport/plugin_transport_http_server.c:3276
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/transport/plugin_transport_http_client.c:2206
+#: src/transport/plugin_transport_http_client.c:2200
 #: src/transport/plugin_transport_http_server.c:3346
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2240
+#: src/transport/plugin_transport_http_client.c:2234
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
@@ -7878,81 +7873,81 @@ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:227 src/util/bio.c:235
+#: src/util/bio.c:228 src/util/bio.c:236
 #, fuzzy, c-format
 msgid "Error reading `%s' from file: %s"
 msgstr "创建用户出错"
 
-#: src/util/bio.c:237
+#: src/util/bio.c:238
 msgid "End of file"
 msgstr ""
 
-#: src/util/bio.c:266
+#: src/util/bio.c:267
 #, fuzzy, c-format
 msgid "Error while reading `%s' from buffer: %s"
 msgstr "解析 dscl 输出时出错。\n"
 
-#: src/util/bio.c:268
+#: src/util/bio.c:269
 msgid "Not enough data left"
 msgstr ""
 
-#: src/util/bio.c:308
+#: src/util/bio.c:309
 #, fuzzy, c-format
 msgid "Invalid handle type while reading `%s'"
 msgstr "“%s”的参数无效。\n"
 
-#: src/util/bio.c:335 src/util/bio.c:839
+#: src/util/bio.c:336 src/util/bio.c:840
 msgid "string length"
 msgstr ""
 
-#: src/util/bio.c:341
+#: src/util/bio.c:342
 #, fuzzy, c-format
 msgid "%s (while reading `%s')"
 msgstr "解析 dscl 输出时出错。\n"
 
-#: src/util/bio.c:346
+#: src/util/bio.c:347
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:359
+#: src/util/bio.c:360
 #, c-format
 msgid "String `%s' longer than allowed (%u > %lu)"
 msgstr ""
 
-#: src/util/bio.c:398 src/util/bio.c:864 src/util/bio.c:881
+#: src/util/bio.c:399 src/util/bio.c:865 src/util/bio.c:882
 msgid "metadata length"
 msgstr ""
 
-#: src/util/bio.c:410
+#: src/util/bio.c:411
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:426
+#: src/util/bio.c:427
 #, fuzzy, c-format
 msgid "Failed to deserialize metadata `%s'"
 msgstr "发送消息失败。\n"
 
-#: src/util/bio.c:668
+#: src/util/bio.c:669
 msgid "Unable to flush buffer to file"
 msgstr ""
 
-#: src/util/bio.c:730 src/util/bio.c:751
+#: src/util/bio.c:731 src/util/bio.c:752
 #, fuzzy, c-format
 msgid "Error while writing `%s' to file: %s"
 msgstr "解析 dscl 输出时出错。\n"
 
-#: src/util/bio.c:732
+#: src/util/bio.c:733
 msgid "No associated file"
 msgstr ""
 
-#: src/util/bio.c:816
+#: src/util/bio.c:817
 #, fuzzy, c-format
 msgid "Invalid handle type while writing `%s'"
 msgstr "IP 格式无效:“%s”\n"
 
-#: src/util/bio.c:876
+#: src/util/bio.c:877
 #, fuzzy, c-format
 msgid "Failed to serialize metadata `%s'"
 msgstr "发送消息失败。\n"
@@ -7961,7 +7956,7 @@ msgstr "发送消息失败。\n"
 msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:1106
+#: src/util/client.c:1095
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -7971,53 +7966,53 @@ msgstr ""
 msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:926
+#: src/util/common_logging.c:911
 #, fuzzy, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "消息“%.*s”重复了 %u 次,在最近 %llu 秒内\n"
 
-#: src/util/common_logging.c:1131
+#: src/util/common_logging.c:1104
 msgid "ERROR"
 msgstr "错误"
 
-#: src/util/common_logging.c:1133
+#: src/util/common_logging.c:1106
 msgid "WARNING"
 msgstr "警告"
 
-#: src/util/common_logging.c:1135
+#: src/util/common_logging.c:1108
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:1137
+#: src/util/common_logging.c:1110
 msgid "INFO"
 msgstr "信息"
 
-#: src/util/common_logging.c:1139
+#: src/util/common_logging.c:1112
 msgid "DEBUG"
 msgstr "调试"
 
-#: src/util/common_logging.c:1141
+#: src/util/common_logging.c:1114
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:1142
+#: src/util/common_logging.c:1115
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1423
+#: src/util/common_logging.c:1396
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1468
+#: src/util/common_logging.c:1441
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1487
+#: src/util/common_logging.c:1453
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束!\n"
 
-#: src/util/common_logging.c:1510
+#: src/util/common_logging.c:1468
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8112,7 +8107,7 @@ msgstr ""
 msgid "failed to load configuration defaults"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/container_bloomfilter.c:542
+#: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -8124,17 +8119,17 @@ msgstr ""
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/crypto_ecc.c:669
+#: src/util/crypto_ecc.c:689
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/crypto_ecc_setup.c:280
+#: src/util/crypto_ecc_setup.c:272
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/crypto_random.c:385
+#: src/util/crypto_random.c:372
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
@@ -8650,17 +8645,17 @@ msgstr ""
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "插件机构初始化失败:%s!\n"
 
-#: src/util/plugin.c:156
+#: src/util/plugin.c:157
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:234
+#: src/util/plugin.c:214
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:414
+#: src/util/plugin.c:370
 #, fuzzy
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
@@ -9002,6 +8997,10 @@ msgstr ""
 msgid "Failed to connect to the namestore!\n"
 msgstr "初始化“%s”服务失败。\n"
 
+#, fuzzy, c-format
+#~ msgid "Invalid DID `%s'\n"
+#~ msgstr "无效条目。\n"
+
 #, fuzzy, c-format
 #~ msgid "Businesscard HTTP server starts on %u\n"
 #~ msgstr "初始化“%s”服务失败。\n"
diff --git a/src/curl/Makefile.am b/src/curl/Makefile.am
index c6b350bc7..bf18b0647 100644
--- a/src/curl/Makefile.am
+++ b/src/curl/Makefile.am
@@ -6,16 +6,6 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
-if HAVE_LIBGNURL
-LIB_GNURL=@LIBGNURL@
-CPP_GNURL=@LIBGNURL_CPPFLAGS@
-else
-if HAVE_LIBCURL
-LIB_GNURL=@LIBCURL@
-CPP_GNURL=@LIBCURL_CPPFLAGS@
-endif
-endif
-
 lib_LTLIBRARIES = \
   libgnunetcurl.la
 
@@ -29,10 +19,10 @@ libgnunetcurl_la_SOURCES = \
 libgnunetcurl_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   -ljansson \
-  $(LIB_GNURL) \
+  @LIBCURL@ \
   $(XLIB)
 libgnunetcurl_la_CPPFLAGS = \
- $(CPP_GNURL) $(AM_CPPFLAGS) $(MHD_CFLAGS)
+ @LIBCURL_CPPFLAGS@ $(AM_CPPFLAGS) $(MHD_CFLAGS)
 
 #check_PROGRAMS = \
 #  test_curl
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index d49e0c5c8..1fe6ce438 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -42,19 +42,8 @@ dist_pkgcfg_DATA = \
 lib_LTLIBRARIES = \
   libgnunetgns.la
 
-
 if HAVE_GNUTLS
-if HAVE_LIBGNURL
-  DO_PROXY=gnunet-gns-proxy
-LIB_GNURL=@LIBGNURL@
-CPP_GNURL=@LIBGNURL_CPPFLAGS@
-else
-if HAVE_LIBCURL
-  DO_PROXY=gnunet-gns-proxy
-LIB_GNURL=@LIBCURL@
-CPP_GNURL=@LIBCURL_CPPFLAGS@
-endif
-endif
+DO_PROXY=gnunet-gns-proxy
 endif
 
 libexec_PROGRAMS = \
@@ -177,7 +166,7 @@ endif
 
 gnunet_gns_proxy_SOURCES = \
  gnunet-gns-proxy.c
-gnunet_gns_proxy_LDADD = $(MHD_LIBS) $(LIB_GNURL) -lgnutls \
+gnunet_gns_proxy_LDADD = $(MHD_LIBS) @LIBCURL@ -lgnutls \
   libgnunetgns.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/util/libgnunetutil.la \
@@ -185,14 +174,14 @@ gnunet_gns_proxy_LDADD = $(MHD_LIBS) $(LIB_GNURL) 
-lgnutls \
 if HAVE_GNUTLS_DANE
 gnunet_gns_proxy_LDADD += -lgnutls-dane
 endif
-gnunet_gns_proxy_CFLAGS = $(MHD_CFLAGS) $(CPP_GNURL) $(AM_CFLAGS)
+gnunet_gns_proxy_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 
 test_gns_proxy_SOURCES = \
   test_gns_proxy.c
-test_gns_proxy_LDADD = $(MHD_LIBS) $(LIB_GNURL) -lgnutls \
+test_gns_proxy_LDADD = $(MHD_LIBS) @LIBCURL@ -lgnutls \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
-test_gns_proxy_CFLAGS = $(MHD_CFLAGS) $(CPP_GNURL) $(AM_CFLAGS)
+test_gns_proxy_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 
 #gnunet_gns_import_SOURCES = \
 #  gnunet-gns-import.c
@@ -247,11 +236,9 @@ libgnunet_plugin_block_gns_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
 
 if HAVE_GNUTLS
-if HAVE_LIBGNURL
 check_PROGRAMS = \
   test_gns_proxy
 endif
-endif
 
 check_SCRIPTS = \
   test_gns_lookup.sh \
@@ -273,11 +260,9 @@ check_SCRIPTS = \
   test_gns_redirect_lookup.sh
 
 if HAVE_GNUTLS
-if HAVE_LIBGNURL
 check_SCRIPTS += \
   test_proxy.sh
 endif
-endif
 check_SCRIPTS += \
   test_plugin_rest_gns.sh
 
diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am
index 3b534de70..77c9eb1de 100644
--- a/src/hostlist/Makefile.am
+++ b/src/hostlist/Makefile.am
@@ -15,23 +15,10 @@ endif
  GN_LIBMHD = $(MHD_LIBS)
  GN_CPPMHD = $(MHD_CFLAGS)
 
-if HAVE_LIBGNURL
 libexec_PROGRAMS = \
  gnunet-daemon-hostlist
-LIB_GNURL=@LIBGNURL@
-CPP_GNURL=@LIBGNURL_CPPFLAGS@
 dist_pkgcfg_DATA = \
   hostlist.conf
-else
-if HAVE_LIBCURL
-libexec_PROGRAMS = \
- gnunet-daemon-hostlist
-LIB_GNURL=@LIBCURL@
-CPP_GNURL=@LIBCURL_CPPFLAGS@
-dist_pkgcfg_DATA = \
-  hostlist.conf
-endif
-endif
 
 gnunet_daemon_hostlist_SOURCES = \
  gnunet-daemon-hostlist.c gnunet-daemon-hostlist.h \
@@ -46,27 +33,18 @@ gnunet_daemon_hostlist_LDADD = \
   $(top_builddir)/src/transport/libgnunettransport.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBMHD) \
-  $(LIB_GNURL) \
+  @LIBCURL@ \
   $(GN_LIBINTL)
 
 gnunet_daemon_hostlist_CFLAGS = \
   $(GN_CPPMHD) \
-  $(CPP_GNURL) \
+  @LIBCURL_CPPFLAGS@ \
   $(AM_CFLAGS)
 
-if HAVE_LIBGNURL
 check_PROGRAMS = \
  test_gnunet_daemon_hostlist \
  test_gnunet_daemon_hostlist_reconnect \
  test_gnunet_daemon_hostlist_learning
-else
-if HAVE_LIBCURL
-check_PROGRAMS = \
- test_gnunet_daemon_hostlist \
- test_gnunet_daemon_hostlist_reconnect \
- test_gnunet_daemon_hostlist_learning
-endif
-endif
 
 if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export 
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
diff --git a/src/include/gnunet_curl_lib.h b/src/include/gnunet_curl_lib.h
index 38acecc48..b5d62ba0f 100644
--- a/src/include/gnunet_curl_lib.h
+++ b/src/include/gnunet_curl_lib.h
@@ -29,13 +29,7 @@
  */
 #ifndef GNUNET_CURL_LIB_H
 #define GNUNET_CURL_LIB_H
-#if HAVE_LIBCURL
 #include <curl/curl.h>
-#elif HAVE_LIBGNURL
-#include <gnurl/curl.h>
-#else
-#error "needs curl or gnurl"
-#endif
 #include "gnunet_util_lib.h"
 
 
diff --git a/src/integration-tests/Makefile.am 
b/src/integration-tests/Makefile.am
index b3adc3a0f..33c6a3832 100644
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -23,15 +23,8 @@ endif
 
 if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export 
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
-if HAVE_LIBGNURL
 TESTS = \
  $(check_SCRIPTS)
-else
-if HAVE_LIBCURL
-TESTS = \
- $(check_SCRIPTS)
-endif
-endif
 endif
 
 SUFFIXES = .py.in .py
diff --git a/src/json/Makefile.am b/src/json/Makefile.am
index 2e97cecb9..7743411d4 100644
--- a/src/json/Makefile.am
+++ b/src/json/Makefile.am
@@ -45,17 +45,6 @@ test_json_LDADD = \
   -ljansson
 
 
-if HAVE_LIBGNURL
-LIB_GNURL=@LIBGNURL@
-CPP_GNURL=@LIBGNURL_CPPFLAGS@
-else
-if HAVE_LIBCURL
-LIB_GNURL=@LIBCURL@
-CPP_GNURL=@LIBCURL_CPPFLAGS@
-endif
-endif
-
-
 test_json_mhd_SOURCES = \
   test_json_mhd.c
 test_json_mhd_LDADD = \
@@ -64,5 +53,5 @@ test_json_mhd_LDADD = \
   -ljansson \
   $(MHD_LIBS) \
   $(Z_LIBS) \
-  $(LIB_GNURL)
-test_json_mhd_CFLAGS = $(MHD_CFLAGS) $(CPP_GNURL) $(AM_CFLAGS)
+  @LIBCURL@
+test_json_mhd_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am
index fc2cb592c..f4202457d 100644
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -28,9 +28,6 @@ gnunet_daemon_pt_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
 
-if HAVE_LIBGNURL
-LIB_GNURL=@LIBGNURL@
-CPP_GNURL=@LIBGNURL_CPPFLAGS@
 if LINUX
  VPN_TEST = \
  test_gnunet_vpn-4_to_6 \
@@ -39,20 +36,6 @@ if LINUX
  test_gnunet_vpn-4_over \
  test_gns_vpn
 endif
-else
-if HAVE_LIBCURL
-LIB_GNURL=@LIBCURL@
-CPP_GNURL=@LIBCURL_CPPFLAGS@
-if LINUX
- VPN_TEST = \
- test_gnunet_vpn-4_to_6 \
- test_gnunet_vpn-6_to_4 \
- test_gnunet_vpn-6_over \
- test_gnunet_vpn-4_over \
- test_gns_vpn
-endif
-endif
-endif
 
 check_PROGRAMS = $(VPN_TEST)
 
@@ -69,42 +52,42 @@ EXTRA_DIST = \
 
 test_gns_vpn_SOURCES = \
  test_gns_vpn.c
-test_gns_vpn_LDADD = $(MHD_LIBS) $(LIB_GNURL) \
+test_gns_vpn_LDADD = $(MHD_LIBS) @LIBCURL@ \
  $(top_builddir)/src/namestore/libgnunetnamestore.la \
  $(top_builddir)/src/identity/libgnunetidentity.la \
  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
-test_gns_vpn_CFLAGS = $(MHD_CFLAGS) $(CPP_GNURL) $(AM_CFLAGS)
+test_gns_vpn_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 
 test_gnunet_vpn_4_over_SOURCES = \
  test_gnunet_vpn.c
-test_gnunet_vpn_4_over_LDADD = $(MHD_LIBS) $(LIB_GNURL) \
+test_gnunet_vpn_4_over_LDADD = $(MHD_LIBS) @LIBCURL@ \
  $(top_builddir)/src/vpn/libgnunetvpn.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
-test_gnunet_vpn_4_over_CFLAGS = $(MHD_CFLAGS) $(CPP_GNURL) $(AM_CFLAGS)
+test_gnunet_vpn_4_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 
 test_gnunet_vpn_6_over_SOURCES = \
  test_gnunet_vpn.c
-test_gnunet_vpn_6_over_LDADD = $(MHD_LIBS) $(LIB_GNURL) \
+test_gnunet_vpn_6_over_LDADD = $(MHD_LIBS) @LIBCURL@ \
  $(top_builddir)/src/vpn/libgnunetvpn.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
-test_gnunet_vpn_6_over_CFLAGS = $(MHD_CFLAGS) $(CPP_GNURL) $(AM_CFLAGS)
+test_gnunet_vpn_6_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 
 test_gnunet_vpn_4_to_6_SOURCES = \
  test_gnunet_vpn.c
-test_gnunet_vpn_4_to_6_LDADD = $(MHD_LIBS) $(LIB_GNURL) \
+test_gnunet_vpn_4_to_6_LDADD = $(MHD_LIBS) @LIBCURL@ \
  $(top_builddir)/src/vpn/libgnunetvpn.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
-test_gnunet_vpn_4_to_6_CFLAGS = $(MHD_CFLAGS) $(CPP_GNURL) $(AM_CFLAGS)
+test_gnunet_vpn_4_to_6_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 
 test_gnunet_vpn_6_to_4_SOURCES = \
  test_gnunet_vpn.c
-test_gnunet_vpn_6_to_4_LDADD = $(MHD_LIBS) $(LIB_GNURL) \
+test_gnunet_vpn_6_to_4_LDADD = $(MHD_LIBS) @LIBCURL@ \
  $(top_builddir)/src/vpn/libgnunetvpn.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
-test_gnunet_vpn_6_to_4_CFLAGS = $(MHD_CFLAGS) $(CPP_GNURL) $(AM_CFLAGS)
+test_gnunet_vpn_6_to_4_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 7bd07b905..a4971ff2c 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -16,63 +16,28 @@ HTTPS_SERVER_PLUGIN_LA = 
libgnunet_plugin_transport_https_server.la
 HTTP_SERVER_PLUGIN_TEST = test_plugin_http_server
 HTTPS_SERVER_PLUGIN_TEST = test_plugin_https_server
 
-if HAVE_LIBGNURL
- HTTP_CLIENT_PLUGIN_TEST = test_plugin_http_client
- HTTPS_CLIENT_PLUGIN_TEST = test_plugin_https_client
- HTTP_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_http_client.la
- HTTPS_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_https_client.la
-LIB_GNURL=@LIBGNURL@
-CPP_GNURL=@LIBGNURL_CPPFLAGS@
-else
-if HAVE_LIBCURL
- HTTP_CLIENT_PLUGIN_TEST = test_plugin_http_client
- HTTPS_CLIENT_PLUGIN_TEST = test_plugin_https_client
- HTTP_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_http_client.la
- HTTPS_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_https_client.la
-LIB_GNURL=@LIBCURL@
-CPP_GNURL=@LIBCURL_CPPFLAGS@
-endif
-endif
-
-if HAVE_LIBGNURL
- HTTP_API_TEST = test_transport_api_http
- HTTP_REVERSE_API_TEST = test_transport_api_http_reverse
- HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http
- HTTP_REL_TEST = test_transport_api_reliability_http \
-                test_transport_api_reliability_http_xhr
- HTTP_QUOTA_TEST = test_quota_compliance_http \
-                  test_quota_compliance_http_asymmetric
- HTTP_SWITCH = test_transport_address_switch_http
- HTTPS_API_TEST = test_transport_api_https
- HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https
-if HAVE_EXPERIMENTAL
- HTTPS_REL_TEST = test_transport_api_reliability_https \
-                 test_transport_api_reliability_https_xhr
-endif
- HTTPS_QUOTA_TEST = test_quota_compliance_https \
-               test_quota_compliance_https_asymmetric
- HTTPS_SWITCH = test_transport_address_switch_https
-else
-if HAVE_LIBCURL
- HTTP_API_TEST = test_transport_api_http
- HTTP_REVERSE_API_TEST = test_transport_api_http_reverse
- HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http
- HTTP_REL_TEST = test_transport_api_reliability_http \
+HTTP_CLIENT_PLUGIN_TEST = test_plugin_http_client
+HTTPS_CLIENT_PLUGIN_TEST = test_plugin_https_client
+HTTP_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_http_client.la
+HTTPS_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_https_client.la
+
+HTTP_API_TEST = test_transport_api_http
+HTTP_REVERSE_API_TEST = test_transport_api_http_reverse
+HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http
+HTTP_REL_TEST = test_transport_api_reliability_http \
                 test_transport_api_reliability_http_xhr
- HTTP_QUOTA_TEST = test_quota_compliance_http \
+HTTP_QUOTA_TEST = test_quota_compliance_http \
                   test_quota_compliance_http_asymmetric
- HTTP_SWITCH = test_transport_address_switch_http
- HTTPS_API_TEST = test_transport_api_https
- HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https
+HTTP_SWITCH = test_transport_address_switch_http
+HTTPS_API_TEST = test_transport_api_https
+HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https
 if HAVE_EXPERIMENTAL
  HTTPS_REL_TEST = test_transport_api_reliability_https \
                  test_transport_api_reliability_https_xhr
 endif
- HTTPS_QUOTA_TEST = test_quota_compliance_https \
+HTTPS_QUOTA_TEST = test_quota_compliance_https \
                test_quota_compliance_https_asymmetric
- HTTPS_SWITCH = test_transport_address_switch_https
-endif
-endif
+HTTPS_SWITCH = test_transport_address_switch_https
 
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
@@ -555,13 +520,13 @@ libgnunet_plugin_transport_http_client_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
-  $(LIB_GNURL) \
+  @LIBCURL@ \
   $(top_builddir)/src/util/libgnunetutil.la
 libgnunet_plugin_transport_http_client_la_LDFLAGS = \
   $(GN_LIBINTL) \
   $(GN_PLUGIN_LDFLAGS)
 libgnunet_plugin_transport_http_client_la_CFLAGS = \
- $(CPP_GNURL) $(AM_CFLAGS)
+ @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 
 
 libgnunet_plugin_transport_http_server_la_SOURCES = \
@@ -585,13 +550,13 @@ libgnunet_plugin_transport_https_client_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
-  $(LIB_GNURL) \
+  @LIBCURL@ \
   $(top_builddir)/src/util/libgnunetutil.la
 libgnunet_plugin_transport_https_client_la_LDFLAGS = \
   $(GN_LIBINTL) \
   $(GN_PLUGIN_LDFLAGS)
 libgnunet_plugin_transport_https_client_la_CFLAGS = \
- $(CPP_GNURL) $(AM_CFLAGS) -DBUILD_HTTPS
+ @LIBCURL_CPPFLAGS@ $(AM_CFLAGS) -DBUILD_HTTPS
 
 
 libgnunet_plugin_transport_https_server_la_SOURCES = \

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]